fix: validation schema (schema-utils) (#527)

Author: evilebottnawi

index.js

@@ -9,9 +9,7 @@ var ExtractedModule = require("./ExtractedModule");
 var Chunk = require("webpack/lib/Chunk");
 var OrderUndefinedError = require("./OrderUndefinedError");
 var loaderUtils = require("loader-utils");
-var schemaTester = require('./schema/validator');
-var loaderSchema = require('./schema/loader-schema');
-var pluginSchema = require('./schema/plugin-schema.json');
+var validateOptions = require('schema-utils');
 
 var NS = fs.realpathSync(__dirname);
 
@@ -122,7 +120,7 @@ function ExtractTextPlugin(options) {
 	if(isString(options)) {
 		options = { filename: options };
 	} else {
-		schemaTester(pluginSchema, options);
+		validateOptions('./schema/plugin.json', options, 'Extract Text Plugin');
 	}
 	this.filename = options.filename;
 	this.id = options.id != null ? options.id : ++nextId;
@@ -201,7 +199,7 @@ ExtractTextPlugin.prototype.extract = function(options) {
 	if(Array.isArray(options) || isString(options) || typeof options.options === "object" || typeof options.query === 'object') {
 		options = { loader: options };
 	} else {
-		schemaTester(loaderSchema, options);
+		validateOptions('./schema/loader.json', options, 'Extract Text Plugin (Loader)');
 	}
 	var loader = options.use ||  options.loader;
 	var before = options.fallback || options.fallbackLoader || [];

package.json

@@ -18,7 +18,7 @@
     "webpack": "^2.2.0"
   },
   "dependencies": {
-    "ajv": "^4.11.2",
+    "schema-utils": "^0.3.0",
     "async": "^2.1.2",
     "loader-utils": "^1.0.2",
     "webpack-sources": "^0.1.0"

schema/loader-schema.js

@@ -0,0 +1,36 @@
+{
+	"type": "object",
+	"additionalProperties": false,
+	"properties": {
+		"allChunks": {
+			"type": "boolean"
+		},
+		"disable": {
+			"type": "boolean"
+		},
+		"omit": {
+			"type": "boolean"
+		},
+		"remove": {
+			"type": "boolean"
+		},
+		"fallback": {
+			"type": ["string", "array", "object"]
+		},
+		"filename": {
+			"type": "string"
+		},
+		"use": {
+			"type": ["string", "array", "object"]
+		},
+		"publicPath": {
+			"type": "string"
+		},
+		"fallbackLoader": {
+			"type": ["string", "array", "object"]
+		},
+		"loader": {
+			"type": ["string", "array", "object"]
+		}
+	}
+}

schema/loader.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "additionalProperties": false,
   "properties": {
@@ -14,16 +13,13 @@
     "fallback": {
       "description": "A loader that webpack can fall back to if the original one fails.",
       "modes": {
-        "type": "string",
-        "type": "object",
-        "type": "array"
+        "type": ["string", "object", "array"]
       }
     },
     "filename": {
       "description": "The filename and path that ExtractTextPlugin will extract to",
       "modes": {
-        "type": "string",
-        "type": "function"
+        "type": ["string", "function"]
       }
     },
     "ignoreOrder": {
@@ -33,9 +29,7 @@
     "loader": {
       "description": "The loader that ExtractTextPlugin will attempt to load through.",
       "modes": {
-        "type": "string",
-        "type": "object",
-        "type": "array"
+        "type": ["string", "object", "array"]
       }
     },
     "publicPath": {

schema/plugin-schema.json renamed to schema/plugin.json

@@ -29,7 +29,9 @@ describe("ExtractTextPlugin.extract()", function() {
 					ExtractTextPlugin.extract({style: 'file.css'});
 				},
 				function(err) {
-					return err.message === 'data[\'style\'] should NOT have additional properties';
+					return err.message === 'Validation Error\n\n' +
+						'Extract Text Plugin (Loader) Invalid Options\n\n' +
+						'options[\'style\'] should NOT have additional properties\n';
 				}
 			);
 		});