From 1dd3cd288e3488eee421a68b1313d37834c98640 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 14 Aug 2018 16:21:22 -0700
Subject: [PATCH] Make file as externalLibrary import if path contains
 node_modules

---
 src/compiler/moduleNameResolver.ts                   |  2 +-
 ...uleResolution_withExtension_MapedToNodeModules.js |  2 --
 ...solution_withExtension_MapedToNodeModules.symbols |  7 -------
 ...Resolution_withExtension_MapedToNodeModules.types | 12 +-----------
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index d67bf107a8f..f6024ed258d 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 677978308c1..b7f90ca24d1 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 3ebcaccee29..f6041ba8e39 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 9f2b1e4484e..829c950773c 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