1 files changed, 51 insertions, 45 deletions
diff --git a/node_modules/webpack/lib/NormalModuleReplacementPlugin.js b/node_modules/webpack/lib/NormalModuleReplacementPlugin.js
index 46a662d68..d4f23a58b 100644
--- a/node_modules/webpack/lib/NormalModuleReplacementPlugin.js
+++ b/node_modules/webpack/lib/NormalModuleReplacementPlugin.js
@@ -1,45 +1,51 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-
-class NormalModuleReplacementPlugin {
-	constructor(resourceRegExp, newResource) {
-		this.resourceRegExp = resourceRegExp;
-		this.newResource = newResource;
-	}
-
-	apply(compiler) {
-		const resourceRegExp = this.resourceRegExp;
-		const newResource = this.newResource;
-		compiler.plugin("normal-module-factory", (nmf) => {
-			nmf.plugin("before-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.request)) {
-					if(typeof newResource === "function") {
-						newResource(result);
-					} else {
-						result.request = newResource;
-					}
-				}
-				return callback(null, result);
-			});
-			nmf.plugin("after-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.resource)) {
-					if(typeof newResource === "function") {
-						newResource(result);
-					} else {
-						result.resource = path.resolve(path.dirname(result.resource), newResource);
-					}
-				}
-				return callback(null, result);
-			});
-		});
-	}
-}
-
-module.exports = NormalModuleReplacementPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+
+class NormalModuleReplacementPlugin {
+	constructor(resourceRegExp, newResource) {
+		this.resourceRegExp = resourceRegExp;
+		this.newResource = newResource;
+	}
+
+	apply(compiler) {
+		const resourceRegExp = this.resourceRegExp;
+		const newResource = this.newResource;
+		compiler.hooks.normalModuleFactory.tap(
+			"NormalModuleReplacementPlugin",
+			nmf => {
+				nmf.hooks.beforeResolve.tap("NormalModuleReplacementPlugin", result => {
+					if (!result) return;
+					if (resourceRegExp.test(result.request)) {
+						if (typeof newResource === "function") {
+							newResource(result);
+						} else {
+							result.request = newResource;
+						}
+					}
+					return result;
+				});
+				nmf.hooks.afterResolve.tap("NormalModuleReplacementPlugin", result => {
+					if (!result) return;
+					if (resourceRegExp.test(result.resource)) {
+						if (typeof newResource === "function") {
+							newResource(result);
+						} else {
+							result.resource = path.resolve(
+								path.dirname(result.resource),
+								newResource
+							);
+						}
+					}
+					return result;
+				});
+			}
+		);
+	}
+}
+
+module.exports = NormalModuleReplacementPlugin;