fix: dynamic entry merged into common chunk with cjs and esm wrap kind#7771
Merged
IWANABETHATGUY merged 1 commit intomainfrom Jan 7, 2026
Merged
Conversation
Member
Author
How to use the Graphite Merge QueueAdd 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. |
IWANABETHATGUY
changed the title
✅ Deploy Preview for rolldown-rs canceled.
|
✅ Deploy Preview for rolldown-rs canceled.
|
IWANABETHATGUY
force-pushed
the
01-05-test_dynamic_entry_merged_into_common_chunk
branch
2 times, most recently
from
fc9f7b7 to
09089e3
Compare
@rolldown/browser
@rolldown/debug
@rolldown/pluginutils
rolldown
@rolldown/binding-android-arm64
@rolldown/binding-darwin-arm64
@rolldown/binding-darwin-x64
@rolldown/binding-freebsd-x64
@rolldown/binding-linux-arm-gnueabihf
@rolldown/binding-linux-arm64-gnu
@rolldown/binding-linux-arm64-musl
@rolldown/binding-linux-x64-gnu
@rolldown/binding-linux-x64-musl
@rolldown/binding-openharmony-arm64
@rolldown/binding-wasm32-wasi
@rolldown/binding-win32-arm64-msvc
@rolldown/binding-win32-x64-msvc
commit: |
IWANABETHATGUY
force-pushed
the
01-05-test_dynamic_entry_merged_into_common_chunk
branch
3 times, most recently
from
1f38c91 to
5e24144
Compare
IWANABETHATGUY
changed the title
IWANABETHATGUY
requested review from
Copilot and
hyf0
and removed request for
Copilot
Contributor
Benchmarks Rust |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug where dynamic entry modules merged into common chunks didn't handle CJS and ESM wrap kinds correctly. Previously, all wrapped modules were treated uniformly, but this change introduces differentiated handling based on the module's wrap kind.
Key Changes:
- Added AST helper methods to generate appropriate Promise chain transformations for CJS and ESM wrapped modules
- Updated export symbol tracking to include wrapper references for wrapped modules
- Modified symbol inclusion logic to handle different wrap kinds appropriately
Reviewed changes
Copilot reviewed 14 out of 14 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| crates/rolldown_ecmascript_utils/src/ast_snippet.rs | Added helper methods then_call_cjs_wrapper_with_to_esm and then_call_esm_wrapper_with_namespace to generate correct Promise chain transformations for wrapped modules |
| crates/rolldown/src/stages/generate_stage/compute_cross_chunk_links.rs | Updated export symbol computation to differentiate between wrap kinds: CJS exports wrapper_ref only, ESM exports both wrapper_ref and namespace, None exports namespace only |
| crates/rolldown/src/stages/generate_stage/chunk_optimizer.rs | Modified symbol inclusion and runtime helper tracking to handle different wrap kinds, conditionally including ExportAll only for non-CJS modules |
| crates/rolldown/src/module_finalizers/mod.rs | Added wrap kind-based branching in dynamic import rewriting to generate appropriate code: __toESM(n.require_xxx()) for CJS, (n.init_xxx(), n.namespace) for ESM, and n.namespace for None |
| crates/rolldown/tests/rolldown/optimization/chunk_merging/dynamic_entry_merged_in_common_chunk/* | Added test case for CJS wrapped module merged into common chunk with both ESM and CJS output formats |
| crates/rolldown/tests/rolldown/optimization/chunk_merging/dynamic_entry_merged_in_common_chunk2/* | Added test case for mixed CJS and ESM wrapped modules merged into common chunk with both output formats |
| crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap | Updated snapshot hashes reflecting the code generation changes |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...down/tests/rolldown/optimization/chunk_merging/dynamic_entry_merged_in_common_chunk2/main.js
Show resolved
Hide resolved
hyf0
approved these changes
Jan 7, 2026
Contributor
Merge activity
|
#7771) Now test covered dynamic importee wrap kind `[None, Esm, Cjs]` * output format `[esm, cjs]`, feel free to point out if I am missing any related test case
graphite-app
bot
force-pushed
the
01-05-test_dynamic_entry_merged_into_common_chunk
branch
from
5e24144 to
f853e7a
Compare
IWANABETHATGUY
deleted the
01-05-test_dynamic_entry_merged_into_common_chunk
branch
shulaoda
added a commit
that referenced
this pull request
Jan 7, 2026
## [1.0.0-beta.59] - 2026-01-07 ⚡ Inline Dynamic Imports for Statically Imported Modules - When a module is already statically imported, dynamic imports to that same module are now inlined instead of creating a separate chunk ### 🚀 Features - plugin_timings: add 3s threshold and doc link to warning message (#7741) by @shulaoda - improve treeshaking logic to handle empty parameter list in dynamic import .then() callbacks (#7781) by @Copilot - dev/lazy: don't include already executed modules (#7745) by @hyf0 - dev/lazy: support dynamic `import(..)` (#7726) by @hyf0 - inline dynamic imports that imports statically imported modules (#7742) by @IWANABETHATGUY - option: add experimental option to control chunk optimization (#7738) by @IWANABETHATGUY ### 🐛 Bug Fixes - inline dynamic entry to user defined entry with esm wrap kind (#7783) by @IWANABETHATGUY - use canonical namespace reference for property access (#7777) by @IWANABETHATGUY - dynamic entry merged into common chunk with cjs and esm wrap kind (#7771) by @IWANABETHATGUY - tla: should not await non-tla-related modules (#7768) by @hyf0 - dynamic entry captured by common chunk with CJS format (#7757) by @IWANABETHATGUY - module_loader: mark emitted chunks as user-defined entry when already loaded (#7765) by @shulaoda - normalize preserveModulesRoot path (#7737) by @IWANABETHATGUY - linker: resolve race condition in side effects computation for export-star (#7728) by @camc314 ### 🚜 Refactor - plugin_timings: filter out plugins with duration < 1s from timing warnings (#7785) by @shulaoda - module_loader: remove unnecessary collect before extend (#7769) by @shulaoda - rename _id suffixes to _idx for oxc_index types (#7767) by @IWANABETHATGUY - remove duplicate `preserve_entry_signatures` from `AddEntryModuleMsg` (#7762) by @shulaoda - module_loader: pass `user_defined_entries` by reference (#7756) by @shulaoda - dev/lazy: get proxy entry's `ResolvedId` correctly (#7746) by @hyf0 - simplify try_rewrite_import_expression control flow (#7753) by @IWANABETHATGUY - module_loader: remove unnecessary dynamic import handling for runtime module (#7754) by @shulaoda - inline __toDynamicImportESM (#7747) by @IWANABETHATGUY - use From impl for ModuleLoaderOutput conversion (#7732) by @shulaoda - remove duplicate fields from `ModuleLoader` (#7731) by @shulaoda - tweak `resolve_user_defined_entries` (#7727) by @shulaoda ### 📚 Documentation - add rolldown-string reference to native MagicString compatibility section (#7778) by @Copilot - improve comments for export star side effects handling (#7730) by @IWANABETHATGUY ### 🧪 Testing - use assertion instead of console.log for some testcase (#7744) by @IWANABETHATGUY ### ⚙️ Miscellaneous Tasks - tweak some `output.dynamicImportInCjs` related rollup test results (#7776) by @sapphi-red - mark esbuild/dce/dce_of_symbol_ctor_call as passed (#7775) by @sapphi-red - deps: update oxc apps (#7772) by @renovate[bot] - vite-tests: allow running on PRs with `test: vite-tests` label (#7770) by @shulaoda - deps: update oxc apps (#7760) by @renovate[bot] - deps: update rollup submodule for tests to v4.55.1 (#7763) by @sapphi-red - deps: update test262 submodule for tests (#7764) by @sapphi-red - deps: update oxc to v0.107.0 (#7758) by @camc314 - deps: update taiki-e/install-action action to v2.65.13 (#7751) by @renovate[bot] - deps: update rust crates (#7750) by @renovate[bot] - deps: update npm packages (#7749) by @renovate[bot] - deps: update github-actions (#7748) by @renovate[bot] - deps: update dependency oxlint-tsgolint to v0.10.1 (#7729) by @renovate[bot] - deps: update crate-ci/typos action to v1.41.0 (#7725) by @renovate[bot] Co-authored-by: shulaoda <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Now test covered dynamic importee wrap kind
[None, Esm, Cjs]* output format[esm, cjs], feel free to point out if I am missing any related test case