1 files changed, 53 insertions, 36 deletions
diff --git a/node_modules/webpack/lib/LoaderOptionsPlugin.js b/node_modules/webpack/lib/LoaderOptionsPlugin.js
index b3d3ef7f4..5d13e2c06 100644
--- a/node_modules/webpack/lib/LoaderOptionsPlugin.js
+++ b/node_modules/webpack/lib/LoaderOptionsPlugin.js
@@ -1,36 +1,53 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-
-class LoaderOptionsPlugin {
-	constructor(options) {
-		if(typeof options !== "object") options = {};
-		if(!options.test) options.test = {
-			test: () => true
-		};
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		compiler.plugin("compilation", (compilation) => {
-			compilation.plugin("normal-module-loader", (context, module) => {
-				const resource = module.resource;
-				if(!resource) return;
-				const i = resource.indexOf("?");
-				if(ModuleFilenameHelpers.matchObject(options, i < 0 ? resource : resource.substr(0, i))) {
-					const filterSet = new Set(["include", "exclude", "test"]);
-					Object.keys(options)
-						.filter((key) => !filterSet.has(key))
-						.forEach((key) => context[key] = options[key]);
-				}
-			});
-		});
-	}
-}
-
-module.exports = LoaderOptionsPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+
+const validateOptions = require("schema-utils");
+const schema = require("../schemas/plugins/LoaderOptionsPlugin.json");
+
+class LoaderOptionsPlugin {
+	constructor(options) {
+		validateOptions(schema, options || {}, "Loader Options Plugin");
+
+		if (typeof options !== "object") options = {};
+		if (!options.test) {
+			options.test = {
+				test: () => true
+			};
+		}
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		compiler.hooks.compilation.tap("LoaderOptionsPlugin", compilation => {
+			compilation.hooks.normalModuleLoader.tap(
+				"LoaderOptionsPlugin",
+				(context, module) => {
+					const resource = module.resource;
+					if (!resource) return;
+					const i = resource.indexOf("?");
+					if (
+						ModuleFilenameHelpers.matchObject(
+							options,
+							i < 0 ? resource : resource.substr(0, i)
+						)
+					) {
+						for (const key of Object.keys(options)) {
+							if (key === "include" || key === "exclude" || key === "test") {
+								continue;
+							}
+							context[key] = options[key];
+						}
+					}
+				}
+			);
+		});
+	}
+}
+
+module.exports = LoaderOptionsPlugin;