Added chunkFilenameDelimiter option for SplitChunksPlugin: Added tests and fixed code style

ManuelBauer · ManuelBauer · commit 085d2885e4d4 · 2018-03-09T14:27:19.000+01:00
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js
@@ -84,39 +84,46 @@ module.exports = class SplitChunksPlugin {
 	}
 
 	static normalizeOptions(options = {}) {
-		const chunkFilenameDelimiter = options.chunkFilenameDelimiter || '~';
+		const chunkFilenameDelimiter = options.chunkFilenameDelimiter || "~";
 
 		return {
 			chunks: options.chunks || "all",
 			minSize: options.minSize || 0,
 			minChunks: options.minChunks || 1,
 			maxAsyncRequests: options.maxAsyncRequests || 1,
 			maxInitialRequests: options.maxInitialRequests || 1,
-			getName: SplitChunksPlugin.normalizeName(options.name, chunkFilenameDelimiter) || (() => {}),
+			getName:
+				SplitChunksPlugin.normalizeName({
+					option: options.name,
+					chunkFilenameDelimiter
+				}) || (() => {}),
 			filename: options.filename || undefined,
-			getCacheGroups: SplitChunksPlugin.normalizeCacheGroups(
-				options.cacheGroups, chunkFilenameDelimiter
-			),
+			getCacheGroups: SplitChunksPlugin.normalizeCacheGroups({
+				cacheGroups: options.cacheGroups,
+				chunkFilenameDelimiter
+			}),
 			chunkFilenameDelimiter: chunkFilenameDelimiter
 		};
 	}
 
-	static normalizeName(option, chunkFilenameDelimiter) {
+	static normalizeName({ option, chunkFilenameDelimiter }) {
 		if (option === true) {
 			const fn = (module, chunks, cacheGroup) => {
 				const names = chunks.map(c => c.name);
 				if (!names.every(Boolean)) return;
 				names.sort();
 				let name =
-					(cacheGroup && cacheGroup !== "default" ? cacheGroup + chunkFilenameDelimiter : "") +
-					names.join(chunkFilenameDelimiter);
+					(cacheGroup && cacheGroup !== "default"
+						? cacheGroup + chunkFilenameDelimiter
+						: "") + names.join(chunkFilenameDelimiter);
 				// Filenames and paths can't be too long otherwise an
 				// ENAMETOOLONG error is raised. If the generated name if too
 				// long, it is truncated and a hash is appended. The limit has
 				// been set to 100 to prevent `[name].[chunkhash].[ext]` from
 				// generating a 256+ character string.
 				if (name.length > 100) {
-					name = name.slice(0, 100) + chunkFilenameDelimiter + hashFilename(name);
+					name =
+						name.slice(0, 100) + chunkFilenameDelimiter + hashFilename(name);
 				}
 				return name;
 			};
@@ -131,7 +138,7 @@ module.exports = class SplitChunksPlugin {
 		if (typeof option === "function") return option;
 	}
 
-	static normalizeCacheGroups(cacheGroups, chunkFilenameDelimiter) {
+	static normalizeCacheGroups({ cacheGroups, chunkFilenameDelimiter }) {
 		if (typeof cacheGroups === "function") {
 			return cacheGroups;
 		}
@@ -166,7 +173,10 @@ module.exports = class SplitChunksPlugin {
 						results.push({
 							key: key,
 							priority: option.priority,
-							getName: SplitChunksPlugin.normalizeName(option.name, chunkFilenameDelimiter),
+							getName: SplitChunksPlugin.normalizeName({
+								option: option.name,
+								chunkFilenameDelimiter
+							}),
 							chunks: option.chunks,
 							enforce: option.enforce,
 							minSize: option.minSize,
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter-default/a.js b/test/configCases/split-chunks/chunk-filename-delimiter-default/a.js
@@ -0,0 +1,3 @@
+const c = require("./commons");
+
+module.exports = "a" + c;
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter-default/b.js b/test/configCases/split-chunks/chunk-filename-delimiter-default/b.js
@@ -0,0 +1,3 @@
+const c = require("./commons");
+
+module.exports = "b" + c;
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter-default/c.js b/test/configCases/split-chunks/chunk-filename-delimiter-default/c.js
@@ -0,0 +1,3 @@
+const c = require("./commons");
+
+module.exports = "c" + c;
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter-default/commons.js b/test/configCases/split-chunks/chunk-filename-delimiter-default/commons.js
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter-default/index.js b/test/configCases/split-chunks/chunk-filename-delimiter-default/index.js
@@ -0,0 +1,16 @@
+require("should");
+
+it("should run", function() {
+	Promise.all(
+		[
+			import(/* webpackChunkName: "a" */ "./a"),
+			import(/* webpackChunkName: "b" */ "./b"),
+			import(/* webpackChunkName: "c" */ "./c")
+		]
+	);
+
+	const files = require("fs").readdirSync(__dirname);
+	const hasFile = files.indexOf('a~b~c.bundle.js') !== -1;
+
+	hasFile.should.be.eql(true);
+});
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter-default/test.config.js b/test/configCases/split-chunks/chunk-filename-delimiter-default/test.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	findBundle: function(i, options) {
+		return ["main.js"];
+	}
+};
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter-default/webpack.config.js b/test/configCases/split-chunks/chunk-filename-delimiter-default/webpack.config.js
@@ -0,0 +1,17 @@
+const SplitChunksPlugin = require("../../../../lib/optimize/SplitChunksPlugin");
+
+module.exports = {
+	entry: {
+		main: "./index"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	output: {
+		filename: "[name].js",
+		chunkFilename: "[name].bundle.js",
+		jsonpFunction: "_load_chunk"
+	},
+	plugins: [new SplitChunksPlugin()]
+};
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter/a.js b/test/configCases/split-chunks/chunk-filename-delimiter/a.js
@@ -0,0 +1,3 @@
+const c = require("./commons");
+
+module.exports = "a" + c;
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter/b.js b/test/configCases/split-chunks/chunk-filename-delimiter/b.js
@@ -0,0 +1,3 @@
+const c = require("./commons");
+
+module.exports = "b" + c;
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter/c.js b/test/configCases/split-chunks/chunk-filename-delimiter/c.js
@@ -0,0 +1,3 @@
+const c = require("./commons");
+
+module.exports = "c" + c;
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter/commons.js b/test/configCases/split-chunks/chunk-filename-delimiter/commons.js
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter/index.js b/test/configCases/split-chunks/chunk-filename-delimiter/index.js
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter/test.config.js b/test/configCases/split-chunks/chunk-filename-delimiter/test.config.js
diff --git a/test/configCases/split-chunks/chunk-filename-delimiter/webpack.config.js b/test/configCases/split-chunks/chunk-filename-delimiter/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const c = require("./commons");`
	`2`	`+`
	`3`	`+module.exports = "a" + c;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const c = require("./commons");`
	`2`	`+`
	`3`	`+module.exports = "b" + c;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const c = require("./commons");`
	`2`	`+`
	`3`	`+module.exports = "c" + c;`