Start extension search from config location preferentially to current…

… directory
microsoft · Aug 8, 2016 · 9b593ec · 9b593ec
1 parent 5541571
commit 9b593ec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/compiler/extensions.ts b/src/compiler/extensions.ts
@@ -114,10 +114,10 @@ namespace ts {
         return cache;
 
         function resolveExtensionNames(): Map<string> {
-            const currentDirectory = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+            const basePath = options.configFilePath || combinePaths(host.getCurrentDirectory ? host.getCurrentDirectory() : "", "tsconfig.json");
             const extMap: Map<string> = {};
             forEach(extensionNames, name => {
-                const resolved = resolveModuleName(name, combinePaths(currentDirectory, "tsconfig.json"), options, host, /*loadJs*/true).resolvedModule;
+                const resolved = resolveModuleName(name, basePath, options, host, /*loadJs*/true).resolvedModule;
                 if (resolved) {
                     extMap[name] = resolved.resolvedFileName;
                 }