Merge pull request webpack#6766 from montogeek/misc/add-schemas-eslint-prettier

sokra · web-flow · commit fc7f3441c334 · 2018-03-16T09:40:55.000+01:00
misc: Add schemas to ESLint and Prettier commands
diff --git a/package.json b/package.json
@@ -102,9 +102,9 @@
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "npm run lint-files",
     "lint-files": "npm run lint && npm run schema-lint",
-    "lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
     "fix": "npm run lint -- --fix",
-    "pretty-files": "prettier \"lib/**.*\" \"bin/**.*\" \"hot/**.*\" \"buildin/**.*\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" --write",
+    "pretty-files": "prettier \"lib/**.*\" \"bin/**.*\" \"hot/**.*\" \"buildin/**.*\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" --write",
     "schema-lint": "mocha test/*.lint.js --opts test/lint-mocha.opts",
     "benchmark": "mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.benchmark.js -R spec",
     "cover": "npm run cover:init && npm run cover:all && npm run cover:report",
diff --git a/schemas/ajv.absolutePath.js b/schemas/ajv.absolutePath.js
@@ -1,29 +1,32 @@
 "use strict";
 
 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(data)} is an absolute path!`;
+	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(
+				data
+			)} is an absolute path!`;
 
 	return {
 		keyword: "absolutePath",
 		params: { absolutePath: data },
 		message: message,
-		parentSchema: schema,
+		parentSchema: schema
 	};
 };
-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) {
-				callback.errors = [getErrorFor(expected, data, schema)];
+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) {
+					callback.errors = [getErrorFor(expected, data, schema)];
+				}
+				return passes;
 			}
-			return passes;
+			callback.errors = [];
+			return callback;
 		}
-		callback.errors = [];
-		return callback;
-	}
-});
+	});
