Merge pull request microsoft#12232 from Microsoft/removeJSFromVSResolutions

mhegazy · web-flow · commit 6a67f8085a10 · 2016-11-14T14:13:32.000-08:00
Remove js from vs resolutions
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -1060,8 +1060,15 @@ namespace ts {
             return this.forwardJSONCall(`resolveModuleName('${fileName}')`, () => {
                 const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
                 const result = resolveModuleName(moduleName, normalizeSlashes(fileName), compilerOptions, this.host);
+                const resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
+                if (resolvedFileName && !compilerOptions.allowJs && fileExtensionIs(resolvedFileName, ".js")) {
+                    return {
+                        resolvedFileName: undefined,
+                        failedLookupLocations: []
+                    };
+                }
                 return {
-                    resolvedFileName: result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined,
+                    resolvedFileName,
                     failedLookupLocations: result.failedLookupLocations
                 };
             });
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
@@ -12,7 +12,8 @@
         "declaration": true,
         "target": "es5",
         "noUnusedLocals": true,
-        "noUnusedParameters": true
+        "noUnusedParameters": true,
+        "types": []
     },
     "files": [
         "../compiler/core.ts",
