fix(cjs): fix named default export (#2923)

hi-ogawa · web-flow · commit 11a6693e1cb8 · 2024-11-26T03:13:54.000Z
### Description - Closes #2903 (comment) (2nd part of the issue) Not fully understood the logic but this seemed like a minor typo. For reference, here are other bundlers output: - [rollup repl](https://rollupjs.org/repl/?version=4.27.4&shareable=JTdCJTIyZXhhbXBsZSUyMiUzQW51bGwlMkMlMjJtb2R1bGVzJTIyJTNBJTVCJTdCJTIyY29kZSUyMiUzQSUyMmV4cG9ydCUyMCU3QiUyMGRlZmF1bHQlMjAlN0QlMjBmcm9tJTIwJ25vZGUlM0FwYXRoJyUzQiUyMiUyQyUyMmlzRW50cnklMjIlM0F0cnVlJTJDJTIybmFtZSUyMiUzQSUyMm1haW4uanMlMjIlN0QlNUQlMkMlMjJvcHRpb25zJTIyJTNBJTdCJTIyb3V0cHV0JTIyJTNBJTdCJTIyZXNNb2R1bGUlMjIlM0ElMjJpZi1kZWZhdWx0LXByb3AlMjIlMkMlMjJleHBvcnRzJTIyJTNBJTIyYXV0byUyMiUyQyUyMmZvcm1hdCUyMiUzQSUyMmNqcyUyMiU3RCU3RCU3RA==) - [esbuild try](https://esbuild.github.io/try/#YgAwLjI0LjAALS1mb3JtYXQ9Y2pzAGUAZW50cnkuanMAZXhwb3J0IHsgZGVmYXVsdCB9IGZyb20gJ25vZGU6cGF0aCc)
diff --git a/crates/rolldown/src/utils/chunk/render_chunk_exports.rs b/crates/rolldown/src/utils/chunk/render_chunk_exports.rs
@@ -126,9 +126,9 @@ pub fn render_chunk_exports(
                   }
                   Some(OutputExports::Default) => {
                     if matches!(options.format, OutputFormat::Cjs) {
-                      concat_string!("module.exports = ", canonical_name.as_str(), ";")
+                      concat_string!("module.exports = ", exported_value.as_str(), ";")
                     } else {
-                      concat_string!("return ", canonical_name.as_str(), ";")
+                      concat_string!("return ", exported_value.as_str(), ";")
                     }
                   }
                   Some(OutputExports::None) => String::new(),
diff --git a/crates/rolldown/tests/rolldown/issues/2903_2/_config.json b/crates/rolldown/tests/rolldown/issues/2903_2/_config.json
@@ -0,0 +1,6 @@
+{
+  "config": {
+    "format": "cjs",
+    "platform": "node"
+  }
+}
diff --git a/crates/rolldown/tests/rolldown/issues/2903_2/artifacts.snap b/crates/rolldown/tests/rolldown/issues/2903_2/artifacts.snap
@@ -0,0 +1,15 @@
+---
+source: crates/rolldown_testing/src/integration_test.rs
+snapshot_kind: text
+---
+# Assets
+
+## main.js
+
+```js
+"use strict";
+
+const node_path = __toESM(require("node:path"));
+
+module.exports = node_path.default;
+```
diff --git a/crates/rolldown/tests/rolldown/issues/2903_2/main.js b/crates/rolldown/tests/rolldown/issues/2903_2/main.js
@@ -0,0 +1,2 @@
+import path from 'node:path';
+export { path as default };
diff --git a/crates/rolldown/tests/rolldown/issues/2903_3/_config.json b/crates/rolldown/tests/rolldown/issues/2903_3/_config.json
@@ -0,0 +1,6 @@
+{
+  "config": {
+    "format": "cjs",
+    "platform": "node"
+  }
+}
diff --git a/crates/rolldown/tests/rolldown/issues/2903_3/artifacts.snap b/crates/rolldown/tests/rolldown/issues/2903_3/artifacts.snap
@@ -0,0 +1,15 @@
+---
+source: crates/rolldown_testing/src/integration_test.rs
+snapshot_kind: text
+---
+# Assets
+
+## main.js
+
+```js
+"use strict";
+
+const node_path = __toESM(require("node:path"));
+
+module.exports = node_path.default;
+```
diff --git a/crates/rolldown/tests/rolldown/issues/2903_3/main.js b/crates/rolldown/tests/rolldown/issues/2903_3/main.js
@@ -0,0 +1 @@
+export { default } from 'node:path';
diff --git a/crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap b/crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap
@@ -4501,6 +4501,14 @@ snapshot_kind: text
 - main2-!~{001}~.js => main2-EKxH9I8y.js
 - chunk-!~{002}~.js => chunk-CrpGerW8.js
 
+# tests/rolldown/issues/2903_2
+
+- main-!~{000}~.js => main-BcrDU5fs.js
+
+# tests/rolldown/issues/2903_3
+
+- main-!~{000}~.js => main-BcrDU5fs.js
+
 # tests/rolldown/issues/376
 
 - main-!~{000}~.js => main-CfuHZZW7.js

Original file line number	Diff line number	Diff line change
`@@ -126,9 +126,9 @@ pub fn render_chunk_exports(`
`126`	`126`	`}`
`127`	`127`	`Some(OutputExports::Default) => {`
`128`	`128`	`if matches!(options.format, OutputFormat::Cjs) {`
`129`		`- concat_string!("module.exports = ", canonical_name.as_str(), ";")`
	`129`	`+ concat_string!("module.exports = ", exported_value.as_str(), ";")`
`130`	`130`	`} else {`
`131`		`- concat_string!("return ", canonical_name.as_str(), ";")`
	`131`	`+ concat_string!("return ", exported_value.as_str(), ";")`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`Some(OutputExports::None) => String::new(),`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import path from 'node:path';`
	`2`	`+export { path as default };`