preload in parallel to script download

sokra · sokra · commit 3417da594d6a · 2018-04-16T19:35:02.000+02:00
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
@@ -283,25 +283,21 @@ class JsonpMainTemplatePlugin {
 					"",
 					`var chunkPreloadMap = ${JSON.stringify(chunkMap, null, "\t")}`,
 					"",
-					"var chunkPreloadata = chunkPreloadMap[chunkId];",
-					"if(chunkPreloadata) {",
+					"var chunkPreloadData = chunkPreloadMap[chunkId];",
+					"if(chunkPreloadData) {",
 					Template.indent([
-						"Promise.all(promises).then(function() {",
+						"var head = document.getElementsByTagName('head')[0];",
+						"chunkPreloadData.forEach(function(chunkId) {",
 						Template.indent([
-							"var head = document.getElementsByTagName('head')[0];",
-							"chunkPreloadata.forEach(function(chunkId) {",
+							"if(installedChunks[chunkId] === undefined) {",
 							Template.indent([
-								"if(installedChunks[chunkId] === undefined) {",
-								Template.indent([
-									"installedChunks[chunkId] = null;",
-									mainTemplate.hooks.linkPreload.call("", chunk, hash),
-									"head.appendChild(link);"
-								]),
-								"}"
+								"installedChunks[chunkId] = null;",
+								mainTemplate.hooks.linkPreload.call("", chunk, hash),
+								"head.appendChild(link);"
 							]),
-							"});"
+							"}"
 						]),
-						"})"
+						"});"
 					]),
 					"}"
 				]);
diff --git a/test/configCases/web/prefetch-preload/index.js b/test/configCases/web/prefetch-preload/index.js
@@ -21,30 +21,30 @@ it("should prefetch and preload child chunks on chunk load", () => {
 	__webpack_public_path__ = "/public/path/";
 
 	const promise = import(/* webpackChunkName: "chunk1" */ "./chunk1");
-	document.head._children.length.should.be.eql(1);
+	document.head._children.length.should.be.eql(2);
 	const script = document.head._children[0];
 	script._type.should.be.eql("script");
 	should(script.src).be.eql("/public/path/chunk1.js")
 	should(script.getAttribute("nonce")).be.eql("nonce")
 	should(script.crossOrigin).be.eql("anonymous");
 	should(script.onload).be.type("function");
 
+	let link = document.head._children[1];
+	link._type.should.be.eql("link");
+	should(link.rel).be.eql("preload");
+	should(link.as).be.eql("script");
+	should(link.href).be.eql("/public/path/chunk1-b.js");
+	should(link.charset).be.eql("utf-8");
+	should(link.getAttribute("nonce")).be.eql("nonce");
+	should(link.crossOrigin).be.eql("anonymous");
+
 	__non_webpack_require__("./chunk1.js");
 	script.onload();
 
 	return promise.then((ex) => {
 		document.head._children.length.should.be.eql(4);
 
-		let link = document.head._children[1];
-		link._type.should.be.eql("link");
-		should(link.rel).be.eql("preload");
-		should(link.as).be.eql("script");
-		should(link.href).be.eql("/public/path/chunk1-b.js");
-		should(link.charset).be.eql("utf-8");
-		should(link.getAttribute("nonce")).be.eql("nonce");
-		should(link.crossOrigin).be.eql("anonymous");
-
-		link = document.head._children[2];
+		let link = document.head._children[2];
 		link._type.should.be.eql("link");
 		should(link.rel).be.eql("prefetch");
 		should(link.href).be.eql("/public/path/chunk1-c.js");
diff --git a/test/statsCases/preload/expected.txt b/test/statsCases/preload/expected.txt
@@ -3,7 +3,7 @@
     normal.js  130 bytes       1  [emitted]  normal
 preloaded2.js  127 bytes       2  [emitted]  preloaded2
 preloaded3.js  130 bytes       3  [emitted]  preloaded3
-      main.js   9.89 KiB       4  [emitted]  main
+      main.js   9.81 KiB       4  [emitted]  main
      inner.js  136 bytes       5  [emitted]  inner
     inner2.js  201 bytes       6  [emitted]  inner2
 Entrypoint main = main.js (preload: preloaded2.js preloaded.js preloaded3.js)
