Merge pull request webpack#6754 from byzyk/fix/6742

sokra · web-flow · commit 04d8188063e9 · 2018-03-21T09:18:17.000+01:00
fix: validation error when ! is in the path
diff --git a/schemas/ajv.absolutePath.js b/schemas/ajv.absolutePath.js
@@ -1,32 +1,55 @@
 "use strict";
 
+const errorMessage = (schema, data, message) => ({
+	keyword: "absolutePath",
+	params: { absolutePath: data },
+	message: message,
+	parentSchema: schema
+});
+
 const getErrorFor = (shouldBeAbsolute, data, schema) => {
 	const message = shouldBeAbsolute
 		? `The provided value ${JSON.stringify(data)} is not an absolute path!`
-		: `A relative path is expected. However the provided value ${JSON.stringify(
+		: `A relative path is expected. However, the provided value ${JSON.stringify(
 				data
 			)} is an absolute path!`;
 
-	return {
-		keyword: "absolutePath",
-		params: { absolutePath: data },
-		message: message,
-		parentSchema: schema
-	};
+	return errorMessage(schema, data, message);
 };
+
 module.exports = ajv =>
 	ajv.addKeyword("absolutePath", {
 		errors: true,
 		type: "string",
 		compile(expected, schema) {
 			function callback(data) {
-				const passes = expected === /^(?:[A-Za-z]:\\|\/)/.test(data);
-				if (!passes) {
+				let passes = true;
+				const isExclamationMarkPresent = data.includes("!");
+				const isCorrectAbsoluteOrRelativePath =
+					expected === /^(?:[A-Za-z]:\\|\/)/.test(data);
+
+				if (isExclamationMarkPresent) {
+					callback.errors = [
+						errorMessage(
+							schema,
+							data,
+							`The provided value ${JSON.stringify(
+								data
+							)} contans exclamation mark (!) which is not allowed because it's reserved for loader syntax.`
+						)
+					];
+					passes = false;
+				}
+
+				if (!isCorrectAbsoluteOrRelativePath) {
 					callback.errors = [getErrorFor(expected, data, schema)];
+					passes = false;
 				}
+
 				return passes;
 			}
 			callback.errors = [];
+
 			return callback;
 		}
 	});
diff --git a/test/Validation.test.js b/test/Validation.test.js
@@ -231,6 +231,20 @@ describe("Validation", () => {
 				"    * configuration.devtool should be false"
 			]
 		},
+		{
+			name: "! in path",
+			config: {
+				entry: "foo.js",
+				output: {
+					path: "/somepath/!test",
+					filename: "bar"
+				}
+			},
+			message: [
+				' - configuration.output.path: The provided value "/somepath/!test" contans exclamation mark (!) which is not allowed because it\'s reserved for loader syntax.',
+				"   -> The output directory as **absolute path** (required)."
+			]
+		},
 		{
 			name: "relative path",
 			config: {
@@ -240,7 +254,7 @@ describe("Validation", () => {
 				}
 			},
 			message: [
-				' - configuration.output.filename: A relative path is expected. However the provided value "/bar" is an absolute path!',
+				' - configuration.output.filename: A relative path is expected. However, the provided value "/bar" is an absolute path!',
 				"   -> Specifies the name of each output file on disk. You must **not** specify an absolute path here! The `output.path` option determines the location on disk the files are written to, filename is used solely for naming the individual files.",
 				"   Please use output.path to specify absolute path and output.filename for the file name."
 			]
