fix a bug that prevented the automatic chunk selection to select initial chunks

sokra · sokra · commit 907cd1659563 · 2017-07-27T14:32:35.000+02:00
fixes webpack#5145 fixes webpack#5386 fixes webpack#5285 fixes webpack#5109
diff --git a/lib/optimize/CommonsChunkPlugin.js b/lib/optimize/CommonsChunkPlugin.js
@@ -201,7 +201,7 @@ You can however specify the name of the async chunk by passing the desired strin
 
 		// we dont have named chunks specified, so we just take all of them
 		if(asyncOrNoSelectedChunk) {
-			return allChunks.filter(chunk => !chunk.isInitial());
+			return allChunks;
 		}
 
 		/**
@@ -229,8 +229,15 @@ Take a look at the "name"/"names" or async/children option.`);
 			}
 
 			return targetChunk.chunks.filter((chunk) => {
+				// we only are interested in on-demand chunks
+				if(chunk.isInitial())
+					return false;
+
 				// we can only move modules from this chunk if the "commonChunk" is the only parent
-				return asyncOption || chunk.parents.length === 1;
+				if(!asyncOption)
+					return chunk.parents.length === 1;
+
+				return true;
 			});
 		}
 
diff --git a/test/configCases/async-commons-chunk/all-selected/a.js b/test/configCases/async-commons-chunk/all-selected/a.js
@@ -0,0 +1 @@
+module.exports = "a";
diff --git a/test/configCases/async-commons-chunk/all-selected/b.js b/test/configCases/async-commons-chunk/all-selected/b.js
@@ -0,0 +1 @@
+module.exports = "b";
diff --git a/test/configCases/async-commons-chunk/all-selected/c.js b/test/configCases/async-commons-chunk/all-selected/c.js
@@ -0,0 +1 @@
+module.exports = "c";
diff --git a/test/configCases/async-commons-chunk/all-selected/index.js b/test/configCases/async-commons-chunk/all-selected/index.js
@@ -0,0 +1,22 @@
+it("should load the full async commons", function(done) {
+	require.ensure(["./a"], function(require) {
+		require("./a").should.be.eql("a");
+		done();
+	});
+});
+
+it("should load a chunk with async commons (AMD)", function(done) {
+	require(["./a", "./b"], function(a, b) {
+		a.should.be.eql("a");
+		b.should.be.eql("b");
+		done();
+	});
+});
+
+it("should load a chunk with async commons (require.ensure)", function(done) {
+	require.ensure([], function(require) {
+		require("./a").should.be.eql("a");
+		require("./c").should.be.eql("c");
+		done();
+	});
+});
diff --git a/test/configCases/async-commons-chunk/all-selected/webpack.config.js b/test/configCases/async-commons-chunk/all-selected/webpack.config.js
@@ -0,0 +1,9 @@
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.optimize.CommonsChunkPlugin({
+			async: true
+		})
+	]
+};
diff --git a/test/statsCases/async-commons-chunk-all-selected/a.js b/test/statsCases/async-commons-chunk-all-selected/a.js
@@ -0,0 +1 @@
+module.exports = "a";
diff --git a/test/statsCases/async-commons-chunk-all-selected/b.js b/test/statsCases/async-commons-chunk-all-selected/b.js
@@ -0,0 +1 @@
+module.exports = "b";
diff --git a/test/statsCases/async-commons-chunk-all-selected/c.js b/test/statsCases/async-commons-chunk-all-selected/c.js
@@ -0,0 +1 @@
+module.exports = "c";
diff --git a/test/statsCases/async-commons-chunk-all-selected/expected.txt b/test/statsCases/async-commons-chunk-all-selected/expected.txt
@@ -0,0 +1,14 @@
+chunk    {0} 0.js 21 bytes {3} [rendered]
+    > async commons [1] (webpack)/test/statsCases/async-commons-chunk-all-selected/index.js 2:1-5:3
+    > async commons [1] (webpack)/test/statsCases/async-commons-chunk-all-selected/index.js 9:1-13:3
+    > async commons [1] (webpack)/test/statsCases/async-commons-chunk-all-selected/index.js 17:1-21:3
+    [0] (webpack)/test/statsCases/async-commons-chunk-all-selected/a.js 21 bytes {0} [built]
+chunk    {1} 1.js 21 bytes {3} [rendered]
+    > [1] (webpack)/test/statsCases/async-commons-chunk-all-selected/index.js 17:1-21:3
+    [3] (webpack)/test/statsCases/async-commons-chunk-all-selected/c.js 21 bytes {1} [built]
+chunk    {2} 2.js 21 bytes {3} [rendered]
+    > [1] (webpack)/test/statsCases/async-commons-chunk-all-selected/index.js 9:1-13:3
+    [2] (webpack)/test/statsCases/async-commons-chunk-all-selected/b.js 21 bytes {2} [built]
+chunk    {3} entry.js (entry) 550 bytes [entry] [rendered]
+    > entry [1] (webpack)/test/statsCases/async-commons-chunk-all-selected/index.js 
+    [1] (webpack)/test/statsCases/async-commons-chunk-all-selected/index.js 550 bytes {3} [built]
diff --git a/test/statsCases/async-commons-chunk-all-selected/index.js b/test/statsCases/async-commons-chunk-all-selected/index.js
@@ -0,0 +1,22 @@
+it("should load the full async commons", function(done) {
+	require.ensure(["./a"], function(require) {
+		require("./a").should.be.eql("a");
+		done();
+	});
+});
+
+it("should load a chunk with async commons (AMD)", function(done) {
+	require(["./a", "./b"], function(a, b) {
+		a.should.be.eql("a");
+		b.should.be.eql("b");
+		done();
+	});
+});
+
+it("should load a chunk with async commons (require.ensure)", function(done) {
+	require.ensure([], function(require) {
+		require("./a").should.be.eql("a");
+		require("./c").should.be.eql("c");
+		done();
+	});
+});
diff --git a/test/statsCases/async-commons-chunk-all-selected/webpack.config.js b/test/statsCases/async-commons-chunk-all-selected/webpack.config.js
@@ -0,0 +1,20 @@
+var webpack = require("../../../");
+
+module.exports = {
+	entry: {
+		entry: "./"
+	},
+	plugins: [
+		new webpack.optimize.CommonsChunkPlugin({
+			async: true
+		})
+	],
+	stats: {
+		hash: false,
+		timings: false,
+		assets: false,
+		chunks: true,
+		chunkOrigins: true,
+		modules: false
+	}
+};
diff --git a/test/statsCases/async-commons-chunk/a.js b/test/statsCases/async-commons-chunk/a.js
@@ -0,0 +1 @@
+module.exports = "a";
diff --git a/test/statsCases/async-commons-chunk/b.js b/test/statsCases/async-commons-chunk/b.js
@@ -0,0 +1 @@
+module.exports = "b";
diff --git a/test/statsCases/async-commons-chunk/c.js b/test/statsCases/async-commons-chunk/c.js
@@ -0,0 +1 @@
+module.exports = "c";
diff --git a/test/statsCases/async-commons-chunk/expected.txt b/test/statsCases/async-commons-chunk/expected.txt
@@ -0,0 +1,14 @@
+chunk    {0} 0.js 21 bytes {3} [rendered]
+    > async commons [1] (webpack)/test/statsCases/async-commons-chunk/index.js 2:1-5:3
+    > async commons [1] (webpack)/test/statsCases/async-commons-chunk/index.js 9:1-13:3
+    > async commons [1] (webpack)/test/statsCases/async-commons-chunk/index.js 17:1-21:3
+    [0] (webpack)/test/statsCases/async-commons-chunk/a.js 21 bytes {0} [built]
+chunk    {1} 1.js 21 bytes {3} [rendered]
+    > [1] (webpack)/test/statsCases/async-commons-chunk/index.js 17:1-21:3
+    [3] (webpack)/test/statsCases/async-commons-chunk/c.js 21 bytes {1} [built]
+chunk    {2} 2.js 21 bytes {3} [rendered]
+    > [1] (webpack)/test/statsCases/async-commons-chunk/index.js 9:1-13:3
+    [2] (webpack)/test/statsCases/async-commons-chunk/b.js 21 bytes {2} [built]
+chunk    {3} main.js (main) 550 bytes [entry] [rendered]
+    > main [1] (webpack)/test/statsCases/async-commons-chunk/index.js 
+    [1] (webpack)/test/statsCases/async-commons-chunk/index.js 550 bytes {3} [built]
diff --git a/test/statsCases/async-commons-chunk/index.js b/test/statsCases/async-commons-chunk/index.js
@@ -0,0 +1,22 @@
+it("should load the full async commons", function(done) {
+	require.ensure(["./a"], function(require) {
+		require("./a").should.be.eql("a");
+		done();
+	});
+});
+
+it("should load a chunk with async commons (AMD)", function(done) {
+	require(["./a", "./b"], function(a, b) {
+		a.should.be.eql("a");
+		b.should.be.eql("b");
+		done();
+	});
+});
+
+it("should load a chunk with async commons (require.ensure)", function(done) {
+	require.ensure([], function(require) {
+		require("./a").should.be.eql("a");
+		require("./c").should.be.eql("c");
+		done();
+	});
+});
diff --git a/test/statsCases/async-commons-chunk/webpack.config.js b/test/statsCases/async-commons-chunk/webpack.config.js
@@ -0,0 +1,19 @@
+var webpack = require("../../../");
+
+module.exports = {
+	entry: "./",
+	plugins: [
+		new webpack.optimize.CommonsChunkPlugin({
+			name: "main",
+			async: true
+		})
+	],
+	stats: {
+		hash: false,
+		timings: false,
+		assets: false,
+		chunks: true,
+		chunkOrigins: true,
+		modules: false
+	}
+};
