Don't look for .js files when resolving node modules

RyanCavanaugh · RyanCavanaugh · commit d880d4f4fb7c · 2015-11-06T14:38:29.000-08:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -70,7 +70,7 @@ namespace ts {
     }
 
     function loadNodeModuleFromFile(candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string {
-        return forEach(supportedJsExtensions, tryLoad);
+        return forEach(supportedExtensions, tryLoad);
 
         function tryLoad(ext: string): string {
             let fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts
@@ -82,7 +82,7 @@ module ts {
             assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
             assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
             // expect three failed lookup location - attempt to load module as file with all supported extensions
-            assert.equal(resolution.failedLookupLocations.length, 5);
+            assert.equal(resolution.failedLookupLocations.length, 3);
         }
         
         it("module name as directory - load from typings", () => {
@@ -103,8 +103,6 @@ module ts {
                 "/a/b/foo.ts",
                 "/a/b/foo.tsx",
                 "/a/b/foo.d.ts",
-                "/a/b/foo.js",
-                "/a/b/foo.jsx",
                 "/a/b/foo/index.ts",
                 "/a/b/foo/index.tsx",
             ]);
@@ -121,25 +119,17 @@ module ts {
                 "/a/b/c/d/node_modules/foo.ts",
                 "/a/b/c/d/node_modules/foo.tsx",
                 "/a/b/c/d/node_modules/foo.d.ts",
-                "/a/b/c/d/node_modules/foo.js",
-                "/a/b/c/d/node_modules/foo.jsx",
                 "/a/b/c/d/node_modules/foo/package.json",
                 "/a/b/c/d/node_modules/foo/index.ts",
                 "/a/b/c/d/node_modules/foo/index.tsx",
                 "/a/b/c/d/node_modules/foo/index.d.ts",
-                "/a/b/c/d/node_modules/foo/index.js",
-                "/a/b/c/d/node_modules/foo/index.jsx",
                 "/a/b/c/node_modules/foo.ts",
                 "/a/b/c/node_modules/foo.tsx",
                 "/a/b/c/node_modules/foo.d.ts",
-                "/a/b/c/node_modules/foo.js",
-                "/a/b/c/node_modules/foo.jsx",
                 "/a/b/c/node_modules/foo/package.json",
                 "/a/b/c/node_modules/foo/index.ts",
                 "/a/b/c/node_modules/foo/index.tsx",
                 "/a/b/c/node_modules/foo/index.d.ts",
-                "/a/b/c/node_modules/foo/index.js",
-                "/a/b/c/node_modules/foo/index.jsx"
             ])
         });
 
@@ -161,41 +151,27 @@ module ts {
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo.ts",
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo.tsx",
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo.d.ts",
-                "/a/node_modules/b/c/node_modules/d/node_modules/foo.js",
-                "/a/node_modules/b/c/node_modules/d/node_modules/foo.jsx",
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo/package.json",
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.ts",
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.tsx",
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.d.ts",
-                "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.js",
-                "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.jsx",
                 "/a/node_modules/b/c/node_modules/foo.ts",
                 "/a/node_modules/b/c/node_modules/foo.tsx",
                 "/a/node_modules/b/c/node_modules/foo.d.ts",
-                "/a/node_modules/b/c/node_modules/foo.js",
-                "/a/node_modules/b/c/node_modules/foo.jsx",
                 "/a/node_modules/b/c/node_modules/foo/package.json",
                 "/a/node_modules/b/c/node_modules/foo/index.ts",
                 "/a/node_modules/b/c/node_modules/foo/index.tsx",
                 "/a/node_modules/b/c/node_modules/foo/index.d.ts",
-                "/a/node_modules/b/c/node_modules/foo/index.js",
-                "/a/node_modules/b/c/node_modules/foo/index.jsx",
                 "/a/node_modules/b/node_modules/foo.ts",
                 "/a/node_modules/b/node_modules/foo.tsx",
                 "/a/node_modules/b/node_modules/foo.d.ts",
-                "/a/node_modules/b/node_modules/foo.js",
-                "/a/node_modules/b/node_modules/foo.jsx",
                 "/a/node_modules/b/node_modules/foo/package.json",
                 "/a/node_modules/b/node_modules/foo/index.ts",
                 "/a/node_modules/b/node_modules/foo/index.tsx",
                 "/a/node_modules/b/node_modules/foo/index.d.ts",
-                "/a/node_modules/b/node_modules/foo/index.js",
-                "/a/node_modules/b/node_modules/foo/index.jsx",
                 "/a/node_modules/foo.ts",
                 "/a/node_modules/foo.tsx",
                 "/a/node_modules/foo.d.ts",
-                "/a/node_modules/foo.js",
-                "/a/node_modules/foo.jsx",
                 "/a/node_modules/foo/package.json",
                 "/a/node_modules/foo/index.ts",
                 "/a/node_modules/foo/index.tsx"

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ namespace ts {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`function loadNodeModuleFromFile(candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string {`
`73`		`- return forEach(supportedJsExtensions, tryLoad);`
	`73`	`+ return forEach(supportedExtensions, tryLoad);`
`74`	`74`
`75`	`75`	`function tryLoad(ext: string): string {`
`76`	`76`	`let fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext;`