Skip to content

fix(esbuild): resolve to ESM when requested #4220

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.

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

Merged
merged 1 commit into from
Mar 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .yarn/versions/2eafeb47.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
releases:
"@yarnpkg/esbuild-plugin-pnp": patch

declined:
- "@yarnpkg/builder"
21 changes: 20 additions & 1 deletion packages/esbuild-plugin-pnp/sources/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,30 @@ export function pnpPlugin({

const externals = parseExternals(build.initialOptions.external ?? []);

const isPlatformNode = (build.initialOptions.platform ?? `browser`) === `node`;
const platform = build.initialOptions.platform ?? `browser`;
const isPlatformNode = platform === `node`;

// Reference: https://github.com/evanw/esbuild/blob/537195ae84bee1510fac14235906d588084c39cd/internal/resolver/resolver.go#L238-L253
const conditionsDefault = new Set(build.initialOptions.conditions);
conditionsDefault.add(`default`);
if (platform === `browser` || platform === `node`)
conditionsDefault.add(platform);
const conditionsImport = new Set(conditionsDefault);
conditionsImport.add(`import`);
const conditionsRequire = new Set(conditionsDefault);
conditionsRequire.add(`require`);

build.onResolve({filter}, args => {
if (isExternal(args.path, externals))
return {external: true};

// Reference: https://github.com/evanw/esbuild/blob/537195ae84bee1510fac14235906d588084c39cd/internal/resolver/resolver.go#L1495-L1502
let conditions = conditionsDefault;
if (args.kind === `dynamic-import` || args.kind === `import-statement`)
conditions = conditionsImport;
else if (args.kind === `require-call` || args.kind === `require-resolve`)
conditions = conditionsRequire;

// The entry point resolution uses an empty string
const effectiveImporter = args.importer
? args.importer
Expand All @@ -124,6 +142,7 @@ export function pnpPlugin({
let error;
try {
path = pnpApi.resolveRequest(args.path, effectiveImporter, {
conditions,
considerBuiltins: isPlatformNode,
extensions,
});
Expand Down