fix(*): bind resolver to original context for webpack2

Author: s-panferov

package.json

@@ -65,7 +65,7 @@
     "ps-node": "0.0.5",
     "rimraf": "^2.5.0",
     "tslint": "3.5.0-dev.1",
-    "typescript": "^1.9.0-dev.20160319",
+    "typescript": "^1.9.0-dev.20160330",
     "webpack": "2.1.0-beta.4"
   }
 }

src/deps.ts

@@ -26,12 +26,13 @@ export type Exclude = string[];
 export function createResolver(
     externals: IExternals,
     exclude: Exclude,
-    webpackResolver: any
+    webpackResolver: any,
+    ctx: any = null
 ): IResolver {
     let finalResolver = webpackResolver;
     if (webpackResolver.length === 4) {
-        // patch resolver for webpack2
-        finalResolver = (path, request, callback) => webpackResolver({}, path, request, callback);
+        // carrying resolver for webpack2
+        finalResolver = webpackResolver.bind(ctx, {});
     }
     let resolver: IResolver = promisify(finalResolver) as any;
 

src/index.ts

@@ -44,7 +44,8 @@ async function compiler(webpack: IWebPack, text: string): Promise<void> {
     let resolver = createResolver(
         webpack._compiler.options.externals,
         state.options.exclude || [],
-        webpack.resolve
+        webpack.resolve,
+        webpack
     );
 
     let depsInjector = {

src/instance.ts

@@ -280,7 +280,8 @@ function setupWatchRun(compiler, instanceName: string) {
         let resolver = createResolver(
             compiler.options.externals,
             state.options.exclude || [],
-            watching.compiler.resolvers.normal.resolve
+            watching.compiler.resolvers.normal.resolve,
+            watching.compiler.resolvers.normal
         );
         let mtimes = watching.compiler.watchFileSystem.watcher.mtimes;
         let changedFiles = Object.keys(mtimes);