Merge pull request #6672 from EugeneHlushko/fix/6639

fix(bug): chunkFilename as function doesn't work
webpack · Mar 29, 2018 · b30de38 · b30de38
2 parents f600ccd + aa55324
commit b30de38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -91,14 +91,16 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("output.filename", "[name].js");
 		this.set("output.chunkFilename", "make", options => {
 			const filename = options.output.filename;
-			if (typeof filename === "function") return filename;
-			const hasName = filename.includes("[name]");
-			const hasId = filename.includes("[id]");
-			const hasChunkHash = filename.includes("[chunkhash]");
-			// Anything changing depending on chunk is fine
-			if (hasChunkHash || hasName || hasId) return filename;
-			// Elsewise prefix "[id]." in front of the basename to make it changing
-			return filename.replace(/(^|\/)([^/]*(?:\?|$))/, "$1[id].$2");
+			if (typeof filename !== "function") {
+				const hasName = filename.includes("[name]");
+				const hasId = filename.includes("[id]");
+				const hasChunkHash = filename.includes("[chunkhash]");
+				// Anything changing depending on chunk is fine
+				if (hasChunkHash || hasName || hasId) return filename;
+				// Elsewise prefix "[id]." in front of the basename to make it changing
+				return filename.replace(/(^|\/)([^/]*(?:\?|$))/, "$1[id].$2");
+			}
+			return "[id].js";
 		});
 		this.set("output.webassemblyModuleFilename", "[modulehash].module.wasm");
 		this.set("output.library", "");

diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -324,14 +324,7 @@
         },
         "chunkFilename": {
           "description": "The filename of non-entry chunks as relative path inside the `output.path` directory.",
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "instanceof": "Function"
-            }
-          ],
+          "type": "string",
           "absolutePath": false
         },
         "webassemblyModuleFilename": {