Merge pull request #7662 from webpack/bugfix/undefined-in-max-size

fixes usage of automaticNameDelimiter in cache groups
webpack · Jul 5, 2018 · 7fc88cd · 7fc88cd
2 parents 67d932d + 8e8f185
commit 7fc88cd
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 68 deletions.
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js
@@ -126,6 +126,7 @@ module.exports = class SplitChunksPlugin {
 				cacheGroups: options.cacheGroups,
 				automaticNameDelimiter: options.automaticNameDelimiter
 			}),
+			automaticNameDelimiter: options.automaticNameDelimiter,
 			fallbackCacheGroup: SplitChunksPlugin.normalizeFallbackCacheGroup(
 				options.fallbackCacheGroup || {},
 				options
@@ -557,6 +558,10 @@ module.exports = class SplitChunksPlugin {
 									cacheGroupSource.filename !== undefined
 										? cacheGroupSource.filename
 										: this.options.filename,
+								automaticNameDelimiter:
+									cacheGroupSource.automaticNameDelimiter !== undefined
+										? cacheGroupSource.automaticNameDelimiter
+										: this.options.automaticNameDelimiter,
 								reuseExistingChunk: cacheGroupSource.reuseExistingChunk
 							};
 							// For all combination of chunk selection

diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
diff --git a/test/statsCases/split-chunks-max-size/index.js b/test/statsCases/split-chunks-max-size/index.js
@@ -41,3 +41,8 @@ import "./in-some-directory/small?2";
 import "./in-some-directory/small?3";
 import "./in-some-directory/small?4";
 import "./in-some-directory/very-big?1";
+
+import "big?1";
+import "small?1";
+import "small?2";
+import "very-big?1";
diff --git a/test/statsCases/split-chunks-max-size/node_modules/big.js b/test/statsCases/split-chunks-max-size/node_modules/big.js
diff --git a/test/statsCases/split-chunks-max-size/node_modules/small.js b/test/statsCases/split-chunks-max-size/node_modules/small.js
diff --git a/test/statsCases/split-chunks-max-size/node_modules/very-big.js b/test/statsCases/split-chunks-max-size/node_modules/very-big.js
diff --git a/test/statsCases/split-chunks-max-size/webpack.config.js b/test/statsCases/split-chunks-max-size/webpack.config.js
@@ -21,7 +21,8 @@ module.exports = [
 		optimization: {
 			splitChunks: {
 				minSize: 100,
-				maxSize: 1000
+				maxSize: 1000,
+				chunks: "all"
 			}
 		},
 		stats
@@ -38,7 +39,8 @@ module.exports = [
 		optimization: {
 			splitChunks: {
 				minSize: 100,
-				maxSize: 1000
+				maxSize: 1000,
+				chunks: "all"
 			}
 		},
 		stats