Skip to content

Commit 1dd3cd2

Browse files
committed
Make file as externalLibrary import if path contains node_modules
1 parent a32f62b commit 1dd3cd2

4 files changed

+2
-21
lines changed

src/compiler/moduleNameResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ namespace ts {
769769
const loader: ResolutionKindSpecificLoader = (extensions, candidate, failedLookupLocations, onlyRecordFailures, state) => nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/ true);
770770
const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
771771
if (resolved) {
772-
return toSearchResult({ resolved, isExternalLibraryImport: false });
772+
return toSearchResult({ resolved, isExternalLibraryImport: resolved.path.indexOf("/node_modules/") !== -1 });
773773
}
774774

775775
if (!isExternalModuleNameRelative(moduleName)) {

tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ module.exports = { a: 10 };
77
import foobar from "foo/bar/foobar.js";
88

99

10-
//// [/bin/node_modules/foo/bar/foobar.js]
11-
module.exports = { a: 10 };
1210
//// [/bin/a.js]
1311
"use strict";
1412
exports.__esModule = true;

tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,3 @@
22
import foobar from "foo/bar/foobar.js";
33
>foobar : Symbol(foobar, Decl(a.ts, 0, 6))
44

5-
=== /node_modules/foo/bar/foobar.js ===
6-
module.exports = { a: 10 };
7-
>module.exports : Symbol("/node_modules/foo/bar/foobar", Decl(foobar.js, 0, 0))
8-
>module : Symbol(export=, Decl(foobar.js, 0, 0))
9-
>exports : Symbol(export=, Decl(foobar.js, 0, 0))
10-
>a : Symbol(a, Decl(foobar.js, 0, 18))
11-
Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
=== /a.ts ===
22
import foobar from "foo/bar/foobar.js";
3-
>foobar : { a: number; }
4-
5-
=== /node_modules/foo/bar/foobar.js ===
6-
module.exports = { a: 10 };
7-
>module.exports = { a: 10 } : { a: number; }
8-
>module.exports : { a: number; }
9-
>module : { "/node_modules/foo/bar/foobar": { a: number; }; }
10-
>exports : { a: number; }
11-
>{ a: 10 } : { a: number; }
12-
>a : number
13-
>10 : 10
3+
>foobar : any
144

0 commit comments

Comments
 (0)