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.

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: resolve cjs deps as cjs instead of esm #362

Merged
merged 6 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"@types/graceful-fs": "^4.1.5",
"@types/micromatch": "^4.0.1",
"@types/node": "^14.14.37",
"@vercel/edge-config": "^0.4.0",
cb1kenobi marked this conversation as resolved.
Show resolved Hide resolved
"analytics-node": "^3.4.0-beta.1",
"apollo-server-express": "^2.14.2",
"argon2": "^0.27.2",
Expand Down
2 changes: 1 addition & 1 deletion src/node-file-trace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ export class Job {
else
await this.emitFile(asset, 'asset', path);
}),
...[...deps].map(async dep => this.maybeEmitDep(dep, path, !isESM)),
...[...deps].map(async dep => this.maybeEmitDep(dep, path, !isESM || this.mixedModules)),
...[...imports].map(async dep => this.maybeEmitDep(dep, path, false)),
]);
}
Expand Down
5 changes: 5 additions & 0 deletions test/integration/vercel-edge-config-esm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// this will load the CJS export and should not be treated as ESM
const ec = require('@vercel/edge-config');

// this will cause the file to be treated as ESM
export default function foo() {}
Loading