Skip to content

fix: preserve chunk imports relationship after chunk merging#7303

Merged
shulaoda merged 1 commit intomainfrom
12-02-fix_preserve_chunk_imports_relationship_after_chunk_merging
Dec 2, 2025
Merged

fix: preserve chunk imports relationship after chunk merging#7303
shulaoda merged 1 commit intomainfrom
12-02-fix_preserve_chunk_imports_relationship_after_chunk_merging

Conversation

@shulaoda
Copy link
Member

@shulaoda shulaoda commented Dec 2, 2025

closes #7297

Copy link
Member Author

shulaoda commented Dec 2, 2025


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.

@shulaoda shulaoda marked this pull request as ready for review December 2, 2025 04:07
Copilot AI review requested due to automatic review settings December 2, 2025 04:07
@netlify
Copy link

netlify bot commented Dec 2, 2025

Deploy Preview for rolldown-rs failed.

Name Link
🔨 Latest commit 2944879
🔍 Latest deploy log https://app.netlify.com/projects/rolldown-rs/deploys/692e6bd688063e0008cd2d37

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 a bug where chunk import relationships were lost after chunk merging optimization. The issue occurred because the cross_chunk_imports computed before chunk merging didn't include imports that were added during the chunk merging process (stored in imports_from_other_chunks). The fix merges these two sources to preserve all chunk import relationships.

  • Adds logic to include imports from imports_from_other_chunks (added during chunk merging) into cross_chunk_imports
  • Changes from parallel iteration (into_par_iter()) to enumerated iteration (into_iter_enumerated()) to access chunk indices
  • Maintains consistency with similar code pattern at lines 90-103 that already handles imports_from_other_chunks

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

@shulaoda shulaoda force-pushed the 12-02-fix_preserve_chunk_imports_relationship_after_chunk_merging branch from 6771c1a to e4cd8da Compare December 2, 2025 04:10
@IWANABETHATGUY
Copy link
Member

Can you add a testcase?

@shulaoda shulaoda force-pushed the 12-02-fix_preserve_chunk_imports_relationship_after_chunk_merging branch from e4cd8da to 2d4adfc Compare December 2, 2025 04:24
Copilot AI review requested due to automatic review settings December 2, 2025 04:24
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 1 out of 1 changed files in this pull request and generated 1 comment.


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

@shulaoda shulaoda force-pushed the 12-02-fix_preserve_chunk_imports_relationship_after_chunk_merging branch from 2d4adfc to 2944879 Compare December 2, 2025 04:32
@shulaoda
Copy link
Member Author

shulaoda commented Dec 2, 2025

Can you add a testcase?

done

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2025

Benchmarks Rust

  • target: main(55d8483)
  • pr: 12-02-fix_preserve_chunk_imports_relationship_after_chunk_merging(2944879)
group                                                        pr                                     target
-----                                                        --                                     ------
bundle/bundle@multi-duplicated-top-level-symbol              1.00     66.9±2.31ms        ? ?/sec    1.00     66.7±2.22ms        ? ?/sec
bundle/bundle@multi-duplicated-top-level-symbol-sourcemap    1.01     73.4±4.17ms        ? ?/sec    1.00     72.4±2.34ms        ? ?/sec
bundle/bundle@rome_ts                                        1.02    111.4±3.04ms        ? ?/sec    1.00    109.5±1.87ms        ? ?/sec
bundle/bundle@rome_ts-sourcemap                              1.00    122.8±2.73ms        ? ?/sec    1.00    122.8±2.02ms        ? ?/sec
bundle/bundle@threejs                                        1.02     40.0±1.43ms        ? ?/sec    1.00     39.2±0.75ms        ? ?/sec
bundle/bundle@threejs-sourcemap                              1.00     43.6±0.98ms        ? ?/sec    1.00     43.5±0.90ms        ? ?/sec
bundle/bundle@threejs10x                                     1.00    393.1±5.28ms        ? ?/sec    1.00    395.0±7.53ms        ? ?/sec
bundle/bundle@threejs10x-sourcemap                           1.00    456.4±6.89ms        ? ?/sec    1.00    457.2±5.31ms        ? ?/sec
scan/scan@rome_ts                                            1.01     86.2±1.93ms        ? ?/sec    1.00     85.8±2.12ms        ? ?/sec
scan/scan@threejs                                            1.00     29.3±1.94ms        ? ?/sec    1.00     29.2±1.83ms        ? ?/sec
scan/scan@threejs10x                                         1.01    298.2±5.39ms        ? ?/sec    1.00    296.1±4.48ms        ? ?/sec

@shulaoda shulaoda merged commit 437ac51 into main Dec 2, 2025
24 of 28 checks passed
@shulaoda shulaoda deleted the 12-02-fix_preserve_chunk_imports_relationship_after_chunk_merging branch December 2, 2025 05:00
This was referenced Dec 3, 2025
shulaoda added a commit that referenced this pull request Dec 3, 2025
## [1.0.0-beta.53] - 2025-12-03

💥 Breaking Changes
- Drop `i686-pc-windows-msvc` target support

🚀 Chunk Merging Optimization
- Rolldown now automatically merges shared chunks when entries import each other (when `preserveEntrySignature` is not `strict`)
```shell
Before:
entry.js   → imports → shared.js (common chunk)
entry2.js  → imports → shared.js
Output: 3 chunks (entry.js, entry2.js, shared.js)

After:
entry.js   → contains shared code
entry2.js  → imports → entry.js
Output: 2 chunks (entry.js, entry2.js)
```

### 💥 BREAKING CHANGES

- drop `i686-pc-windows-msvc` target support (#7230) by @sapphi-red

### 🚀 Features

- rolldown_plugin_vite_manifest: pass normalized options to `isLegacy` callback (#7321) by @shulaoda
- plugin/vite-resolve: add `disableCache` option (#6763) by @sapphi-red
- rolldown: export `createTokioRuntime` for tsdown (#7264) by @shulaoda
- rolldown_plugin_vite_html: sync `moduleSideEffects` for already loaded modules (#7254) by @shulaoda
- rolldown_plugin_vite_html: load module scripts with side effects to prevent tree-shaking (#7244) by @shulaoda
- rolldown_plugin_vite_css_post: implement `cssScopeTo` for scoped CSS tree-shaking (#7240) by @shulaoda

### 🐛 Bug Fixes

- export default class decl __name runtime insertion (#7316) by @IWANABETHATGUY
- chunk side effects calculation (#7273) by @IWANABETHATGUY
- node: `output.generateCode.preset: 'es2015'` should set `output.generateCode.symbols: true` by default (#7314) by @sapphi-red
- skip name helper for classes with static name property (#7312) by @IWANABETHATGUY
- preserve chunk imports relationship after chunk merging (#7303) by @shulaoda
- dev: make `register_modules` async (#7289) by @hyf0
- preserve computed property in object destructuring (#7288) by @IWANABETHATGUY
- support dynamic imports with shared dependencies (#7261) by @IWANABETHATGUY
- call `defer_sync_scan_data` in non-incremental build mode (#7255) by @shulaoda
- optimize chunk merging for shared entry points (#7194) by @IWANABETHATGUY
- add indentation for UMD format output (#7263) by @IWANABETHATGUY
- rolldown_plugin_vite_css_post: pass options to `isLegacy` callback for proper legacy detection (#7260) by @shulaoda
- rolldown_plugin_vite_css_post: also detect `?inline=true` query for inlined CSS (#7245) by @shulaoda
- rolldown_plugin_vite_css_post: distinguish empty CSS from no CSS (#7241) by @shulaoda
- add Windows support for t-run command (#7242) by @IWANABETHATGUY
- cjs: prevent duplicate require declarations for external modules with preserveModules (#7234) by @logaretm
- rolldown_plugin_vite_resolve: resolve from root for virtual modules (#7236) by @sapphi-red
- include entry level external modules in chunk exports (#7218) by @IWANABETHATGUY

### 🚜 Refactor

- dev: make `removeClient` async (#7313) by @hyf0
- move chunk merging code out of code_splitting.rs (#7285) by @IWANABETHATGUY
- extract common function util for chunk merging (#7271) by @IWANABETHATGUY
- use iterative method to merge chunks (#7256) by @IWANABETHATGUY
- use concat_string! instead of string replace for generating chunk level exports (#7247) by @IWANABETHATGUY

### 📚 Documentation

- add warning to experimental.resolveNewUrlToAsset about JS/TS files (#7300) by @Copilot
- add sequential hook execution difference in plugin-api.md (#7308) by @Copilot
- add migration example from onwarn to onLog (#7299) by @Copilot
- add migration example for manualChunks to advancedChunks (#7298) by @Copilot
- deps: bump vitepress to fix build (#7307) by @sapphi-red
- examples & text for experimental.resolveNewUrlToAsset (#7259) by @TheAlexLichter

### ⚡ Performance

- rolldown_plugin_vite_css_post: lazily load `cssScopeTo` from JS module options (#7253) by @shulaoda
- rolldown_plugin_vite_css_post: avoid unnecessary string clones in `resolve_asset_urls_in_css` (#7250) by @shulaoda

### 🧪 Testing

- generate relative path like name in advanced chunks (#7267) by @IWANABETHATGUY
- add test case for preserveEntrySignatures with re-exports (#7279) by @IWANABETHATGUY
- add test262 integration tests (#7196) by @sapphi-red

### ⚙️ Miscellaneous Tasks

- deps: update dependency rolldown-plugin-dts to v0.18.1 (#7304) by @renovate[bot]
- enable tracing feature for napi (#7322) by @sapphi-red
- deps: update napi (#7320) by @renovate[bot]
- deps: update oxc (#7318) by @renovate[bot]
- deps: update napi (#7317) by @renovate[bot]
- deps: update oxc to v0.100.0 (#7301) by @renovate[bot]
- deps: downgrade pnpm to 10.23.0 to fix Netlify build (#7306) by @shulaoda
- add `trustPolicyExclude` for chokidar and semver (#7302) by @sapphi-red
- update pnpm lockfile (#7291) by @IWANABETHATGUY
- deps: update npm packages (#7272) by @renovate[bot]
- deps: update rust crates (#7270) by @renovate[bot]
- deps: update oxc (#7262) by @renovate[bot]
- deps: update github-actions (#7269) by @renovate[bot]
- deps: update dependency dprint-typescript to v0.95.13 (#7268) by @renovate[bot]
- deps: update `html5gum` to 0.8.1 (#7265) by @shulaoda
- rolldown: remove unused `getModuleOptions` from `PluginContext` (#7266) by @shulaoda
- remove unnecessary justfile ignore (#7243) by @IWANABETHATGUY
- deps: update oxc apps (#7238) by @renovate[bot]
- add `nul` to workaround https://github.com/anthropics/claude-c… (#7237) by @IWANABETHATGUY
- deps: update dependency valibot to v1.2.0 [security] (#7231) by @renovate[bot]
- deps: update crate-ci/typos action to v1.40.0 (#7232) by @renovate[bot]

### ❤️ New Contributors

* @logaretm made their first contribution in [#7234](#7234)

Co-authored-by: shulaoda <165626830+shulaoda@users.noreply.github.com>
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]: imports field does not include the values it should when the chunks are merged

3 participants