1 files changed, 66 insertions, 31 deletions
diff --git a/node_modules/webpack/lib/RequireJsStuffPlugin.js b/node_modules/webpack/lib/RequireJsStuffPlugin.js
index 92bc3fc91..632deefc2 100644
--- a/node_modules/webpack/lib/RequireJsStuffPlugin.js
+++ b/node_modules/webpack/lib/RequireJsStuffPlugin.js
@@ -1,31 +1,66 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ParserHelpers = require("./ParserHelpers");
-const ConstDependency = require("./dependencies/ConstDependency");
-const NullFactory = require("./NullFactory");
-
-module.exports = class RequireJsStuffPlugin {
-
-	apply(compiler) {
-		compiler.plugin("compilation", function(compilation, params) {
-			compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-			compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
-			params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
-
-				if(typeof parserOptions.requireJs !== "undefined" && !parserOptions.requireJs)
-					return;
-
-				parser.plugin("call require.config", ParserHelpers.toConstantDependency("undefined"));
-				parser.plugin("call requirejs.config", ParserHelpers.toConstantDependency("undefined"));
-
-				parser.plugin("expression require.version", ParserHelpers.toConstantDependency(JSON.stringify("0.0.0")));
-				parser.plugin("expression requirejs.onError", ParserHelpers.toConstantDependency("__webpack_require__.oe"));
-			});
-		});
-	}
-
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ParserHelpers = require("./ParserHelpers");
+const ConstDependency = require("./dependencies/ConstDependency");
+const NullFactory = require("./NullFactory");
+
+module.exports = class RequireJsStuffPlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"RequireJsStuffPlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+				compilation.dependencyTemplates.set(
+					ConstDependency,
+					new ConstDependency.Template()
+				);
+				const handler = (parser, parserOptions) => {
+					if (parserOptions.requireJs !== undefined && !parserOptions.requireJs)
+						return;
+
+					parser.hooks.call
+						.for("require.config")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependency(parser, "undefined")
+						);
+					parser.hooks.call
+						.for("requirejs.config")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependency(parser, "undefined")
+						);
+
+					parser.hooks.expression
+						.for("require.version")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependency(
+								parser,
+								JSON.stringify("0.0.0")
+							)
+						);
+					parser.hooks.expression
+						.for("requirejs.onError")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependencyWithWebpackRequire(
+								parser,
+								"__webpack_require__.oe"
+							)
+						);
+				};
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("RequireJsStuffPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("RequireJsStuffPlugin", handler);
+			}
+		);
+	}
+};