@@ -65,7 +65,7 @@ namespace ts {
65
65
: { resolvedModule : undefined , failedLookupLocations } ;
66
66
}
67
67
else {
68
- return loadModuleFromNodeModules ( moduleName , containingDirectory , supportedExtensions , host ) ;
68
+ return loadModuleFromNodeModules ( moduleName , containingDirectory , host ) ;
69
69
}
70
70
}
71
71
@@ -114,20 +114,21 @@ namespace ts {
114
114
return loadNodeModuleFromFile ( extensions , combinePaths ( candidate , "index" ) , failedLookupLocation , host ) ;
115
115
}
116
116
117
- function loadModuleFromNodeModules ( moduleName : string , directory : string , supportedExtensions : string [ ] , host : ModuleResolutionHost ) : ResolvedModuleWithFailedLookupLocations {
117
+ function loadModuleFromNodeModules ( moduleName : string , directory : string , host : ModuleResolutionHost ) : ResolvedModuleWithFailedLookupLocations {
118
118
const failedLookupLocations : string [ ] = [ ] ;
119
119
directory = normalizeSlashes ( directory ) ;
120
120
while ( true ) {
121
121
const baseName = getBaseFileName ( directory ) ;
122
122
if ( baseName !== "node_modules" ) {
123
123
const nodeModulesFolder = combinePaths ( directory , "node_modules" ) ;
124
124
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 ) ;
126
127
if ( result ) {
127
128
return { resolvedModule : { resolvedFileName : result , isExternalLibraryImport : true } , failedLookupLocations } ;
128
129
}
129
130
130
- result = loadNodeModuleFromDirectory ( supportedExtensions , candidate , failedLookupLocations , host ) ;
131
+ result = loadNodeModuleFromDirectory ( supportedTypeScriptExtensions , candidate , failedLookupLocations , host ) ;
131
132
if ( result ) {
132
133
return { resolvedModule : { resolvedFileName : result , isExternalLibraryImport : true } , failedLookupLocations } ;
133
134
}
0 commit comments