Merge pull request #17151 from lvivski/chunk-loading

TheLarkInn · web-flow · commit ba56e05b2401 · 2023-05-09T08:46:18.000-07:00
Reduce the amount of generated code for chunk loading
diff --git a/lib/esm/ModuleChunkLoadingRuntimeModule.js b/lib/esm/ModuleChunkLoadingRuntimeModule.js
@@ -127,7 +127,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			"// object to store loaded and loading chunks",
 			"// undefined = chunk not loaded, null = chunk preloaded/prefetched",
-			"// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded",
+			"// [resolve, Promise] = chunk loading, 0 = chunk loaded",
 			`var installedChunks = ${
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
@@ -210,7 +210,9 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 													)})])`,
 													`promises.push(installedChunkData[1] = promise);`
 												]),
-												"} else installedChunks[chunkId] = 0;"
+												hasJsMatcher === true
+													? "}"
+													: "} else installedChunks[chunkId] = 0;"
 											]),
 											"}"
 										]),
diff --git a/lib/node/ReadFileChunkLoadingRuntimeModule.js b/lib/node/ReadFileChunkLoadingRuntimeModule.js
@@ -178,7 +178,9 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 												"});",
 												"promises.push(installedChunkData[2] = promise);"
 											]),
-											"} else installedChunks[chunkId] = 0;"
+											hasJsMatcher === true
+												? "}"
+												: "} else installedChunks[chunkId] = 0;"
 										]),
 										"}"
 									]),
diff --git a/lib/web/JsonpChunkLoadingRuntimeModule.js b/lib/web/JsonpChunkLoadingRuntimeModule.js
@@ -189,7 +189,9 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 													)};`,
 													`${RuntimeGlobals.loadScript}(url, loadingEnded, "chunk-" + chunkId, chunkId);`
 												]),
-												"} else installedChunks[chunkId] = 0;"
+												hasJsMatcher === true
+													? "}"
+													: "} else installedChunks[chunkId] = 0;"
 											]),
 											"}"
 										]),
diff --git a/test/__snapshots__/StatsTestCases.basictest.js.snap b/test/__snapshots__/StatsTestCases.basictest.js.snap
