fix(*): patch resolver for webpack2

s-panferov · Mar 30, 2016 · 60ca777 · 60ca777
1 parent dd9fb36
commit 60ca777
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/deps.ts b/src/deps.ts
@@ -28,7 +28,12 @@ export function createResolver(
     exclude: Exclude,
     webpackResolver: any
 ): IResolver {
-    let resolver: IResolver = promisify(webpackResolver) as any;
+    let finalResolver = webpackResolver;
+    if (webpackResolver.length === 4) {
+        // patch resolver for webpack2
+        finalResolver = (path, request, callback) => webpackResolver({}, path, request, callback);
+    }
+    let resolver: IResolver = promisify(finalResolver) as any;
 
     function resolve(base: string, dep: string): Promise<string> {
         let inWebpackExternals = externals && externals.hasOwnProperty(dep);

diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -36,8 +36,6 @@
         "./test/fixtures/errors/with-type-errors.ts",
         "./test/fixtures/salsa/index.ts",
         "./test/index.ts",
-        "./test/output/src/test/fixtures/declaration/basic.d.ts",
-        "./test/output/src/test/fixtures/declaration/iface.d.ts",
         "./test/salsa.ts",
         "./test/utils.ts",
         "./tsconfig-utils.ts"