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

Jump to bottom

fix: CJS resolve case #374

Merged
merged 1 commit into from
Aug 12, 2024
Merged

fix: CJS resolve case #374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/trace/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,29 +378,30 @@ export class Resolver {
// subfolder checks before file checks because of fetch
if (await this.exists(url + "/package.json")) {
const pcfg = (await this.getPackageConfig(url)) || {};
const urlUrl = new URL(url + '/');
if (this.env.includes("browser") && typeof pcfg.browser === "string")
return this.finalizeResolve(
await legacyMainResolve.call(this, pcfg.browser, new URL(url)),
await legacyMainResolve.call(this, pcfg.browser, urlUrl),
parentIsCjs,
exportsResolution,
pkgUrl
);
if (this.env.includes("module") && typeof pcfg.module === "string")
return this.finalizeResolve(
await legacyMainResolve.call(this, pcfg.module, new URL(url)),
await legacyMainResolve.call(this, pcfg.module, urlUrl),
parentIsCjs,
exportsResolution,
pkgUrl
);
if (typeof pcfg.main === "string")
return this.finalizeResolve(
await legacyMainResolve.call(this, pcfg.main, new URL(url)),
await legacyMainResolve.call(this, pcfg.main, urlUrl),
parentIsCjs,
exportsResolution,
pkgUrl
);
return this.finalizeResolve(
await legacyMainResolve.call(this, null, new URL(url)),
await legacyMainResolve.call(this, null, urlUrl),
parentIsCjs,
exportsResolution,
pkgUrl
Expand Down
Loading