revert: get export default (#4653)

Co-authored-by: LingyuCoder <--global>
web-infra-dev · Nov 15, 2023 · 91145e5 · 91145e5
1 parent 2666fca
commit 91145e5
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 56 deletions.
diff --git a/crates/rspack/tests/tree-shaking/tree-shaking-interop/snapshot/new_treeshaking.snap b/crates/rspack/tests/tree-shaking/tree-shaking-interop/snapshot/new_treeshaking.snap
@@ -41,7 +41,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */var _foo__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/* ./foo */"./foo.js");
 /* harmony import */var _foo__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_foo__WEBPACK_IMPORTED_MODULE_0__);
 
-_foo__WEBPACK_IMPORTED_MODULE_0___default()();
+_foo__WEBPACK_IMPORTED_MODULE_0___default();
 }),
 
 },function(__webpack_require__) {

diff --git a/crates/rspack/tests/tree-shaking/tree-shaking-interop/snapshot/output.snap b/crates/rspack/tests/tree-shaking/tree-shaking-interop/snapshot/output.snap
@@ -41,7 +41,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */var _foo__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/* ./foo */"./foo.js");
 /* harmony import */var _foo__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_foo__WEBPACK_IMPORTED_MODULE_0__);
 
-_foo__WEBPACK_IMPORTED_MODULE_0___default()();
+_foo__WEBPACK_IMPORTED_MODULE_0___default();
 }),
 
 },function(__webpack_require__) {

diff --git a/crates/rspack_core/src/dependency/runtime_template.rs b/crates/rspack_core/src/dependency/runtime_template.rs
@@ -32,14 +32,7 @@ pub fn export_from_import(
     {
       match exports_type {
         ExportsType::Dynamic => {
-          if is_call {
-            return format!("{import_var}_default(){}", property_access(export_name, 1));
-          } else {
-            return format!(
-              "({import_var}_default(){})",
-              property_access(export_name, 1)
-            );
-          }
+          return format!("{import_var}_default{}", property_access(export_name, 1));
         }
         ExportsType::DefaultOnly | ExportsType::DefaultWithNamed => {
           export_name = export_name[1..].to_vec();

diff --git a/crates/rspack_plugin_runtime/src/runtime_module/runtime/compat_get_default_export.js b/crates/rspack_plugin_runtime/src/runtime_module/runtime/compat_get_default_export.js
@@ -1,11 +1,9 @@
 // getDefaultExport function for compatibility with non-harmony modules
-__webpack_require__.n = function (module) {
-	var getter = module && module.__esModule ?
-		function () { return module['default']; } :
-		function () { return module; };
-	__webpack_require__.d(getter, { a: getter });
-	return getter;
-};
-
-
-
+__webpack_require__.n = function(module) {
+	// var getter = module && module.__esModule ?
+    //     function() { return module['default']; } :
+    //     function() { return module; }
+	// __webpack_require__.d(getter, { a: getter });
+	// return getter;
+	return module && module.__esModule ? module['default'] : module;
+};
diff --git a/packages/rspack/tests/__snapshots__/StatsTestCases.test.ts.snap b/packages/rspack/tests/__snapshots__/StatsTestCases.test.ts.snap
@@ -5008,7 +5008,7 @@ exports[`StatsTestCases should print correct stats for resolve-overflow 1`] = `
         "hotModuleReplacement": false,
       },
       "name": "bundle.js",
-      "size": 784,
+      "size": 725,
       "type": "asset",
     },
   ],
@@ -5112,10 +5112,10 @@ console.log(a);
       "assets": [
         {
           "name": "bundle.js",
-          "size": 784,
+          "size": 725,
         },
       ],
-      "assetsSize": 784,
+      "assetsSize": 725,
       "chunks": [
         "main",
       ],
@@ -5139,7 +5139,7 @@ console.log(a);
   ],
   "errorsCount": 1,
   "filteredModules": undefined,
-  "hash": "88fc59502999f71143b5",
+  "hash": "316ac2fb3476f8bb6f1d",
   "logging": {},
   "modules": [
     {
@@ -5293,10 +5293,10 @@ console.log(a);
       "assets": [
         {
           "name": "bundle.js",
-          "size": 784,
+          "size": 725,
         },
       ],
-      "assetsSize": 784,
+      "assetsSize": 725,
       "chunks": [
         "main",
       ],
@@ -5312,8 +5312,8 @@ console.log(a);
 
 exports[`StatsTestCases should print correct stats for resolve-overflow 2`] = `
 "PublicPath: auto
-asset bundle.js 784 bytes {main} [emitted] (name: main)
-Entrypoint main 784 bytes = bundle.js
+asset bundle.js 725 bytes {main} [emitted] (name: main)
+Entrypoint main 725 bytes = bundle.js
 chunk {main} bundle.js (main) [entry]
   ./index.js [10] {main}
     entry ./index
@@ -5340,7 +5340,7 @@ error[internal]: Resolve error
 
 
 
-Rspack compiled with 1 error (88fc59502999f71143b5)"
+Rspack compiled with 1 error (316ac2fb3476f8bb6f1d)"
 `;
 
 exports[`StatsTestCases should print correct stats for resolve-unexpected-exports-in-pkg 1`] = `
@@ -5359,7 +5359,7 @@ exports[`StatsTestCases should print correct stats for resolve-unexpected-export
         "hotModuleReplacement": false,
       },
       "name": "bundle.js",
-      "size": 802,
+      "size": 741,
       "type": "asset",
     },
   ],
@@ -5463,10 +5463,10 @@ console.log(a);
       "assets": [
         {
           "name": "bundle.js",
-          "size": 802,
+          "size": 741,
         },
       ],
-      "assetsSize": 802,
+      "assetsSize": 741,
       "chunks": [
         "main",
       ],
@@ -5484,7 +5484,7 @@ console.log(a);
   ],
   "errorsCount": 1,
   "filteredModules": undefined,
-  "hash": "432c6329523a2019be22",
+  "hash": "1126dba73be58b520899",
   "logging": {},
   "modules": [
     {
@@ -5638,10 +5638,10 @@ console.log(a);
       "assets": [
         {
           "name": "bundle.js",
-          "size": 802,
+          "size": 741,
         },
       ],
-      "assetsSize": 802,
+      "assetsSize": 741,
       "chunks": [
         "main",
       ],
@@ -5657,8 +5657,8 @@ console.log(a);
 
 exports[`StatsTestCases should print correct stats for resolve-unexpected-exports-in-pkg 2`] = `
 "PublicPath: (none)
-asset bundle.js 802 bytes {main} [emitted] (name: main)
-Entrypoint main 802 bytes = bundle.js
+asset bundle.js 741 bytes {main} [emitted] (name: main)
+Entrypoint main 741 bytes = bundle.js
 chunk {main} bundle.js (main) [entry]
   ./index.js [10] {main}
     entry ./index
@@ -5679,7 +5679,7 @@ error[internal]: Export should be relative path and start with "./", but got ../
 
 
 
-Rspack compiled with 1 error (432c6329523a2019be22)"
+Rspack compiled with 1 error (1126dba73be58b520899)"
 `;
 
 exports[`StatsTestCases should print correct stats for runtime-modules 1`] = `
@@ -5975,7 +5975,7 @@ exports[`StatsTestCases should print correct stats for simple-module-source 1`]
         "hotModuleReplacement": false,
       },
       "name": "bundle.js",
-      "size": 690,
+      "size": 631,
       "type": "asset",
     },
   ],
@@ -6106,10 +6106,10 @@ import rawModule from './raw.png';
       "assets": [
         {
           "name": "bundle.js",
-          "size": 690,
+          "size": 631,
         },
       ],
-      "assetsSize": 690,
+      "assetsSize": 631,
       "chunks": [
         "main",
       ],
@@ -6119,7 +6119,7 @@ import rawModule from './raw.png';
   "errors": [],
   "errorsCount": 0,
   "filteredModules": undefined,
-  "hash": "272d9a92b8ecd819a332",
+  "hash": "29752efc1d9212dd2d67",
   "logging": {},
   "modules": [
     {
@@ -6300,10 +6300,10 @@ import rawModule from './raw.png';
       "assets": [
         {
           "name": "bundle.js",
-          "size": 690,
+          "size": 631,
         },
       ],
-      "assetsSize": 690,
+      "assetsSize": 631,
       "chunks": [
         "main",
       ],
@@ -6319,13 +6319,13 @@ import rawModule from './raw.png';
 
 exports[`StatsTestCases should print correct stats for simple-module-source 2`] = `
 "PublicPath: (none)
-asset bundle.js 690 bytes [emitted] (name: main)
-Entrypoint main 690 bytes = bundle.js
+asset bundle.js 631 bytes [emitted] (name: main)
+Entrypoint main 631 bytes = bundle.js
 runtime modules 4 modules
 ./raw.png
 ./index.js
 ./stringModule.js
-Rspack compiled successfully (272d9a92b8ecd819a332)"
+Rspack compiled successfully (29752efc1d9212dd2d67)"
 `;
 
 exports[`StatsTestCases should print correct stats for stats-hooks 1`] = `

diff --git a/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/src/a.js b/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/src/a.js
diff --git a/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/src/b.js b/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/src/b.js
diff --git a/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/src/index.js b/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/src/index.js
diff --git a/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/test.config.js b/packages/rspack/tests/runtimeDiffCases/runtime-compat-get-default-export/test.config.js