Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix auto-imports with --moduleResolution bundler and customConditions (#52423)

Browse Source
This commit is contained in:
Andrew Branch
2023-01-26 09:44:07 -08:00
committed by GitHub
parent 0141d1d5f2
commit 5e8bf480e4
4 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/moduleSpecifiers.ts
+4 -2
View File
@@ -33,6 +33,7 @@ import {
forEachAncestorDirectory,
getBaseFileName,
GetCanonicalFileName,
getConditions,
getDirectoryPath,
getEmitModuleResolutionKind,
getModeForResolutionAtIndex,
@@ -46,6 +47,7 @@ import {
getPathsBasePath,
getRelativePathFromDirectory,
getRelativePathToDirectoryOrUrl,
getResolvePackageJsonExports,
getSourceFileOfModule,
getSupportedExtensions,
getTextOfIdentifierOrLiteral,
@@ -945,8 +947,8 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }: ModulePath, { getCan
if (typeof cachedPackageJson === "object" || cachedPackageJson === undefined && host.fileExists(packageJsonPath)) {
const packageJsonContent = cachedPackageJson?.contents.packageJsonContent || JSON.parse(host.readFile!(packageJsonPath)!);
const importMode = overrideMode || importingSourceFile.impliedNodeFormat;
if (getEmitModuleResolutionKind(options) === ModuleResolutionKind.Node16 || getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeNext) {
const conditions = ["node", importMode === ModuleKind.ESNext ? "import" : "require", "types"];
if (getResolvePackageJsonExports(options)) {
const conditions = getConditions(options, importMode === ModuleKind.ESNext);
const fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string"
? tryGetModuleNameFromExports(options, path, packageRootPath, getPackageNameFromTypesPackageName(packageJsonContent.name), packageJsonContent.exports, conditions)
: undefined;