Skip to content

Comments

fix: set ExportsKind to Esm when json is none object literal #7808

Merged
graphite-app[bot] merged 1 commit intomainfrom
01-08-fix_7804
Jan 9, 2026
Merged

fix: set ExportsKind to Esm when json is none object literal #7808
graphite-app[bot] merged 1 commit intomainfrom
01-08-fix_7804

Conversation

@IWANABETHATGUY
Copy link
Member

@IWANABETHATGUY IWANABETHATGUY commented Jan 8, 2026

closed #7804

Copy link
Member Author


How to use the Graphite Merge Queue

Add the label graphite: merge-when-ready to this PR to add it to the merge queue.

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

@netlify
Copy link

netlify bot commented Jan 8, 2026

Deploy Preview for rolldown-rs canceled.

Name Link
🔨 Latest commit 7d70b52
🔍 Latest deploy log https://app.netlify.com/projects/rolldown-rs/deploys/696068822a50100008b6a104

@IWANABETHATGUY IWANABETHATGUY marked this pull request as ready for review January 8, 2026 15:05
Copilot AI review requested due to automatic review settings January 8, 2026 15:05
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes issue #7804 by ensuring that modules generating ESM export syntax properly have their exports_kind flag set to ExportsKind::Esm. This is critical for correct CJS export rendering when using preserveModules mode.

Key changes:

  • Added logic to set exports_kind = ExportsKind::Esm after generating ESM export syntax for non-object JSON and text modules
  • Comprehensive test coverage with primitive JSON types (string, number, boolean, null, array) and custom text module type

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated no comments.

Show a summary per file
File Description
crates/rolldown/src/stages/link_stage/generate_lazy_export.rs Added code to set exports_kind = ExportsKind::Esm after generating ESM export syntax, ensuring consistency with the json_object_expr_to_esm function
crates/rolldown/tests/rolldown/issues/7804/_config.json Test configuration for issue 7804 with both CJS and ESM formats, preserveModules: true, and custom module type mapping
crates/rolldown/tests/rolldown/issues/7804/main.js Test entry point that imports and validates various JSON primitive types and text module
crates/rolldown/tests/rolldown/issues/7804/data.json Test fixture containing a JSON array
crates/rolldown/tests/rolldown/issues/7804/string.json Test fixture containing a JSON string primitive
crates/rolldown/tests/rolldown/issues/7804/number.json Test fixture containing a JSON number primitive
crates/rolldown/tests/rolldown/issues/7804/boolean.json Test fixture containing a JSON boolean primitive
crates/rolldown/tests/rolldown/issues/7804/null.json Test fixture containing a JSON null value
crates/rolldown/tests/rolldown/issues/7804/text.data Test fixture for custom text module type
crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap Updated snapshot showing expected output files with content hashes for the new test case

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@IWANABETHATGUY IWANABETHATGUY changed the title fix: 7804 fix: set ExportsKind to Esm for modules with ESM export syntax Jan 8, 2026
@IWANABETHATGUY IWANABETHATGUY changed the title fix: set ExportsKind to Esm for modules with ESM export syntax fix: set ExportsKind to Esm when json module is just simple literal type Jan 8, 2026
@IWANABETHATGUY IWANABETHATGUY changed the title fix: set ExportsKind to Esm when json module is just simple literal type fix: set ExportsKind to Esm when json module is none object literal Jan 8, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Jan 8, 2026

Benchmarks Rust

group                                                        pr                                     target
-----                                                        --                                     ------
bundle/bundle@multi-duplicated-top-level-symbol              1.06     66.7±2.17ms        ? ?/sec    1.00     62.6±2.03ms        ? ?/sec
bundle/bundle@multi-duplicated-top-level-symbol-sourcemap    1.05     73.3±2.48ms        ? ?/sec    1.00     70.0±1.93ms        ? ?/sec
bundle/bundle@rome_ts                                        1.01    106.2±3.18ms        ? ?/sec    1.00    105.0±1.66ms        ? ?/sec
bundle/bundle@rome_ts-sourcemap                              1.03    119.3±2.01ms        ? ?/sec    1.00    116.2±1.57ms        ? ?/sec
bundle/bundle@threejs                                        1.01     38.0±1.25ms        ? ?/sec    1.00     37.6±0.82ms        ? ?/sec
bundle/bundle@threejs-sourcemap                              1.02     42.9±0.74ms        ? ?/sec    1.00     41.9±0.66ms        ? ?/sec
bundle/bundle@threejs10x                                     1.00    385.1±4.86ms        ? ?/sec    1.00    383.9±4.92ms        ? ?/sec
bundle/bundle@threejs10x-sourcemap                           1.00    445.7±5.13ms        ? ?/sec    1.00    444.6±4.41ms        ? ?/sec
scan/scan@rome_ts                                            1.00     82.6±1.64ms        ? ?/sec    1.01     83.2±1.59ms        ? ?/sec
scan/scan@threejs                                            1.00     28.3±0.56ms        ? ?/sec    1.00     28.2±0.47ms        ? ?/sec
scan/scan@threejs10x                                         1.03    295.9±5.41ms        ? ?/sec    1.00    287.1±3.61ms        ? ?/sec

@IWANABETHATGUY IWANABETHATGUY changed the title fix: set ExportsKind to Esm when json module is none object literal fix: set ExportsKind to Esm when json is none object literal Jan 8, 2026
@graphite-app
Copy link
Contributor

graphite-app bot commented Jan 9, 2026

Merge activity

@graphite-app graphite-app bot merged commit 7d70b52 into main Jan 9, 2026
35 checks passed
@graphite-app graphite-app bot deleted the 01-08-fix_7804 branch January 9, 2026 02:44
This was referenced Jan 14, 2026
shulaoda added a commit that referenced this pull request Jan 14, 2026
## [1.0.0-beta.60] - 2026-01-14

### 💥 BREAKING CHANGES

- tsconfig: enable auto-discovery by default (#7817) by @shulaoda

### 🚀 Features

- distinguish transformer diagnostics from parse errors (#7872) by @shulaoda
- emit transformer warnings instead of ignoring them (#7850) by @shulaoda
- node: add `output.codeSplitting` option and deprecate `output.advancedChunks` (#7855) by @hyf0
- nativeMagicString reset (#7828) by @IWANABETHATGUY
- nativeMagicString lastChar (#7819) by @IWANABETHATGUY
- dev/lazy: inject lazy compilation runtime automatically (#7816) by @hyf0
- nativeMagicString snip (#7818) by @IWANABETHATGUY
- nativeMagicString construct with options (#7814) by @IWANABETHATGUY
- nativeMagicString clone (#7813) by @IWANABETHATGUY
- nativeMagicString `insert` (#7812) by @IWANABETHATGUY
- nativeMagicString `slice` (#7807) by @IWANABETHATGUY
- nativeMagicString trim methods (#7800) by @IWANABETHATGUY
- make closeBundle hook receive the last error (#7278) by @Copilot

### 🐛 Bug Fixes

- when package only contains export default, cjsDefault didn't resolve correctly (#7873) by @IWANABETHATGUY
- inline __name calls for default exports  (#7862) by @IWANABETHATGUY
- improve variable renaming to avoid unnecessary shadowing in nested scopes (#7859) by @IWANABETHATGUY
- use correct index when inserting keepNames statements during export default transformation (#7853) by @IWANABETHATGUY
- transform non-static dynamic imports when `dynamicImportInCjs` is `false` (#7823) by @shulaoda
- dev/lazy: should include imported and non-executed modules in the patch (#7815) by @hyf0
- set ExportsKind to Esm when json is none object literal  (#7808) by @IWANABETHATGUY
- nativeMagicString move api (#7796) by @IWANABETHATGUY
- remove unnecessary exports after merging into commong and user defined entry (#7789) by @IWANABETHATGUY
- use output.name instead of chunk.name in mixed export warning (#7788) by @Copilot

### 🚜 Refactor

- generalize ParseError to OxcError with dynamic EventKind (#7868) by @shulaoda
- rust: rename `advanced_chunks` to `manual_code_splitting` (#7856) by @hyf0
- string_wizard error hanlding (#7830) by @IWANABETHATGUY
- remove `experimental.disableLiveBindings` option (#7820) by @sapphi-red
- node/test: run fixture tests in concurrent (#7790) by @hyf0
- move ConfigExport and RolldownOptionsFunction types to define-config (#7799) by @shulaoda
- cli: validate config after resolving and improve error message (#7798) by @shulaoda

### 📚 Documentation

- rebrand (#7670) by @yyx990803
- fix incorrect default value for propertyReadSideEffects (#7847) by @Copilot
- remove options pages and redirect to reference pages (#7834) by @sapphi-red
- options: inline types to option property pages (#7831) by @sapphi-red
- options: port checks.pluginTimings content from options page to reference page (#7832) by @sapphi-red
- options: use `@linkcode` where possible (#7824) by @sapphi-red
- options: port content from options page to reference page (#7822) by @sapphi-red
- options: add descriptions for output options (#7821) by @sapphi-red
- options: add description for input options (#7802) by @sapphi-red
- options: add description for `checks.*` (#7801) by @sapphi-red
- apis: add hook graph (#7671) by @sapphi-red

### 🧪 Testing

- add all valid combination of chunk exports related test (#7851) by @IWANABETHATGUY
- enable MagicString test after api return type alignment (#7797) by @IWANABETHATGUY
- init magic-string test (#7794) by @IWANABETHATGUY

### ⚙️ Miscellaneous Tasks

- vite-tests: configure git user for rebase operation (#7875) by @shulaoda
- rolldown_binding: remove v3 native plugins (#7837) by @shulaoda
- rolldown_binding: allow crate-type as lib (#7866) by @Brooooooklyn
- README.md: adjust position and size of rolldown logo (#7861) by @hyf0
- deps: update test262 submodule for tests (#7857) by @sapphi-red
- deps: update oxc to v0.108.0 (#7845) by @renovate[bot]
- deps: update dependency oxlint to v1.39.0 (#7849) by @renovate[bot]
- deps: update dependency oxfmt to ^0.24.0 (#7844) by @renovate[bot]
- deps: update npm packages (#7841) by @renovate[bot]
- deps: update rust crates (#7839) by @renovate[bot]
- deps: update github-actions (#7840) by @renovate[bot]
- use workspace edition for all crates (#7829) by @IWANABETHATGUY
- deps: update dependency oxlint-tsgolint to v0.11.0 (#7827) by @renovate[bot]
- deps: update napi to v3.8.2 (#7810) by @renovate[bot]
- remove outdated snapshot files (#7806) by @shulaoda
- deps: update crate-ci/typos action to v1.42.0 (#7792) by @renovate[bot]

Co-authored-by: shulaoda <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

When unbundle and cjs format, JSON file had imported by ESM which was lost export

2 participants