diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index d67bf107a8..f6024ed258 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -769,7 +769,7 @@ namespace ts { const loader: ResolutionKindSpecificLoader = (extensions, candidate, failedLookupLocations, onlyRecordFailures, state) => nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/ true); const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state); if (resolved) { - return toSearchResult({ resolved, isExternalLibraryImport: false }); + return toSearchResult({ resolved, isExternalLibraryImport: resolved.path.indexOf("/node_modules/") !== -1 }); } if (!isExternalModuleNameRelative(moduleName)) { diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js index 677978308c..b7f90ca24d 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js @@ -7,8 +7,6 @@ module.exports = { a: 10 }; import foobar from "foo/bar/foobar.js"; -//// [/bin/node_modules/foo/bar/foobar.js] -module.exports = { a: 10 }; //// [/bin/a.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols index 3ebcaccee2..f6041ba8e3 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols @@ -2,10 +2,3 @@ import foobar from "foo/bar/foobar.js"; >foobar : Symbol(foobar, Decl(a.ts, 0, 6)) -=== /node_modules/foo/bar/foobar.js === -module.exports = { a: 10 }; ->module.exports : Symbol("/node_modules/foo/bar/foobar", Decl(foobar.js, 0, 0)) ->module : Symbol(export=, Decl(foobar.js, 0, 0)) ->exports : Symbol(export=, Decl(foobar.js, 0, 0)) ->a : Symbol(a, Decl(foobar.js, 0, 18)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.types b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.types index 9f2b1e4484..829c950773 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.types +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.types @@ -1,14 +1,4 @@ === /a.ts === import foobar from "foo/bar/foobar.js"; ->foobar : { a: number; } - -=== /node_modules/foo/bar/foobar.js === -module.exports = { a: 10 }; ->module.exports = { a: 10 } : { a: number; } ->module.exports : { a: number; } ->module : { "/node_modules/foo/bar/foobar": { a: number; }; } ->exports : { a: number; } ->{ a: 10 } : { a: number; } ->a : number ->10 : 10 +>foobar : any