Skip to content

Comments

fix: include entry level external modules in chunk exports#7218

Merged
graphite-app[bot] merged 1 commit intomainfrom
11-19-fix_7115
Nov 26, 2025
Merged

fix: include entry level external modules in chunk exports#7218
graphite-app[bot] merged 1 commit intomainfrom
11-19-fix_7115

Conversation

@IWANABETHATGUY
Copy link
Member

@IWANABETHATGUY IWANABETHATGUY commented Nov 25, 2025

Closed #7115

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 25, 2025

Deploy Preview for rolldown-rs canceled.

Name Link
🔨 Latest commit f4aaab9
🔍 Latest deploy log https://app.netlify.com/projects/rolldown-rs/deploys/69271ac5f2e199000824d913

@github-actions
Copy link
Contributor

github-actions bot commented Nov 25, 2025

Benchmarks Rust

group                                                        pr                                     target
-----                                                        --                                     ------
bundle/bundle@multi-duplicated-top-level-symbol              1.08     66.9±1.84ms        ? ?/sec    1.00     61.8±1.50ms        ? ?/sec
bundle/bundle@multi-duplicated-top-level-symbol-sourcemap    1.08     73.7±2.58ms        ? ?/sec    1.00     68.1±1.53ms        ? ?/sec
bundle/bundle@rome_ts                                        1.03    108.4±3.36ms        ? ?/sec    1.00    105.7±2.12ms        ? ?/sec
bundle/bundle@rome_ts-sourcemap                              1.02    121.4±2.11ms        ? ?/sec    1.00    118.6±2.19ms        ? ?/sec
bundle/bundle@threejs                                        1.06     40.3±2.56ms        ? ?/sec    1.00     38.2±0.92ms        ? ?/sec
bundle/bundle@threejs-sourcemap                              1.01     42.4±1.15ms        ? ?/sec    1.00     41.8±1.22ms        ? ?/sec
bundle/bundle@threejs10x                                     1.00    385.7±4.92ms        ? ?/sec    1.00    384.5±4.73ms        ? ?/sec
bundle/bundle@threejs10x-sourcemap                           1.00    443.3±4.94ms        ? ?/sec    1.00    441.1±5.20ms        ? ?/sec
scan/scan@rome_ts                                            1.02     82.6±2.69ms        ? ?/sec    1.00     80.9±2.15ms        ? ?/sec
scan/scan@threejs                                            1.03     28.2±1.10ms        ? ?/sec    1.00     27.4±0.68ms        ? ?/sec
scan/scan@threejs10x                                         1.02    292.0±4.81ms        ? ?/sec    1.00   286.5±11.27ms        ? ?/sec

@IWANABETHATGUY IWANABETHATGUY changed the title fix: 7115 fix: include entry level external modules in chunk exports Nov 26, 2025
@IWANABETHATGUY IWANABETHATGUY marked this pull request as ready for review November 26, 2025 13:14
Copilot AI review requested due to automatic review settings November 26, 2025 13:14
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 #7115 by ensuring that entry-level external modules are properly included in chunk exports for CJS/IIFE/UMD formats. When a module re-exports all symbols from an external module using export * from 'external', the external module needs to be tracked and included in the generated exports. The fix aligns CJS format behavior with the ESM format, which already handled this case correctly.

Key changes:

  • Added entry_level_external_module_idx to the external modules collection when rendering chunk exports for CJS/IIFE/UMD formats
  • Updated symbol deconfliction to include entry-level external modules to prevent naming conflicts
  • Added comprehensive test case demonstrating the fix with preserveModules and CJS format

Reviewed changes

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

File Description
crates/rolldown/src/utils/chunk/render_chunk_exports.rs Added entry-level external modules to the export rendering logic for CJS/IIFE/UMD formats (line 205)
crates/rolldown/src/utils/chunk/deconflict_chunk_symbols.rs Refactored to include entry-level external modules in symbol deconfliction (lines 46-48)
crates/rolldown/tests/rolldown/issues/7115/ Added test case with main.js re-exporting from server.js which re-exports from external-lib
crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap Updated snapshot to include hash expectations for new test files

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

@graphite-app
Copy link
Contributor

graphite-app bot commented Nov 26, 2025

Merge activity

@graphite-app graphite-app bot merged commit f4aaab9 into main Nov 26, 2025
28 checks passed
@graphite-app graphite-app bot deleted the 11-19-fix_7115 branch November 26, 2025 15:35
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 <[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.

Transitive export * statements not re-exported in cjs with preserveModules

2 participants