fix: inline dynamic entry to user defined entry with esm wrap kind#7783
Conversation
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. |
✅ Deploy Preview for rolldown-rs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
cce2754 to
e121e4e
Compare
There was a problem hiding this comment.
Pull request overview
This PR adds test coverage for inlining a dynamic entry into a user-defined entry when the importee has ESM wrap kind, completing coverage for all three WrapKind variants (None, Cjs, Esm). The main code change refactors an if-else statement to a match expression to handle all three wrap kinds explicitly.
Key changes:
- Refactored
rewrite_dynamic_import_for_merged_entryto use match statement for handling all three WrapKind variants - Added new test case for ESM wrap kind with
strictExecutionOrder: true - Updated comment to clarify behavior comparison with webpack
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
crates/rolldown/src/module_finalizers/mod.rs |
Refactored WrapKind handling from if-else to match statement, adding explicit ESM wrap kind case that generates (init_xxx(), namespace_exports) sequence expression; updated TODO comment for clarity |
crates/rolldown/tests/rolldown/optimization/chunk_merging/dynamic_entry_merged_in_user_defined_entry/_config.json |
Test configuration with strictExecutionOrder enabled and CJS format variant |
crates/rolldown/tests/rolldown/optimization/chunk_merging/dynamic_entry_merged_in_user_defined_entry/entry.js |
Test input that statically and dynamically imports the same module |
crates/rolldown/tests/rolldown/optimization/chunk_merging/dynamic_entry_merged_in_user_defined_entry/lib.js |
Simple library module exporting a constant |
crates/rolldown/tests/rolldown/optimization/chunk_merging/dynamic_entry_merged_in_user_defined_entry/artifacts.snap |
Expected output snapshots for both ESM and CJS formats showing proper ESM wrapping with init functions |
crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap |
Updated hash snapshots reflecting new test and hash changes from code modifications |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Merge activity
|
…7783) 1. Add a test for inlining a dynamic entry into a user-defined entry with `strictExecutionOrder: true`. Now all three kinds of `importee` wrap are considered.
e121e4e to
6d4272c
Compare
Benchmarks Rust
|
## [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]>

strictExecutionOrder: true. Now all three kinds ofimporteewrap are considered.