Added chunkFilenameDelimiter option for SplitChunksPlugin: Fixed parameter

ManuelBauer · ManuelBauer · commit b803c649eeaa · 2018-03-09T10:28:21.000+01:00
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js
@@ -84,37 +84,39 @@ module.exports = class SplitChunksPlugin {
 	}
 
 	static normalizeOptions(options = {}) {
+		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) || (() => {}),
+			getName: SplitChunksPlugin.normalizeName(options.name, chunkFilenameDelimiter) || (() => {}),
 			filename: options.filename || undefined,
 			getCacheGroups: SplitChunksPlugin.normalizeCacheGroups(
-				options.cacheGroups
+				options.cacheGroups, chunkFilenameDelimiter
 			),
-			chunkFilenameDelimiter: options.chunkFilenameDelimiter || '~'
+			chunkFilenameDelimiter: chunkFilenameDelimiter
 		};
 	}
 
-	static normalizeName(option) {
+	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 + this.options.chunkFilenameDelimiter : "") +
-					names.join(this.options.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) + this.options.chunkFilenameDelimiter + hashFilename(name);
+					name = name.slice(0, 100) + chunkFilenameDelimiter + hashFilename(name);
 				}
 				return name;
 			};
@@ -129,7 +131,7 @@ module.exports = class SplitChunksPlugin {
 		if (typeof option === "function") return option;
 	}
 
-	static normalizeCacheGroups(cacheGroups) {
+	static normalizeCacheGroups(cacheGroups, chunkFilenameDelimiter) {
 		if (typeof cacheGroups === "function") {
 			return cacheGroups;
 		}
@@ -164,7 +166,7 @@ module.exports = class SplitChunksPlugin {
 						results.push({
 							key: key,
 							priority: option.priority,
-							getName: SplitChunksPlugin.normalizeName(option.name),
+							getName: SplitChunksPlugin.normalizeName(option.name, chunkFilenameDelimiter),
 							chunks: option.chunks,
 							enforce: option.enforce,
 							minSize: option.minSize,
