@@ -1288,18 +1288,22 @@ namespace ts {
12881288 ) ;
12891289 }
12901290
1291+ const jsOnlyExtensions = [ Extensions . JavaScript ] ;
1292+ const tsExtensions = [ Extensions . TypeScript , Extensions . JavaScript ] ;
1293+ const tsPlusJsonExtensions = [ ...tsExtensions , Extensions . Json ] ;
1294+ const tsconfigExtensions = [ Extensions . TSConfig ] ;
12911295 function nodeNextModuleNameResolverWorker ( features : NodeResolutionFeatures , moduleName : string , containingFile : string , compilerOptions : CompilerOptions , host : ModuleResolutionHost , cache ?: ModuleResolutionCache , redirectedReference ?: ResolvedProjectReference , resolutionMode ?: ModuleKind . CommonJS | ModuleKind . ESNext ) : ResolvedModuleWithFailedLookupLocations {
12921296 const containingDirectory = getDirectoryPath ( containingFile ) ;
12931297
12941298 // es module file or cjs-like input file, use a variant of the legacy cjs resolver that supports the selected modern features
12951299 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 ) ;
12971305 }
12981306
1299- const jsOnlyExtensions = [ Extensions . JavaScript ] ;
1300- const tsExtensions = [ Extensions . TypeScript , Extensions . JavaScript ] ;
1301- const tsPlusJsonExtensions = [ ...tsExtensions , Extensions . Json ] ;
1302- const tsconfigExtensions = [ Extensions . TSConfig ] ;
13031307 function tryResolveJSModuleWorker ( moduleName : string , initialDir : string , host : ModuleResolutionHost ) : ResolvedModuleWithFailedLookupLocations {
13041308 return nodeModuleNameResolverWorker ( NodeResolutionFeatures . None , moduleName , initialDir , { moduleResolution : ModuleResolutionKind . NodeJs , allowJs : true } , host , /*cache*/ undefined , jsOnlyExtensions , /*redirectedReferences*/ undefined ) ;
13051309 }
0 commit comments