fix(runtime): revert alignment of commonjs exports dependency (#4679)

Revert "feat(runtime): alignment of commonjs exports dependency (#4572)"

This reverts commit 89eac9d.

crates/rspack/tests/tree-shaking/cjs-export-computed-property/snapshot/new_treeshaking.snap

@@ -5,9 +5,9 @@ source: crates/rspack_testing/src/run_fixture.rs
 (self['webpackChunkwebpack'] = self['webpackChunkwebpack'] || []).push([["main"], {
 "./zh_locale.js": (function (__unused_webpack_module, exports, __webpack_require__) {
 "use strict";
-Object.defineProperty(exports, "__esModule", ({
+Object.defineProperty(exports, "__esModule", {
     value: true
-}));
+});
 exports["default"] = void 0;
 /* eslint-disable no-template-curly-in-string */ var _default = {};
 exports["default"] = _default;

crates/rspack/tests/tree-shaking/cjs-export-computed-property/snapshot/output.snap

@@ -5,9 +5,9 @@ source: crates/rspack_testing/src/run_fixture.rs
 (self['webpackChunkwebpack'] = self['webpackChunkwebpack'] || []).push([["main"], {
 "./zh_locale.js": (function (__unused_webpack_module, exports, __webpack_require__) {
 "use strict";
-Object.defineProperty(exports, "__esModule", ({
+Object.defineProperty(exports, "__esModule", {
     value: true
-}));
+});
 exports["default"] = void 0;
 /* eslint-disable no-template-curly-in-string */ var _default = {};
 exports["default"] = _default;

crates/rspack/tests/tree-shaking/export-all-from-side-effects-free-commonjs/snapshot/new_treeshaking.snap

@@ -12,7 +12,7 @@ __webpack_require__.r(__webpack_exports__);
 /*#__PURE__*/ (_lib__WEBPACK_IMPORTED_MODULE_0___namespace_cache || (_lib__WEBPACK_IMPORTED_MODULE_0___namespace_cache = __webpack_require__.t(_lib__WEBPACK_IMPORTED_MODULE_0__, 2)));
 }),
 "./lib.js": (function (__unused_webpack_module, exports, __webpack_require__) {
-exports.a = 100000;
+exports['a'] = 100000;
 }),
 
 },function(__webpack_require__) {

crates/rspack/tests/tree-shaking/export-all-from-side-effects-free-commonjs/snapshot/output.snap

@@ -12,7 +12,7 @@ __webpack_require__.r(__webpack_exports__);
 /*#__PURE__*/ (_lib__WEBPACK_IMPORTED_MODULE_0___namespace_cache || (_lib__WEBPACK_IMPORTED_MODULE_0___namespace_cache = __webpack_require__.t(_lib__WEBPACK_IMPORTED_MODULE_0__, 2)));
 }),
 "./lib.js": (function (__unused_webpack_module, exports, __webpack_require__) {
-exports.a = 100000;
+exports['a'] = 100000;
 }),
 
 },function(__webpack_require__) {

crates/rspack/tests/tree-shaking/tree-shaking-interop/snapshot/new_treeshaking.snap

@@ -27,7 +27,7 @@ __webpack_require__.el(/* ./bar */"./bar.js").then(__webpack_require__.bind(__we
     console.log(mod);
 });
  const a = "a";
-__webpack_exports__.test = 30;
+exports.test = 30;
 }),
 "./foo.js": (function (module, exports, __webpack_require__) {
 {

crates/rspack/tests/tree-shaking/tree-shaking-interop/snapshot/output.snap

@@ -27,7 +27,7 @@ __webpack_require__.el(/* ./bar */"./bar.js").then(__webpack_require__.bind(__we
     console.log(mod);
 });
  const a = "a";
-__webpack_exports__.test = 30;
+exports.test = 30;
 }),
 "./foo.js": (function (module, exports, __webpack_require__) {
 {

crates/rspack_core/src/dependency/mod.rs

@@ -57,8 +57,6 @@ pub enum DependencyType {
   DynamicImportEager,
   // cjs require
   CjsRequire,
-  // cjs exports
-  CjsExports,
   // new URL("./foo", import.meta.url)
   NewUrl,
   // new Worker()
@@ -110,7 +108,6 @@ impl DependencyType {
       DependencyType::EsmImportSpecifier => Cow::Borrowed("esm import specifier"),
       DependencyType::DynamicImport => Cow::Borrowed("dynamic import"),
       DependencyType::CjsRequire => Cow::Borrowed("cjs require"),
-      DependencyType::CjsExports => Cow::Borrowed("cjs exports"),
       DependencyType::NewUrl => Cow::Borrowed("new URL()"),
       DependencyType::NewWorker => Cow::Borrowed("new Worker()"),
       DependencyType::ImportMetaHotAccept => Cow::Borrowed("import.meta.webpackHot.accept"),

crates/rspack_core/src/dependency/runtime_template.rs

@@ -61,7 +61,7 @@ pub fn export_from_import(
           format!("var {import_var}_namespace_cache;\n",),
           InitFragmentStage::StageHarmonyExports,
           -1,
-          InitFragmentKey::unique(),
+          InitFragmentKey::uniqie(),
           None,
         )
         .boxed(),

crates/rspack_core/src/exports_info.rs

@@ -349,10 +349,7 @@ impl ExportsInfoId {
         let info = self.get_read_only_export_info(&name, mg);
         info.get_used_name(&name, runtime).map(UsedName::Str)
       }
-      UsedName::Vec(_) => {
-        // TODO
-        Some(name.clone())
-      }
+      UsedName::Vec(_) => todo!(),
     }
   }
 
@@ -518,7 +515,7 @@ impl ExportsInfo {
   }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub enum UsedName {
   Str(JsWord),
   Vec(Vec<JsWord>),

crates/rspack_core/src/init_fragment.rs

@@ -19,8 +19,8 @@ pub struct InitFragmentContents {
   pub end: Option<String>,
 }
 
-pub struct InitFragmentKeyUnique;
-pub type InitFragmentKeyUKey = rspack_database::Ukey<InitFragmentKeyUnique>;
+pub struct InitFragmentKeyUniqie;
+pub type InitFragmentKeyUKey = rspack_database::Ukey<InitFragmentKeyUniqie>;
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub enum InitFragmentKey {
@@ -31,12 +31,12 @@ pub enum InitFragmentKey {
   AwaitDependencies,
   HarmonyCompatibility,
   ModuleDecorator(String /* module_id */),
-  Unique(InitFragmentKeyUKey),
+  Uniqie(InitFragmentKeyUKey),
 }
 
 impl InitFragmentKey {
-  pub fn unique() -> Self {
-    Self::Unique(rspack_database::Ukey::new())
+  pub fn uniqie() -> Self {
+    Self::Uniqie(rspack_database::Ukey::new())
   }
 }
 
@@ -79,7 +79,7 @@ impl InitFragmentKey {
       | InitFragmentKey::HarmonyExportStar(_)
       | InitFragmentKey::ExternalModule(_)
       | InitFragmentKey::ModuleDecorator(_) => first(fragments),
-      InitFragmentKey::HarmonyCompatibility | InitFragmentKey::Unique(_) => {
+      InitFragmentKey::HarmonyCompatibility | InitFragmentKey::Uniqie(_) => {
         debug_assert!(fragments.len() == 1, "fragment = {:?}", self);
         first(fragments)
       }

crates/rspack_core/src/runtime_globals.rs

@@ -220,8 +220,6 @@ bitflags! {
      * the System.register context object
      */
     const SYSTEM_CONTEXT = 1 << 49;
-
-    const THIS_AS_EXPORTS = 1 << 50;
   }
 }
 
@@ -292,7 +290,6 @@ impl RuntimeGlobals {
       R::HARMONY_MODULE_DECORATOR => "__webpack_require__.hmd",
       R::NODE_MODULE_DECORATOR => "__webpack_require__.nmd",
       R::SYSTEM_CONTEXT => "__webpack_require__.y",
-      R::THIS_AS_EXPORTS => "top-level-this-exports",
       r => panic!(
         "Unexpected flag `{r:?}`. RuntimeGlobals should only be printed for one single flag."
       ),