@@ -1288,18 +1288,22 @@ namespace ts {
1288
1288
) ;
1289
1289
}
1290
1290
1291
+ const jsOnlyExtensions = [ Extensions . JavaScript ] ;
1292
+ const tsExtensions = [ Extensions . TypeScript , Extensions . JavaScript ] ;
1293
+ const tsPlusJsonExtensions = [ ...tsExtensions , Extensions . Json ] ;
1294
+ const tsconfigExtensions = [ Extensions . TSConfig ] ;
1291
1295
function nodeNextModuleNameResolverWorker ( features : NodeResolutionFeatures , moduleName : string , containingFile : string , compilerOptions : CompilerOptions , host : ModuleResolutionHost , cache ?: ModuleResolutionCache , redirectedReference ?: ResolvedProjectReference , resolutionMode ?: ModuleKind . CommonJS | ModuleKind . ESNext ) : ResolvedModuleWithFailedLookupLocations {
1292
1296
const containingDirectory = getDirectoryPath ( containingFile ) ;
1293
1297
1294
1298
// es module file or cjs-like input file, use a variant of the legacy cjs resolver that supports the selected modern features
1295
1299
const esmMode = resolutionMode === ModuleKind . ESNext ? NodeResolutionFeatures . EsmMode : 0 ;
1296
- return nodeModuleNameResolverWorker ( features | esmMode , moduleName , containingDirectory , compilerOptions , host , cache , compilerOptions . resolveJsonModule ? tsPlusJsonExtensions : tsExtensions , redirectedReference ) ;
1300
+ let extensions = compilerOptions . noDtsResolution ? [ Extensions . TsOnly , Extensions . JavaScript ] : tsExtensions ;
1301
+ if ( compilerOptions . resolveJsonModule ) {
1302
+ extensions = [ ...extensions , Extensions . Json ] ;
1303
+ }
1304
+ return nodeModuleNameResolverWorker ( features | esmMode , moduleName , containingDirectory , compilerOptions , host , cache , extensions , redirectedReference ) ;
1297
1305
}
1298
1306
1299
- const jsOnlyExtensions = [ Extensions . JavaScript ] ;
1300
- const tsExtensions = [ Extensions . TypeScript , Extensions . JavaScript ] ;
1301
- const tsPlusJsonExtensions = [ ...tsExtensions , Extensions . Json ] ;
1302
- const tsconfigExtensions = [ Extensions . TSConfig ] ;
1303
1307
function tryResolveJSModuleWorker ( moduleName : string , initialDir : string , host : ModuleResolutionHost ) : ResolvedModuleWithFailedLookupLocations {
1304
1308
return nodeModuleNameResolverWorker ( NodeResolutionFeatures . None , moduleName , initialDir , { moduleResolution : ModuleResolutionKind . NodeJs , allowJs : true } , host , /*cache*/ undefined , jsOnlyExtensions , /*redirectedReferences*/ undefined ) ;
1305
1309
}
0 commit comments