microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-16 07:13:45 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Don’t offer non-relative non-paths path when baseUrl is undefined (#40813)

Browse Source
This commit is contained in:
Andrew Branch
2020-09-28 12:06:39 -07:00
committed by GitHub
parent 343a0a04d7
commit 3e824f18a8
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/moduleSpecifiers.ts
View File

@@ -174,7 +174,10 @@ namespace ts.moduleSpecifiers {
const bundledPkgReference = bundledPackageName ? combinePaths(bundledPackageName, relativeToBaseUrl) : relativeToBaseUrl;
const importRelativeToBaseUrl = removeExtensionAndIndexPostFix(bundledPkgReference, ending, compilerOptions);
const fromPaths = paths && tryGetModuleNameFromPaths(removeFileExtension(bundledPkgReference), importRelativeToBaseUrl, paths);
const nonRelative = fromPaths === undefined ? importRelativeToBaseUrl : fromPaths;
const nonRelative = fromPaths === undefined && baseUrl !== undefined ? importRelativeToBaseUrl : fromPaths;
if (!nonRelative) {
return relativePath;
}
if (relativePreference === RelativePreference.NonRelative) {
return nonRelative;