Skip to content

Commit

Permalink
fix: CJS resolve case (#374)
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford authored Aug 12, 2024
1 parent 14e1f10 commit e922bda
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/trace/resolver.ts
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

0 comments on commit e922bda

Please sign in to comment.