Skip to content

Comments

fix: correctly handle cjs json module as entry point#7147

Merged
graphite-app[bot] merged 1 commit intomainfrom
11-20-fix_7146
Nov 20, 2025
Merged

fix: correctly handle cjs json module as entry point#7147
graphite-app[bot] merged 1 commit intomainfrom
11-20-fix_7146

Conversation

@IWANABETHATGUY
Copy link
Member

@IWANABETHATGUY IWANABETHATGUY commented Nov 20, 2025

closed #7146

Copy link
Member Author


How to use the Graphite Merge Queue

Add the label graphite: merge 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 Nov 20, 2025

Deploy Preview for rolldown-rs canceled.

Name Link
🔨 Latest commit 53599b0
🔍 Latest deploy log https://app.netlify.com/projects/rolldown-rs/deploys/691ee5bd2d5d580008418211

@IWANABETHATGUY IWANABETHATGUY changed the title fix: 7146 fix: correctly handle cjs json module as entry point Nov 20, 2025
@IWANABETHATGUY IWANABETHATGUY marked this pull request as ready for review November 20, 2025 08:44
Copilot AI review requested due to automatic review settings November 20, 2025 08:44
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 the handling of CommonJS JSON modules when used as entry points. Previously, JSON modules were incorrectly wrapped in an additional function call even when they were already entry points.

  • Uses the hint return value from finalized_expr_for_symbol_ref (previously ignored) to check for FromCjsWrapKindEntry
  • Applies consistent logic between JSON modules and regular modules for entry point handling
  • Adds comprehensive test coverage for both CJS and ESM output formats with preserveModules enabled

Reviewed Changes

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

Show a summary per file
File Description
crates/rolldown/src/module_finalizers/mod.rs Fixed JSON module entry point handling by using the hint variable and conditionally skipping the wrapper call when FromCjsWrapKindEntry is set
crates/rolldown/tests/rolldown/issues/7146/main.js Test file that requires a JSON module to verify the fix
crates/rolldown/tests/rolldown/issues/7146/config.json JSON module used by the test
crates/rolldown/tests/rolldown/issues/7146/_config.json Test configuration for both CJS and ESM formats with preserveModules
crates/rolldown/tests/rolldown/issues/7146/artifacts.snap Expected output snapshot showing correct bundling for both formats

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

@IWANABETHATGUY IWANABETHATGUY force-pushed the 11-20-fix_7146 branch 3 times, most recently from 5051a6c to 41b87d1 Compare November 20, 2025 08:58
Copilot AI review requested due to automatic review settings November 20, 2025 08:58
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

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


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

@github-actions
Copy link
Contributor

github-actions bot commented Nov 20, 2025

Benchmarks Rust

group                                                        pr                                     target
-----                                                        --                                     ------
bundle/bundle@multi-duplicated-top-level-symbol              1.00     66.3±2.96ms        ? ?/sec    1.09     72.1±2.80ms        ? ?/sec
bundle/bundle@multi-duplicated-top-level-symbol-sourcemap    1.00     75.9±2.67ms        ? ?/sec    1.03     78.0±3.80ms        ? ?/sec
bundle/bundle@rome_ts                                        1.00    108.9±2.45ms        ? ?/sec    1.06    115.7±2.37ms        ? ?/sec
bundle/bundle@rome_ts-sourcemap                              1.00    123.0±3.73ms        ? ?/sec    1.03    127.1±3.47ms        ? ?/sec
bundle/bundle@threejs                                        1.00     41.6±1.70ms        ? ?/sec    1.00     41.8±0.95ms        ? ?/sec
bundle/bundle@threejs-sourcemap                              1.00     44.4±0.85ms        ? ?/sec    1.01     44.9±1.03ms        ? ?/sec
bundle/bundle@threejs10x                                     1.00    401.9±9.93ms        ? ?/sec    1.01    406.3±8.71ms        ? ?/sec
bundle/bundle@threejs10x-sourcemap                           1.00    464.8±9.50ms        ? ?/sec    1.00    464.3±7.57ms        ? ?/sec
scan/scan@rome_ts                                            1.00     88.4±2.38ms        ? ?/sec    1.01     89.1±2.15ms        ? ?/sec
scan/scan@threejs                                            1.00     29.6±0.96ms        ? ?/sec    1.02     30.1±1.19ms        ? ?/sec
scan/scan@threejs10x                                         1.00    303.3±5.23ms        ? ?/sec    1.02    308.5±6.39ms        ? ?/sec

@graphite-app
Copy link
Contributor

graphite-app bot commented Nov 20, 2025

Merge activity

@graphite-app graphite-app bot merged commit 53599b0 into main Nov 20, 2025
28 checks passed
@graphite-app graphite-app bot deleted the 11-20-fix_7146 branch November 20, 2025 10:10
This was referenced Nov 26, 2025
shulaoda added a commit that referenced this pull request Nov 26, 2025
## [1.0.0-beta.52] - 2025-11-26

💥 Breaking Change

- Change `output.generatedCode.profilerNames` default to `false`

🔧 Vite-Style TypeScript Configuration

- Rolldown now supports Vite-style automatic tsconfig resolution. Use `tsconfig: true` to enable auto-discovery mode where each module finds its nearest `tsconfig.json`. See more details [here](https://rolldown.rs/options/tsconfig)

⚙️ Upgraded to oxc v0.99.0

- Add `TSGlobalDeclaration` type
- More details: https://github.com/oxc-project/oxc/releases/tag/crates_v0.99.0

### 💥 BREAKING CHANGES

- change `output.generatedCode.profilerNames` default to false (#7139) by @Copilot

### 🚀 Features

- support vite-style tsconfig resolution (#6873) by @shulaoda
- rolldown: oxc v0.99.0  (#7165) by @camc314
- browser: export `plugins` (#7210) by @sxzz
- rolldown_plugin_vite_css_post: add `inline` parameter to `cssMinify` callback (#7191) by @shulaoda
- rolldown_plugin_vite_build_import_analysis: implement `render_chunk` to replace `__VITE_IS_MODERN__` flag (#7178) by @shulaoda
- rolldown_plugin_utils: optimize SVG data URL encoding (#7156) by @shulaoda
- dev: replace `DevEngine::hasLatestBuildOutput` with `DevEngine::getBundleState` (#7145) by @sapphi-red
- rolldown_plugin_vite_asset_import_meta_url: support `@vite-ignore` comment (#7141) by @shulaoda
- rolldown_plugin_vite_asset_import_meta_url: implement static URL processing (#7140) by @shulaoda
- rolldown_plugin_vite_asset_import_meta_url: align `asset_resolver` logic (#7137) by @shulaoda
- rolldown_plugin_vite_asset_import_meta_url: align `try_fs_resolve` logic (#7136) by @shulaoda
- rolldown_plugin_vite_asset_import_meta_url: validate relative paths (#7120) by @shulaoda
- export `viteAssetImportMetaUrlPlugin` and add dynamic URL tests (#7119) by @shulaoda

### 🐛 Bug Fixes

- watch overwrite rename event on linux (#7201) by @sapphi-red
- preserve name for parenthesized anonymous default exports and arrow functions with keepNames (#7159) by @Copilot
- rolldown_plugin_vite_html: add missing async attribute for inlined entry scripts (#7202) by @shulaoda
- respect target setting in DCE to prevent modern syntax generation (#7128) by @Copilot
- rolldown_plugin_vite_html: add semicolon to import statement in CSS removal (#7200) by @shulaoda
- rolldown_plugin_vite_html: use correct CSS asset filename in HTML injection (#7199) by @shulaoda
- rolldown_plugin_vite_css_post: handle scoped package names in lib CSS filename (#7198) by @shulaoda
- rolldown_plugin_vite_html: use patched `html5gum` with correct span tracking (#7193) by @shulaoda
- rolldown_plugin_vite_html: handle HTML strings in script tags correctly (#7192) by @shulaoda
- handle JSON import namespace property access correctly (#7190) by @IWANABETHATGUY
- only include runtime helpers from included modules (#7183) by @IWANABETHATGUY
- rolldown_plugin_vite_html: normalize paths to use forward slashes in `original_file_name` (#7175) by @shulaoda
- rolldown_plugin_vite_css_post: use `filename` instead of `reference_id` for imported assets (#7174) by @shulaoda
- rolldown_plugin_vite_css_post: correct regex escaping in pure CSS chunk pruning (#7173) by @shulaoda
- rolldown_plugin_vite_html: use correct dependency path for modulepreload links (#7172) by @shulaoda
- update cur_stmt_index when processing top level statements (#7157) by @IWANABETHATGUY
- rolldown_plugin_utils: strip leading character from public asset URL (#7170) by @shulaoda
- rolldown_plugin_vite_html: use correct `public_base` for `html_result_map` key (#7169) by @shulaoda
- rolldown_plugin_utils: correct runtime handling and escape single quotes in asset paths (#7168) by @shulaoda
- rolldown_plugin_utils: prevent data race in `file_to_url` cache (#7166) by @shulaoda
- rolldown_plugin_vite_asset_import_meta_url: correct glob pattern and query string handling in dynamic URLs (#7162) by @shulaoda
- rolldown_plugin_vite_css_post: use correct start position in magic string updates (#7158) by @shulaoda
- data race in `FileEmitter::emit_file` causing duplicate asset emissions (#7164) by @shulaoda
- dev: watch files even if the build failed (#7149) by @sapphi-red
- rolldown_plugin_utils: always use base64 encoding for data URLs (#7148) by @shulaoda
- preserve "default" name for anonymous default exports with keepNames (#7151) by @Copilot
- correctly handle cjs json module as entry point (#7147) by @IWANABETHATGUY
- rolldown_plugin_utils: correct `reference_id` parsing in `render_asset_url_in_js` (#7143) by @shulaoda
- rolldown_plugin_vite_asset_import_meta_url: exclude quotes from URL span (#7142) by @shulaoda
- rolldown_plugin_vite_asset_import_meta_url: use template literal for glob result indexing (#7134) by @shulaoda
- tree shake unused dynamic entry when `inlineDynamicImports` is enabled (#7129) by @IWANABETHATGUY
- correct return value of `parse` / `parseSync` functions (#7127) by @sapphi-red

### 🚜 Refactor

- rolldown_plugin_vite_transform: use `oxc_resolver` for tsconfig discovery (#7220) by @shulaoda
- rolldown_plugin_vite_resolve: use `resolve_file` for tsconfig discovery (#7216) by @shulaoda
- rolldown_plugin_utils: remove redundant `ViteMetadata::get_or_insert_default()` (#7189) by @shulaoda
- rolldown_plugin_utils: simplify `ViteMetadata::get()` to always return a value (#7188) by @shulaoda
- rolldown_utils: add `guess_mime_skip_utf8_check` for binary assets (#7161) by @shulaoda
- rolldown_plugin_utils: extract asset URL parsing into `AssetUrlIter` (#7144) by @shulaoda
- store pattern name in FilenameTemplate (#7132) by @IWANABETHATGUY

### 📚 Documentation

- tsconfig: document auto-discovery mode and improve structure (#7228) by @shulaoda
- add plugin hook filter compatibility and fallback guide (#7138) by @Copilot
- update top level navigation (#7092) by @mdong1909

### 🧪 Testing

- add tsconfig include/exclude/files matching test cases (#6899) by @shulaoda
- vite-tests: run `playwright install` in case playwright binary is missing (#7226) by @sapphi-red
- watch: close watcher when an error occured in the test cases (#7225) by @sapphi-red
- watch: reject `waitBuildFinished` if `ERROR` event occurs (#7224) by @sapphi-red

### ⚙️ Miscellaneous Tasks

- example: revert accidental changes to basic-typescript (#7227) by @shulaoda
- deps: update oxc apps (#7212) by @renovate[bot]
- deps: update rust crates (#7204) by @renovate[bot]
- deps: update `oxc_resolver_napi` to 11.14.0 (#7217) by @shulaoda
- deps: update oxc_resolver (#6909) by @shulaoda
- deps: update dependency glob to v13 (#7208) by @renovate[bot]
- deps: update actions/checkout action to v6 (#7207) by @renovate[bot]
- deps: update npm packages (#7206) by @renovate[bot]
- deps: update github-actions (#7205) by @renovate[bot]
- add missing status code comment (#7185) by @iiio2
- deps: update dependency oxlint-tsgolint to v0.8.1 (#7197) by @renovate[bot]
- rust: add more tracing log for hmr + dev logic (#7179) by @hyf0
- deps: update dependency oxlint-tsgolint to v0.8.0 (#7167) by @renovate[bot]
- deps: update dependency oxlint-tsgolint to v0.7.3 (#7133) by @renovate[bot]
- merge similar inlineDynamicImports test case (#7131) by @IWANABETHATGUY
- deps: update `rolldown-plugin-dts` to 0.18.0 (#7125) by @shulaoda

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.

[Bug]: Require json file in CJS throw an Error

2 participants