Initial rework per sokra's suggestion

MLoughry · MLoughry · commit 685cbcdf54ce · 2018-05-30T14:36:53.000-07:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -607,10 +607,10 @@ class Chunk {
 		return result;
 	}
 
-	getChildIdsByOrdersMap() {
+	getChildIdsByOrdersMap(includeImmediateChildren) {
 		const chunkMaps = Object.create(null);
 
-		for (const chunk of this.getAllAsyncChunks()) {
+		function addChunkChildrenToMap(chunk) {
 			const data = chunk.getChildIdsByOrders();
 			for (const key of Object.keys(data)) {
 				let chunkMap = chunkMaps[key];
@@ -620,6 +620,15 @@ class Chunk {
 				chunkMap[chunk.id] = data[key];
 			}
 		}
+
+		for (const chunk of this.getAllAsyncChunks()) {
+			addChunkChildrenToMap(chunk);
+		}
+
+		if (includeImmediateChildren) {
+			addChunkChildrenToMap(this);
+		}
+
 		return chunkMaps;
 	}
 
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
@@ -310,45 +310,6 @@ class JsonpMainTemplatePlugin {
 				]);
 			}
 		);
-		mainTemplate.hooks.requireEnsure.tap(
-			{
-				name: "JsonpMainTemplatePlugin prefetch",
-				stage: 20
-			},
-			(source, chunk, hash) => {
-				const chunkMap = chunk.getChildIdsByOrdersMap().prefetch;
-				if (!chunkMap || Object.keys(chunkMap).length === 0) return source;
-				return Template.asString([
-					source,
-					"",
-					"// chunk prefetching for javascript",
-					"",
-					`var chunkPrefetchMap = ${JSON.stringify(chunkMap, null, "\t")}`,
-					"",
-					"var chunkPrefetchData = chunkPrefetchMap[chunkId];",
-					"if(chunkPrefetchData) {",
-					Template.indent([
-						"Promise.all(promises).then(function() {",
-						Template.indent([
-							"var head = document.getElementsByTagName('head')[0];",
-							"chunkPrefetchData.forEach(function(chunkId) {",
-							Template.indent([
-								"if(installedChunks[chunkId] === undefined) {",
-								Template.indent([
-									"installedChunks[chunkId] = null;",
-									mainTemplate.hooks.linkPrefetch.call("", chunk, hash),
-									"head.appendChild(link);"
-								]),
-								"}"
-							]),
-							"});"
-						]),
-						"})"
-					]),
-					"}"
-				]);
-			}
-		);
 		mainTemplate.hooks.requireExtensions.tap(
 			"JsonpMainTemplatePlugin",
 			(source, chunk) => {
@@ -369,6 +330,7 @@ class JsonpMainTemplatePlugin {
 			(source, chunk, hash) => {
 				if (needChunkLoadingCode(chunk)) {
 					const withDefer = needEntryDeferringCode(chunk);
+					const chunkMap = chunk.getChildIdsByOrdersMap(true).prefetch;
 					return Template.asString([
 						source,
 						"",
@@ -417,7 +379,34 @@ class JsonpMainTemplatePlugin {
 										"// run deferred modules when all chunks ready",
 										"return checkDeferredModules();"
 								  ])
-								: ""
+								: "",
+							"",
+							"// chunk prefetching for javascript",
+							"",
+							`var chunkPrefetchMap = ${JSON.stringify(chunkMap, null, "\t")}`,
+							"",
+							"for(let j = 0;j < chunkIds.length; j++) {",
+							Template.indent([
+								"chunkId = chunkIds[j];",
+								"var chunkPrefetchData = chunkPrefetchMap[chunkId];",
+								"if(chunkPrefetchData) {",
+								Template.indent([
+									"var head = document.getElementsByTagName('head')[0];",
+									"chunkPrefetchData.forEach(function(chunkId) {",
+									Template.indent([
+										"if(installedChunks[chunkId] === undefined) {",
+										Template.indent([
+											"installedChunks[chunkId] = null;",
+											mainTemplate.hooks.linkPrefetch.call("", chunk, hash),
+											"head.appendChild(link);"
+										]),
+										"}"
+									]),
+									"});"
+								]),
+								"}"
+							]),
+							"}"
 						]),
 						"};",
 						withDefer
@@ -479,6 +468,18 @@ class JsonpMainTemplatePlugin {
 				return source;
 			}
 		);
+		mainTemplate.hooks.beforeStartup.tap(
+			"JsonpMainTemplatePlugin",
+			(source, chunk, hash) => {
+				if (needChunkLoadingCode(chunk)) {
+					return Template.asString([
+						source,
+						`webpackJsonpCallback([${JSON.stringify(chunk.ids)}, {}])`
+					]);
+				}
+				return source;
+			}
+		);
 		mainTemplate.hooks.startup.tap(
 			"JsonpMainTemplatePlugin",
 			(source, chunk, hash) => {
