fix(schema): connect loader schema with the code properly

index.js

@@ -10,6 +10,8 @@ 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.json');
+var pluginSchema = require('./schema/plugin-schema.json');
 
 var NS = fs.realpathSync(__dirname);
 
@@ -120,7 +122,7 @@ function ExtractTextPlugin(options) {
 	if(isString(options)) {
 		options = { filename: options };
 	} else {
-		schemaTester(options);
+		schemaTester(pluginSchema, options);
 	}
 	this.filename = options.filename;
 	this.id = options.id != null ? options.id : ++nextId;
@@ -185,7 +187,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(options);
+		schemaTester(loaderSchema, options);
 	}
 	var loader = options.loader;
 	var before = options.fallbackLoader || [];

schema/loader-schema.json

@@ -0,0 +1,15 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"type": "object",
+	"additionalProperties": false,
+	"properties": {
+		"allChunks": { "type": "boolean"},
+		"disable": { "type": "boolean" },
+		"omit": { "type": "boolean" },
+		"remove": { "type": "boolean" },
+		"fallbackLoader": { "type": ["string", "array", "object"] },
+		"filename": { "type": "string" },
+		"loader": { "type": ["string", "array", "object"] },
+		"publicPath": { "type": "string" }
+	}
+}

schema/validator.js

@@ -1,10 +1,9 @@
 var Ajv = require('ajv');
 var ajv = new Ajv({allErrors: true});
-var json = require('./schema.json');
 
-module.exports = function validate(data) {
+module.exports = function validate(schema, data) {
 	var ajv = new Ajv();
-	var isValid = ajv.validate(json, data);
+	var isValid = ajv.validate(schema, data);
 
 	if(!isValid) {
 		throw new Error(ajv.errorsText());

test/cases/simple-query-object/webpack.config.js

@@ -3,9 +3,9 @@ module.exports = {
 	entry: "./index",
 	module: {
 		loaders: [
-			{ test: /\.css$/, loader: ExtractTextPlugin.extract({
+			{ test: /\.css$/, use: ExtractTextPlugin.extract({
 				fallbackLoader: "style-loader",
-				loader: { loader: "css-loader", query: {
+				loader: { loader: "css-loader", options: {
 					sourceMap: true
 				} }
 			}) }

test/cases/simple-queryless-object/webpack.config.js

@@ -3,9 +3,9 @@ module.exports = {
 	entry: "./index",
 	module: {
 		loaders: [
-			{ test: /\.css$/, loader: ExtractTextPlugin.extract({
+			{ test: /\.css$/, use: ExtractTextPlugin.extract({
 				fallbackLoader: { loader: "style-loader" },
-				loader: { loader: "css-loader", query: {
+				loader: { loader: "css-loader", options: {
 					sourceMap: true
 				} }
 			}) }