Upgrade webpack to 2.2

lib/RewirePlugin.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var path = require("path"),
-    ModuleAliasPlugin = require("enhanced-resolve/lib/ModuleAliasPlugin.js"),
+    AliasPlugin = require("enhanced-resolve/lib/AliasPlugin.js"),
     RewiredNormalModuleFactory = require("./RewiredNormalModuleFactory.js"),
     RewiredDependency = require("./RewiredDependency.js");
 
@@ -19,35 +19,48 @@ RewirePlugin.prototype.apply = function (compiler) {
     });
 
     // accept "var rewire", elsewise it would not be parsed (as overwritten)
-    compiler.parser.plugin("var rewire", function () {
-        return true;
+    compiler.plugin("compilation", function(compilation, data) {
+        data.normalModuleFactory.plugin("parser", function(parser, options) {
+            parser.plugin("var rewire", function () {
+                return true;
+            });
+        });
     });
 
     // find rewire(request: String) calls and bind our RewiredDependency
-    compiler.parser.plugin("call rewire", function (expr) {
-        var param,
-            dep;
+    compiler.plugin("compilation", function(compilation, data) {
+        data.normalModuleFactory.plugin("parser", function(parser, options) {
+            parser.plugin("call rewire", function (expr) {
+                var param,
+                    dep;
 
-        if (expr.arguments.length !== 1) {
-            return false;
-        }
+                if (expr.arguments.length !== 1) {
+                    return false;
+                }
 
-        param = this.evaluateExpression(expr.arguments[0]);
-        if (!param.isString()) {
-            return false;
-        }
+                param = this.evaluateExpression(expr.arguments[0]);
+                if (!param.isString()) {
+                    return false;
+                }
 
-        dep = new RewiredDependency(param.string, param.range);
-        dep.loc = expr.loc;
-        this.state.current.addDependency(dep);
+                dep = new RewiredDependency(param.string, param.range);
+                dep.loc = expr.loc;
+                this.state.current.addDependency(dep);
 
-        return true;
+                return true;
+            });
+
+        });
     });
 
-    // alias the require("rewire") to a webpack rewire
-    compiler.resolvers.normal.apply(new ModuleAliasPlugin({
-        rewire: path.join(__dirname, "rewire.web.js")
-    }));
+    compiler.plugin("after-resolvers", function() {
+      compiler.resolvers.normal.apply(
+        new AliasPlugin("described-resolve", {
+					name: "rewire",
+					alias: path.join(__dirname, "rewire.web.js"),
+				}, "resolve")
+      )
+    });
 };
 
-module.exports = RewirePlugin;
+module.exports = RewirePlugin;

lib/RewiredDependency.js

@@ -1,23 +1,21 @@
 "use strict";
 
-var Dependency = require("webpack/lib/Dependency.js");
+const Dependency = require("webpack/lib/Dependency.js");
 
-function RewiredDependency(request, range) {
-    Dependency.call(this);
-    this.request = request;
-    this.userRequest = request;
-    this.Class = RewiredDependency;
-    this.range = range;
-}
+class RewiredDependency extends Dependency {
+  constructor(request, range) {
+      super();
+      this.request = request;
+      this.userRequest = request;
+      this.range = range;
+  }
 
-RewiredDependency.prototype = Object.create(Dependency.prototype);
-RewiredDependency.prototype.type = "rewire";
-RewiredDependency.prototype.constructor = RewiredDependency;
-RewiredDependency.prototype.isEqualResource = function (other) {
-    return other instanceof RewiredDependency?
+  isEqualResource(other) {
+      return other instanceof RewiredDependency?
             this.request === other.request:
             false;
-};
+  }
+}
 
 RewiredDependency.Template = require("webpack/lib/dependencies/ModuleDependencyTemplateAsId.js");
 

lib/RewiredNormalModuleFactory.js

@@ -6,8 +6,8 @@ function RewiredNormalModuleFactory(factory) {
     this.factory = factory;
 }
 
-RewiredNormalModuleFactory.prototype.create = function (context, dependency, callback) {
-    this.factory.create(context, dependency, function onModuleCreate(err, module) {
+RewiredNormalModuleFactory.prototype.create = function (data, callback) {
+    this.factory.create(data, function onModuleCreate(err, module) {
         if (err) {
             return callback(err);
         }
@@ -20,4 +20,4 @@ RewiredNormalModuleFactory.prototype.create = function (context, dependency, cal
     });
 };
 
-module.exports = RewiredNormalModuleFactory;
+module.exports = RewiredNormalModuleFactory;

lib/rewire.web.js

@@ -13,4 +13,4 @@ function rewire(module) {
     return rewiredModule.exports;
 }
 
-module.exports = rewire;
+module.exports = rewire;

package.json

@@ -22,15 +22,15 @@
   "repository": "git://github.com/jhnns/rewire-webpack.git",
   "license": "Unlicense",
   "dependencies": {
-    "enhanced-resolve": "^0.9.1",
-    "webpack": "^1.12.6"
+    "enhanced-resolve": "^3.1.0",
+    "webpack": "^2.2.1"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^2.3.4",
-    "mocha-loader": "^0.7.1",
+    "mocha": "^3.2.0",
+    "mocha-loader": "^1.1.0",
     "rewire": "^2.5.0",
-    "webpack-dev-server": "^1.12.1"
+    "webpack-dev-server": "^2.3.0"
   },
   "scripts": {
     "test": "webpack-dev-server --config ./test/webpack.config.js"

test/webpack.config.js

@@ -1,9 +1,9 @@
 var RewirePlugin = require("../");
 
 module.exports = {
-    entry: "mocha!" + __dirname + "/webpack.test.js",
+    entry: "mocha-loader!" + __dirname + "/webpack.test.js",
     devtool: "eval",
     plugins: [
         new RewirePlugin()
     ]
-};
+};