Skip to content

Commit 0482afd

Browse files
committed
Load only typescript files if resolving from node modules
1 parent fc07763 commit 0482afd

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/compiler/program.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace ts {
6565
: { resolvedModule: undefined, failedLookupLocations };
6666
}
6767
else {
68-
return loadModuleFromNodeModules(moduleName, containingDirectory, supportedExtensions, host);
68+
return loadModuleFromNodeModules(moduleName, containingDirectory, host);
6969
}
7070
}
7171

@@ -114,20 +114,21 @@ namespace ts {
114114
return loadNodeModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, host);
115115
}
116116

117-
function loadModuleFromNodeModules(moduleName: string, directory: string, supportedExtensions: string[], host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
117+
function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
118118
const failedLookupLocations: string[] = [];
119119
directory = normalizeSlashes(directory);
120120
while (true) {
121121
const baseName = getBaseFileName(directory);
122122
if (baseName !== "node_modules") {
123123
const nodeModulesFolder = combinePaths(directory, "node_modules");
124124
const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
125-
let result = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host);
125+
// Load only typescript files irrespective of allowJs option if loading from node modules
126+
let result = loadNodeModuleFromFile(supportedTypeScriptExtensions, candidate, failedLookupLocations, host);
126127
if (result) {
127128
return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations };
128129
}
129130

130-
result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, host);
131+
result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, host);
131132
if (result) {
132133
return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations };
133134
}

0 commit comments

Comments
 (0)