fix: add entry startup to fix async script chunk loading

web-infra-dev · Apr 27, 2023 · d86865c · d86865c
1 parent 4e25faf
commit d86865c
Show file tree

Hide file tree

Showing 111 changed files with 663 additions and 287 deletions.
diff --git a/.changeset/thirty-boxes-listen.md b/.changeset/thirty-boxes-listen.md
@@ -0,0 +1,5 @@
+---
+"@rspack/core": patch
+---
+
+fix: add entry startup to fix async script chunk loading
diff --git a/crates/rspack/tests/fixtures/code-splitting/expected/main.js b/crates/rspack/tests/fixtures/code-splitting/expected/main.js
@@ -6,7 +6,8 @@ __webpack_require__.el("./b.js").then(__webpack_require__.bind(__webpack_require
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/fixtures/dynamic-import/expected/main.js b/crates/rspack/tests/fixtures/dynamic-import/expected/main.js
@@ -32,8 +32,7 @@ __webpack_require__('./child Lazy  recursive ^.*.js$')("./child/".concat(request
 },
 
 };
-
-var __webpack_require__ = require('./runtime.js');
-
+var __webpack_require__ = require('../../../../../../../runtime.js');
 __webpack_require__.C(exports)
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
diff --git a/crates/rspack/tests/fixtures/simple-with-query/expected/main.js b/crates/rspack/tests/fixtures/simple-with-query/expected/main.js
@@ -38,7 +38,8 @@ const a = 3;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/fixtures/static-import/expected/main.js b/crates/rspack/tests/fixtures/static-import/expected/main.js
@@ -20,7 +20,8 @@ console.log('hello, world');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/samples/remove-parent-modules/cycle-dynamic-entry/expected/main.js b/crates/rspack/tests/samples/remove-parent-modules/cycle-dynamic-entry/expected/main.js
@@ -6,7 +6,8 @@ console.log('index');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/samples/remove-parent-modules/cycle-entry/expected/index.js b/crates/rspack/tests/samples/remove-parent-modules/cycle-entry/expected/index.js
@@ -13,7 +13,8 @@ console.log('shared');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/samples/remove-parent-modules/cycle-entry/expected/index2.js b/crates/rspack/tests/samples/remove-parent-modules/cycle-entry/expected/index2.js
@@ -13,7 +13,8 @@ console.log('shared');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index2.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index2.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/samples/remove-parent-modules/intersection/expected/index.js b/crates/rspack/tests/samples/remove-parent-modules/intersection/expected/index.js
@@ -17,7 +17,8 @@ console.log('shared');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/samples/remove-parent-modules/intersection/expected/index2.js b/crates/rspack/tests/samples/remove-parent-modules/intersection/expected/index2.js
@@ -17,7 +17,8 @@ console.log('shared');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index2.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index2.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/samples/remove-parent-modules/self-import/expected/main.js b/crates/rspack/tests/samples/remove-parent-modules/self-import/expected/main.js
@@ -5,7 +5,8 @@ console.log('index');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/samples/remove-parent-modules/simple/expected/main.js b/crates/rspack/tests/samples/remove-parent-modules/simple/expected/main.js
@@ -13,7 +13,8 @@ console.log('shared');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/array-side-effects/expected/main.js b/crates/rspack/tests/tree-shaking/array-side-effects/expected/main.js
@@ -44,7 +44,8 @@ _app.app;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/assign-with-side-effects/expected/main.js b/crates/rspack/tests/tree-shaking/assign-with-side-effects/expected/main.js
@@ -37,7 +37,8 @@ const result = 20000;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/basic/expected/main.js b/crates/rspack/tests/tree-shaking/basic/expected/main.js
@@ -48,7 +48,8 @@ const myanswer = _answer.answer;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/bb/expected/main.js b/crates/rspack/tests/tree-shaking/bb/expected/main.js
@@ -44,7 +44,8 @@ _a.ccc;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/cjs-export-computed-property/expected/main.js b/crates/rspack/tests/tree-shaking/cjs-export-computed-property/expected/main.js
@@ -55,7 +55,8 @@ var _default = _zh_locale.default;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.ts');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.ts'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/cjs-tree-shaking-basic/expected/main.js b/crates/rspack/tests/tree-shaking/cjs-tree-shaking-basic/expected/main.js
@@ -49,7 +49,8 @@ const myanswer = 'anyser';
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/...ack/tests/tree-shaking/conflicted_name_by_re_export_all_should_be_hidden/expected/main.js b/...ack/tests/tree-shaking/conflicted_name_by_re_export_all_should_be_hidden/expected/main.js
@@ -15,7 +15,8 @@ __webpack_require__.es(__webpack_require__("./bar.js"), exports);
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/context-module/expected/main.js b/crates/rspack/tests/tree-shaking/context-module/expected/main.js
@@ -57,7 +57,8 @@ __webpack_require__('./child Sync  recursive ^.*.js$')(`./child/${a}.js`.replace
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/default_export/expected/main.js b/crates/rspack/tests/tree-shaking/default_export/expected/main.js
@@ -68,7 +68,8 @@ const myanswer = _answer.answer;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/explicit_named_export_higher_priority_1/expected/main.js b/crates/rspack/tests/tree-shaking/explicit_named_export_higher_priority_1/expected/main.js
@@ -26,7 +26,8 @@ console.log(_foo.a);
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/explicit_named_export_higher_priority_2/expected/main.js b/crates/rspack/tests/tree-shaking/explicit_named_export_higher_priority_2/expected/main.js
@@ -39,7 +39,8 @@ console.log(_foo.a);
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/export-star-chain/expected/main.js b/crates/rspack/tests/tree-shaking/export-star-chain/expected/main.js
@@ -107,7 +107,8 @@ __webpack_require__.es(__webpack_require__("./something/Something.js"), exports)
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/export_star/expected/main.js b/crates/rspack/tests/tree-shaking/export_star/expected/main.js
@@ -63,7 +63,8 @@ const c = 103330;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/export_star2/expected/main.js b/crates/rspack/tests/tree-shaking/export_star2/expected/main.js
@@ -34,7 +34,8 @@ __webpack_require__.es(__webpack_require__("./bar.js"), exports);
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/export_star_conflict_export_no_error/expected/main.js b/crates/rspack/tests/tree-shaking/export_star_conflict_export_no_error/expected/main.js
@@ -40,7 +40,8 @@ __webpack_require__.es(__webpack_require__("./bar.js"), exports);
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/...s/rspack/tests/tree-shaking/handle-side-effects-commonjs-imported-unused/expected/main.js b/...s/rspack/tests/tree-shaking/handle-side-effects-commonjs-imported-unused/expected/main.js
@@ -5,7 +5,8 @@ console.log('something');
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/handle-side-effects-commonjs-required/expected/main.js b/crates/rspack/tests/tree-shaking/handle-side-effects-commonjs-required/expected/main.js
@@ -116,7 +116,8 @@ function _instanceof1(left, right) {
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/import-var-assign-side-effects/expected/main.js b/crates/rspack/tests/tree-shaking/import-var-assign-side-effects/expected/main.js
@@ -36,7 +36,8 @@ var _export = __webpack_require__("./export.js");
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/.../rspack/tests/tree-shaking/inherit_export_map_should_lookup_in_dfs_order/expected/main.js b/.../rspack/tests/tree-shaking/inherit_export_map_should_lookup_in_dfs_order/expected/main.js
@@ -56,7 +56,8 @@ _c.c;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/local-binding-reachable1/expected/main.js b/crates/rspack/tests/tree-shaking/local-binding-reachable1/expected/main.js
@@ -42,7 +42,8 @@ var _export = __webpack_require__("./export.js");
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/local-binding-reachable2/expected/main.js b/crates/rspack/tests/tree-shaking/local-binding-reachable2/expected/main.js
@@ -42,7 +42,8 @@ var _export = __webpack_require__("./export.js");
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/module-rule-side-effects1/expected/main.js b/crates/rspack/tests/tree-shaking/module-rule-side-effects1/expected/main.js
@@ -26,7 +26,8 @@ _a.a;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/module-rule-side-effects2/expected/main.js b/crates/rspack/tests/tree-shaking/module-rule-side-effects2/expected/main.js
@@ -26,7 +26,8 @@ _a.a;
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);
diff --git a/crates/rspack/tests/tree-shaking/named-export-decl-with-src-eval/expected/main.js b/crates/rspack/tests/tree-shaking/named-export-decl-with-src-eval/expected/main.js
@@ -65,7 +65,8 @@ var _export = __webpack_require__("./export.js");
 },
 
 },function(__webpack_require__) {
-var __webpack_exports__ = __webpack_require__('./index.js');
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__('./index.js'));
 
 }
 ]);