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(node): Include "node" condition during CJS re-export analysis #25785

Merged
merged 2 commits into from
Sep 21, 2024
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
2 changes: 1 addition & 1 deletion ext/node_resolver/analyze.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer, TNodeResolverEnv: NodeResolverEnv>
&referrer,
// FIXME(bartlomieju): check if these conditions are okay, probably
// should be `deno-require`, because `deno` is already used in `esm_resolver.rs`
&["deno", "require", "default"],
&["deno", "node", "require", "default"],
dsherret marked this conversation as resolved.
Show resolved Hide resolved
NodeResolutionMode::Execution,
);
let reexport_specifier = match result {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
hello: "bad"
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
hello: "from node"
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
hello: "default export"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "@denotest/conditional-exports",
"version": "1.0.0",
"type": "module",
"exports": {
".": {
"node": "./good.cjs",
"require": "./bad.js",
"default": "./index.js"
},
"./*": "./*"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Object.defineProperty(exports, '__esModule', { value: true });

const pkg = require("@denotest/conditional-exports-node");

Object.keys(pkg).forEach(function (k) {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = pkg[k];
});
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('./dist/package.cjs.js')
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./index.js";
11 changes: 11 additions & 0 deletions tests/registry/npm/@denotest/mjs-reexport-cjs/1.0.0/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@denotest/mjs-reexport-cjs",
"version": "1.0.0",
"dependencies": {
"@denotest/conditional-exports-node": "*"
},
"exports": {
"node": "./index.mjs",
"default": "./index.js"
}
}
13 changes: 13 additions & 0 deletions tests/specs/node/cjs_reexport_node_condition/__test__.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"tempDir": true,
"steps": [
{
"args": "install",
"output": "[WILDCARD]"
},
{
"args": "run -A ./main.ts",
"output": "from node\n"
}
]
}
3 changes: 3 additions & 0 deletions tests/specs/node/cjs_reexport_node_condition/deno.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"nodeModulesDir": "manual"
}
3 changes: 3 additions & 0 deletions tests/specs/node/cjs_reexport_node_condition/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { hello } from "@denotest/mjs-reexport-cjs";

console.log(hello);
5 changes: 5 additions & 0 deletions tests/specs/node/cjs_reexport_node_condition/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"@denotest/mjs-reexport-cjs": "*"
}
}