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

fix(externals): compare package paths against normalized id #2371

Merged
merged 5 commits into from
Apr 29, 2024
Merged

fix(externals): compare package paths against normalized id #2371

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
723fe22
fix: externals comparation match on windows
markthree Apr 17, 2024
dead899
Merge branch 'main' into main
pi0 Apr 17, 2024
7f5b67b
Apply suggestions from code review
pi0 Apr 29, 2024
8118e68
Merge branch 'main' into main
pi0 Apr 29, 2024
edce4e4
fix
pi0 Apr 29, 2024
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
4 changes: 2 additions & 2 deletions src/rollup/plugins/externals-legacy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ export function externals(opts: NodeExternalsOptions): Plugin {
// Absolute path, we are not sure about subpath to generate import statement
// Guess as main subpath export
const packageEntry = await _resolve(pkgName).catch(() => null);
if (packageEntry !== originalId) {
if (packageEntry !== id) {
pi0 marked this conversation as resolved.
Show resolved Hide resolved
// Guess subpathexport
const guessedSubpath = pkgName + subpath.replace(/\.[a-z]+$/, "");
const resolvedGuess = await _resolve(guessedSubpath).catch(
() => null
);
if (resolvedGuess === originalId) {
if (resolvedGuess === id) {
pi0 marked this conversation as resolved.
Show resolved Hide resolved
trackedExternals.add(resolvedGuess);
return {
id: guessedSubpath,
Expand Down
6 changes: 3 additions & 3 deletions src/rollup/plugins/externals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ export function externals(opts: NodeExternalsOptions): Plugin {
// Absolute path, we are not sure about subpath to generate import statement
// Guess as main subpath export
const packageEntry = await _resolve(pkgName).catch(() => null);
if (packageEntry !== originalId) {
if (packageEntry !== id) {
// Reverse engineer subpath export
const guessedSubpath: string | null = await lookupNodeModuleSubpath(
originalId
id
).catch(() => null);
const resolvedGuess =
guessedSubpath &&
(await _resolve(join(pkgName, guessedSubpath)).catch(() => null));
if (resolvedGuess === originalId) {
if (resolvedGuess === id) {
trackedExternals.add(resolvedGuess);
return {
id: join(pkgName, guessedSubpath),
Expand Down