revert afterStartup and trigger prefetch before startup

sokra · sokra · commit c77ec391d24b · 2018-06-04T18:10:00.000+02:00
This makes more sense as startup could take a while
and we can use the time to fetch some resources
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -94,7 +94,6 @@ module.exports = class MainTemplate extends Tapable {
 			requireExtensions: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			beforeStartup: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			startup: new SyncWaterfallHook(["source", "chunk", "hash"]),
-			afterStartup: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			render: new SyncWaterfallHook([
 				"source",
 				"chunk",
@@ -133,7 +132,7 @@ module.exports = class MainTemplate extends Tapable {
 			if (chunk.entryModule) {
 				buf.push("// Load entry module and return exports");
 				buf.push(
-					`bootstrapReturn = ${this.renderRequireFunctionForModule(
+					`return ${this.renderRequireFunctionForModule(
 						hash,
 						chunk,
 						JSON.stringify(chunk.entryModule.id)
@@ -387,11 +386,8 @@ module.exports = class MainTemplate extends Tapable {
 			Template.asString(this.hooks.requireExtensions.call("", chunk, hash))
 		);
 		buf.push("");
-		buf.push("var bootstrapReturn;");
 		buf.push(Template.asString(this.hooks.beforeStartup.call("", chunk, hash)));
 		buf.push(Template.asString(this.hooks.startup.call("", chunk, hash)));
-		buf.push(Template.asString(this.hooks.afterStartup.call("", chunk, hash)));
-		buf.push("return bootstrapReturn;");
 		let source = this.hooks.render.call(
 			new OriginalSource(
 				Template.prefix(buf, " \t") + "\n",
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
@@ -384,19 +384,6 @@ class JsonpMainTemplatePlugin {
 							]),
 							"}",
 							"if(parentJsonpFunction) parentJsonpFunction(data);",
-							"while(resolves.length) {",
-							Template.indent("resolves.shift()();"),
-							"}",
-							withDefer
-								? Template.asString([
-										"",
-										"// add entry modules from loaded chunk to deferred list",
-										"deferredModules.push.apply(deferredModules, executeModules || []);",
-										"",
-										"// run deferred modules when all chunks ready",
-										"var deferResult = checkDeferredModules();"
-								  ])
-								: "",
 							withPrefetch
 								? Template.asString([
 										"// chunk prefetching for javascript",
@@ -414,7 +401,19 @@ class JsonpMainTemplatePlugin {
 										"});"
 								  ])
 								: "",
-							withDefer ? "return deferResult;" : ""
+							"while(resolves.length) {",
+							Template.indent("resolves.shift()();"),
+							"}",
+							withDefer
+								? Template.asString([
+										"",
+										"// add entry modules from loaded chunk to deferred list",
+										"deferredModules.push.apply(deferredModules, executeModules || []);",
+										"",
+										"// run deferred modules when all chunks ready",
+										"return checkDeferredModules();"
+								  ])
+								: ""
 						]),
 						"};",
 						withDefer
@@ -476,7 +475,7 @@ class JsonpMainTemplatePlugin {
 				return source;
 			}
 		);
-		mainTemplate.hooks.afterStartup.tap(
+		mainTemplate.hooks.beforeStartup.tap(
 			"JsonpMainTemplatePlugin",
 			(source, chunk, hash) => {
 				const prefetchChunks = chunk.getChildIdsByOrders().prefetch;
@@ -513,7 +512,7 @@ class JsonpMainTemplatePlugin {
 								.map(e => JSON.stringify(e))
 								.join(", ")});`,
 							"// run deferred modules when ready",
-							"bootstrapReturn = checkDeferredModules();"
+							"return checkDeferredModules();"
 						]);
 					} else {
 						return Template.asString([
diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
