Minimal fix for auto-importing node_modules in node12/nodenext (#46148)

microsoft · Sep 30, 2021 · 96f259d · 96f259d
1 parent d613748
commit 96f259d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -619,7 +619,7 @@ namespace ts.moduleSpecifiers {
         const nodeModulesDirectoryName = moduleSpecifier.substring(parts.topLevelPackageNameIndex + 1);
         const packageName = getPackageNameFromTypesPackageName(nodeModulesDirectoryName);
         // For classic resolution, only allow importing from node_modules/@types, not other node_modules
-        return getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeJs && packageName === nodeModulesDirectoryName ? undefined : packageName;
+        return getEmitModuleResolutionKind(options) === ModuleResolutionKind.Classic && packageName === nodeModulesDirectoryName ? undefined : packageName;
 
         function tryDirectoryWithPackageJson(packageRootIndex: number) {
             const packageRootPath = path.substring(0, packageRootIndex);

diff --git a/tests/cases/fourslash/autoImport_node12_node_modules1.ts b/tests/cases/fourslash/autoImport_node12_node_modules1.ts
@@ -0,0 +1,11 @@
+/// <reference path="fourslash.ts" />
+
+// @module: node12
+
+// @Filename: /node_modules/undici/index.d.ts
+//// export function request(): any;
+
+// @Filename: /index.mts
+//// request/**/
+
+verify.importFixModuleSpecifiers("", ["undici"]);