Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support resolving @typescript/[lib] in node modules #45771

Merged
merged 8 commits into from
Sep 15, 2021
Merged

Support resolving @typescript/[lib] in node modules #45771

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6efc2f1
Support resolving @typescript/x for libs
orta Sep 7, 2021
2ec03f3
Baselines
orta Sep 7, 2021
daa99ce
Tightens up the PR
orta Sep 14, 2021
e2ca4b5
Fix the build
orta Sep 14, 2021
9943525
Add cache
orta Sep 14, 2021
853ac55
Better naming
orta Sep 15, 2021
2725d3c
Merge branch 'main' of https://github.com/microsoft/TypeScript into l…
orta Sep 15, 2021
77c0e2e
Fixes the lookup path
orta Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2894,10 +2894,11 @@ namespace ts {
path += (i === 2 ? "/" : "-") + components[i];
i++;
}
// The strange "/fake.file" is to ensure we first resolve in node_modules for the current directory.
const localOverride = resolveModuleName("@typescript/" + path, currentDirectory + "/fake.file", { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
if (localOverride?.resolvedModule) {
return localOverride.resolvedModule.resolvedFileName;

const resolveFrom = combinePaths(currentDirectory, `/__lib_node_modules_lookup_${libFileName}__.ts`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This always ignores currentDirectory because the latter argument is absolute.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guessing this didn’t break tests only because all the tests are rooted at /

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice spot!

const localOverrideModuleResult = resolveModuleName("@typescript/" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
if (localOverrideModuleResult?.resolvedModule) {
return localOverrideModuleResult.resolvedModule.resolvedFileName;
}
return combinePaths(defaultLibraryPath, libFileName);
}
Expand Down