Merge pull request webpack#7102 from alejandroMA/bugfix/runtime-chunk-integration

sokra · web-flow · commit 81c6041a8996 · 2018-04-30T13:52:50.000+02:00
fix bug where sometimes the runtime would not be present on output
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -50,6 +50,7 @@ class Chunk {
 		this.ids = null;
 		this.debugId = debugId++;
 		this.name = name;
+		this.preventIntegration = false;
 		this.entryModule = undefined;
 		this._modules = new SortableSet(undefined, sortByIdentifier);
 		this._groups = new SortableSet(undefined, sortById);
@@ -265,6 +266,9 @@ class Chunk {
 			}
 			return true;
 		};
+
+		if (this.preventIntegration || otherChunk.preventIntegration) return false;
+
 		if (this.hasRuntime() !== otherChunk.hasRuntime()) {
 			if (this.hasRuntime()) {
 				return isAvailable(this, otherChunk);
diff --git a/lib/optimize/RuntimeChunkPlugin.js b/lib/optimize/RuntimeChunkPlugin.js
@@ -25,6 +25,7 @@ module.exports = class RuntimeChunkPlugin {
 							name = name(entrypoint);
 						}
 						const newChunk = compilation.addChunk(name);
+						newChunk.preventIntegration = true;
 						entrypoint.unshiftChunk(newChunk);
 						newChunk.addGroup(entrypoint);
 						entrypoint.setRuntimeChunk(newChunk);
diff --git a/test/statsCases/runtime-chunk-integration/b.js b/test/statsCases/runtime-chunk-integration/b.js
@@ -0,0 +1 @@
+export default "b";
diff --git a/test/statsCases/runtime-chunk-integration/c.js b/test/statsCases/runtime-chunk-integration/c.js
@@ -0,0 +1 @@
+export default "c";
diff --git a/test/statsCases/runtime-chunk-integration/d.js b/test/statsCases/runtime-chunk-integration/d.js
@@ -0,0 +1 @@
+export default "d";
diff --git a/test/statsCases/runtime-chunk-integration/expected.txt b/test/statsCases/runtime-chunk-integration/expected.txt
@@ -0,0 +1,22 @@
+Child base:
+         Asset       Size  Chunks             Chunk Names
+          0.js  719 bytes       0  [emitted]  
+      main1.js  542 bytes       1  [emitted]  main1
+    runtime.js   7.73 KiB       2  [emitted]  runtime
+    Entrypoint main1 = runtime.js main1.js
+    [0] ./b.js 20 bytes {0} [built]
+    [1] ./c.js 20 bytes {0} [built]
+    [2] ./d.js 20 bytes {0} [built]
+    [3] ./main1.js 66 bytes {1} [built]
+Child manifest is named entry:
+          Asset       Size  Chunks             Chunk Names
+           0.js  719 bytes       0  [emitted]  
+    manifest.js   8.04 KiB       1  [emitted]  manifest
+       main1.js  542 bytes       2  [emitted]  main1
+    Entrypoint main1 = manifest.js main1.js
+    Entrypoint manifest = manifest.js
+    [0] ./b.js 20 bytes {0} [built]
+    [1] ./c.js 20 bytes {0} [built]
+    [2] ./d.js 20 bytes {0} [built]
+    [3] ./main1.js 66 bytes {2} [built]
+    [4] ./f.js 20 bytes {1} [built]
diff --git a/test/statsCases/runtime-chunk-integration/f.js b/test/statsCases/runtime-chunk-integration/f.js
@@ -0,0 +1 @@
+export default "f";
diff --git a/test/statsCases/runtime-chunk-integration/main1.js b/test/statsCases/runtime-chunk-integration/main1.js
@@ -0,0 +1,5 @@
+import("./b");
+import("./c");
+import("./d");
+
+export default "a";
diff --git a/test/statsCases/runtime-chunk-integration/webpack.config.js b/test/statsCases/runtime-chunk-integration/webpack.config.js
@@ -0,0 +1,44 @@
+const MinChunkSizePlugin = require("../../../lib/optimize/MinChunkSizePlugin");
+
+const baseConfig = {
+	mode: "production",
+	target: "web",
+	output: {
+		filename: "[name].js"
+	},
+	stats: {
+		hash: false,
+		timings: false,
+		builtAt: false
+	},
+	plugins: [
+		new MinChunkSizePlugin({
+			minChunkSize: 1000
+		})
+	]
+};
+
+const withoutNamedEntry = Object.assign({}, baseConfig, {
+	name: "base",
+	entry: {
+		main1: "./main1"
+	},
+	optimization: {
+		runtimeChunk: "single"
+	}
+});
+
+const withNamedEntry = Object.assign({}, baseConfig, {
+	name: "manifest is named entry",
+	entry: {
+		main1: "./main1",
+		manifest: "./f"
+	},
+	optimization: {
+		runtimeChunk: {
+			name: "manifest"
+		}
+	}
+});
+
+module.exports = [withoutNamedEntry, withNamedEntry];

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ module.exports = class RuntimeChunkPlugin {`
`25`	`25`	`name = name(entrypoint);`
`26`	`26`	`}`
`27`	`27`	`const newChunk = compilation.addChunk(name);`
	`28`	`+ newChunk.preventIntegration = true;`
`28`	`29`	`entrypoint.unshiftChunk(newChunk);`
`29`	`30`	`newChunk.addGroup(entrypoint);`
`30`	`31`	`entrypoint.setRuntimeChunk(newChunk);`