Support selector function as optimization.splitChunks.chunks option

Hypnosphi · Hypnosphi · commit f804ff06be7e · 2018-03-18T16:51:06.000+03:00
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js
@@ -305,15 +305,17 @@ module.exports = class SplitChunksPlugin {
 								if (chunkIndices.length < cacheGroup.minChunks) continue;
 								// Select chunks by configuration
 								const selectedChunks =
-									cacheGroup.chunks === "initial"
-										? Array.from(chunkCombination).filter(chunk =>
-												chunk.canBeInitial()
-											)
-										: cacheGroup.chunks === "async"
-											? Array.from(chunkCombination).filter(
-													chunk => !chunk.canBeInitial()
+									typeof cacheGroup.chunks === "function"
+										? cacheGroup.chunks(Array.from(chunkCombination))
+										: cacheGroup.chunks === "initial"
+											? Array.from(chunkCombination).filter(chunk =>
+													chunk.canBeInitial()
 												)
-											: Array.from(chunkCombination);
+											: cacheGroup.chunks === "async"
+												? Array.from(chunkCombination).filter(
+														chunk => !chunk.canBeInitial()
+													)
+												: Array.from(chunkCombination);
 								// Break if minimum number of chunks is not reached
 								if (selectedChunks.length < cacheGroup.minChunks) continue;
 								// Determine name for split chunk
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1337,10 +1337,17 @@
               "properties": {
                 "chunks": {
                   "description": "Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML)",
-                  "enum": [
-                    "initial",
-                    "async",
-                    "all"
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "initial",
+                        "async",
+                        "all"
+                      ]
+                    },
+                    {
+                      "instanceof": "Function"
+                    }
                   ]
                 },
                 "minSize": {
diff --git a/test/statsCases/split-chunks/expected.txt b/test/statsCases/split-chunks/expected.txt
@@ -257,4 +257,72 @@ Child name-too-long:
         > ./c cccccccccccccccccccccccccccccc
         [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
         [1] ./f.js 20 bytes {2} {11} {12} [built]
-        [5] ./c.js 72 bytes {7} {12} [built]
+        [5] ./c.js 72 bytes {7} {12} [built]
+Child default:
+    Entrypoint main = default/main.js
+    Entrypoint a = default/a.js
+    Entrypoint b = default/vendors~async-a~async-b~async-c~b~c.js default/vendors~async-a~async-b~b.js default/b.js
+    Entrypoint c = default/vendors~async-a~async-b~async-c~b~c.js default/vendors~async-c~c.js default/c.js
+    chunk    {0} default/vendors~async-a~async-b~async-c~b~c.js (vendors~async-a~async-b~async-c~b~c) 20 bytes <{9}> ={1}= ={11}= ={12}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c~b~c)
+        > ./b b
+        > ./c c
+        > ./a [8] ./index.js 1:0-47
+        > ./b [8] ./index.js 2:0-47
+        > ./c [8] ./index.js 3:0-47
+        [2] ./node_modules/x.js 20 bytes {0} {10} [built]
+    chunk    {1} default/async-a~async-b~async-c~b~c.js (async-a~async-b~async-c~b~c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c~b~c)
+        > ./a [8] ./index.js 1:0-47
+        > ./b [8] ./index.js 2:0-47
+        > ./c [8] ./index.js 3:0-47
+        [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
+    chunk    {2} default/async-b~async-c~async-g~b~c.js (async-b~async-c~async-g~b~c) 20 bytes <{0}> <{1}> <{10}> <{3}> <{6}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={7}= ={8}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g~b~c)
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+        > ./b [8] ./index.js 2:0-47
+        > ./c [8] ./index.js 3:0-47
+        [1] ./f.js 20 bytes {2} {11} {12} [built]
+    chunk    {3} default/vendors~async-a~async-b~b.js (vendors~async-a~async-b~b) 20 bytes <{9}> ={0}= ={1}= ={11}= ={2}= ={6}= ={7}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~b)
+        > ./b b
+        > ./a [8] ./index.js 1:0-47
+        > ./b [8] ./index.js 2:0-47
+        [3] ./node_modules/y.js 20 bytes {3} {10} [built]
+    chunk    {4} default/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={8}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+        > ./c c
+        > ./c [8] ./index.js 3:0-47
+        [7] ./node_modules/z.js 20 bytes {4} [built]
+    chunk    {5} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{6}> ={2}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+        [9] ./g.js 34 bytes {5} [built]
+    chunk    {6} default/async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+        [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
+            | ./a.js 121 bytes [built]
+            | ./e.js 20 bytes [built]
+    chunk    {7} default/async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+        [4] ./b.js 72 bytes {7} {11} [built]
+    chunk    {8} default/async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={4}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+        [5] ./c.js 72 bytes {8} {12} [built]
+    chunk    {9} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{6}< >{7}< >{8}< [entry] [rendered]
+        > ./ main
+        [8] ./index.js 147 bytes {9} [built]
+    chunk   {10} default/a.js (a) 216 bytes >{2}< >{5}< [entry] [rendered]
+        > ./a a
+        [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
+        [2] ./node_modules/x.js 20 bytes {0} {10} [built]
+        [3] ./node_modules/y.js 20 bytes {3} {10} [built]
+        [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
+            | ./a.js 121 bytes [built]
+            | ./e.js 20 bytes [built]
+    chunk   {11} default/b.js (b) 112 bytes ={0}= ={3}= [entry] [rendered]
+        > ./b b
+        [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
+        [1] ./f.js 20 bytes {2} {11} {12} [built]
+        [4] ./b.js 72 bytes {7} {11} [built]
+    chunk   {12} default/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
+        > ./c c
+        [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
+        [1] ./f.js 20 bytes {2} {11} {12} [built]
+        [5] ./c.js 72 bytes {8} {12} [built]
diff --git a/test/statsCases/split-chunks/webpack.config.js b/test/statsCases/split-chunks/webpack.config.js
@@ -98,5 +98,26 @@ module.exports = [
 			}
 		},
 		stats
+	},
+
+	{
+		name: "default",
+		mode: "production",
+		entry: {
+			main: "./",
+			a: "./a",
+			b: "./b",
+			c: "./c"
+		},
+		output: {
+			filename: "default/[name].js"
+		},
+		optimization: {
+			splitChunks: {
+				minSize: 0,
+				chunks: chunks => chunks.filter(chunk => chunk.name !== "a")
+			}
+		},
+		stats
 	}
 ];
