fix handling of onChunksLoaded with prefetching

webpack · Jul 16, 2021 · 8ce0f24 · 8ce0f24
1 parent 08112f1
commit 8ce0f24
Show file tree

Hide file tree

Showing 7 changed files with 224 additions and 210 deletions.
diff --git a/lib/javascript/JavascriptModulesPlugin.js b/lib/javascript/JavascriptModulesPlugin.js
@@ -834,7 +834,9 @@ class JavascriptModulesPlugin {
 				}
 			}
 			if (runtimeRequirements.has(RuntimeGlobals.onChunksLoaded)) {
-				startupSource.add(`${RuntimeGlobals.onChunksLoaded}();\n`);
+				startupSource.add(
+					`__webpack_exports__ = ${RuntimeGlobals.onChunksLoaded}(__webpack_exports__);\n`
+				);
 			}
 			source.add(
 				hooks.renderStartup.call(startupSource, lastInlinedModule, {
@@ -1152,13 +1154,9 @@ class JavascriptModulesPlugin {
 					}
 				}
 				if (runtimeRequirements.has(RuntimeGlobals.onChunksLoaded)) {
-					if (runtimeRequirements.has(RuntimeGlobals.prefetchChunk)) {
-						buf2.push(`${RuntimeGlobals.onChunksLoaded}();`);
-					} else {
-						buf2.push(
-							`__webpack_exports__ = ${RuntimeGlobals.onChunksLoaded}(__webpack_exports__);`
-						);
-					}
+					buf2.push(
+						`__webpack_exports__ = ${RuntimeGlobals.onChunksLoaded}(__webpack_exports__);`
+					);
 				}
 				if (
 					runtimeRequirements.has(RuntimeGlobals.startup) ||

diff --git a/lib/prefetch/ChunkPrefetchStartupRuntimeModule.js b/lib/prefetch/ChunkPrefetchStartupRuntimeModule.js
@@ -32,16 +32,17 @@ class ChunkPrefetchStartupRuntimeModule extends RuntimeModule {
 					`${RuntimeGlobals.onChunksLoaded}(0, ${JSON.stringify(
 						// This need to include itself to delay execution after this chunk has been fully loaded
 						onChunks.filter(c => c === chunk).map(c => c.id)
-					)}, ${runtimeTemplate.expressionFunction(
+					)}, ${runtimeTemplate.basicFunction(
+						"",
 						chunks.size < 3
 							? Array.from(
 									chunks,
 									c =>
-										`${RuntimeGlobals.prefetchChunk}(${JSON.stringify(c.id)})`
-							  ).join(", ")
+										`${RuntimeGlobals.prefetchChunk}(${JSON.stringify(c.id)});`
+							  )
 							: `${JSON.stringify(Array.from(chunks, c => c.id))}.map(${
 									RuntimeGlobals.prefetchChunk
-							  })`
+							  });`
 					)}, 5);`
 			)
 		);

diff --git a/lib/runtime/OnChunksLoadedRuntimeModule.js b/lib/runtime/OnChunksLoadedRuntimeModule.js
@@ -58,7 +58,11 @@ class OnChunksLoadedRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"if(fulfilled) {",
-						Template.indent(["deferred.splice(i--, 1)", "result = fn();"]),
+						Template.indent([
+							"deferred.splice(i--, 1)",
+							"var r = fn();",
+							"if (r !== undefined) result = r;"
+						]),
 						"}"
 					]),
 					"}",

diff --git a/test/__snapshots__/StatsTestCases.basictest.js.snap b/test/__snapshots__/StatsTestCases.basictest.js.snap
diff --git a/test/configCases/issues/issue-12993/index.js b/test/configCases/issues/issue-12993/index.js
@@ -1,8 +1,6 @@
-import(/* webpackPrefetch: true */ "./dynamic.js");
-
 export const main = "main";
 
-it("library output should be accurate value", done => {
-	expect(global.lib.main).toBe("main");
-	done();
+it("library output should be accurate value", async () => {
+	expect(global.lib).toEqual(nsObj({ main: "main" }));
+	await import(/* webpackPrefetch: true */ "./dynamic.js");
 });
diff --git a/test/configCases/issues/issue-12993/test.config.js b/test/configCases/issues/issue-12993/test.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	afterExecute() {
+		delete global.lib;
+	}
+};
diff --git a/test/configCases/issues/issue-12993/webpack.config.js b/test/configCases/issues/issue-12993/webpack.config.js
@@ -5,5 +5,13 @@ module.exports = [
 			library: "lib",
 			libraryTarget: "global"
 		}
+	},
+	{
+		mode: "development",
+		devtool: false,
+		output: {
+			library: "lib",
+			libraryTarget: "global"
+		}
 	}
 ];