feat: inline dynamic imports that imports statically imported modules#7742
feat: inline dynamic imports that imports statically imported modules#7742graphite-app[bot] merged 1 commit intomainfrom
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 canceled.
|
8d2c4c0 to
cf2e00b
Compare
0a7afd0 to
5fefe91
Compare
670ecab to
fed6e82
Compare
3418c7c to
b3a0351
Compare
f6d03ea to
69aa10f
Compare
b3a0351 to
832cba1
Compare
69aa10f to
fc61c3a
Compare
435d62d to
8fd50ff
Compare
.../tests/esbuild/splitting/splitting_dynamic_and_not_dynamic_common_js_into_es6/artifacts.snap
Show resolved
Hide resolved
8fd50ff to
bc2cb8b
Compare
There was a problem hiding this comment.
Pull request overview
This PR optimizes dynamic imports for modules that end up in the same chunk after code splitting and chunk merging. When a dynamically imported module is merged into the same chunk as the importer (either through chunk merging optimization or user-defined entry points), the PR eliminates the unnecessary dynamic import by converting it to a synchronous reference wrapped in a resolved Promise.
Key changes:
- Converts
import('./module.js')toPromise.resolve().then(() => module_namespace)when both modules are in the same chunk - Handles both ESM and CJS modules correctly, applying
__toESMwrapper for CJS modules - Extends chunk merging optimization to support merging dynamic entries into user-defined entry chunks
- Adds namespace extraction for cross-chunk imports when dynamic entries are merged into common chunks
Reviewed changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| crates/rolldown_common/src/chunk/mod.rs | Adds is_pure_user_defined_entry() helper method to check if a chunk is purely a user-defined entry without other flags |
| crates/rolldown/src/stages/generate_stage/chunk_optimizer.rs | Extends chunk merging logic to handle dynamic entries merged into user-defined entry chunks |
| crates/rolldown/src/module_finalizers/mod.rs | Implements core rewriting logic for dynamic imports when modules are in the same chunk, with proper handling of ESM and CJS modules |
| crates/rolldown/tests/rolldown/optimization/chunk_merging/issue_4905/* | New test case demonstrating ESM dynamic import optimization with both ESM and CJS output formats |
| crates/rolldown/tests/rolldown/optimization/chunk_merging/dynamic_import_cjs_same_chunk/* | New test case demonstrating CJS module dynamic import optimization |
| crates/rolldown/tests/snapshots/* | Updated snapshots reflecting optimized output with fewer chunks and rewritten dynamic imports |
| crates/rolldown/tests/*/artifacts.snap | Updated test snapshots showing the optimization in action across various existing tests |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Benchmarks Rust |
|
@hyf0 @sapphi-red I am going to merge this pr, feel free to comment if you found any issues. |
Merge activity
|
bc2cb8b to
8257a30
Compare
## [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]>
|
Is there a way to disable this optimization? it produces broken code for me I think, and I'd like to confirm that. After bundling I get: // dbp-playground-activity.js:
var file_sink_exports = /* @__PURE__ */ __exportAll({ FileSink: () => FileSink });And on the importing end I get this, so the import isn't adjusted somehow (the filename is, the rest isn't): import("../dbp-playground-activity.js").then(({ FileSink }) => {
this.defineScopedElement("dbp-file-sink", FileSink);
});One reason I have this mix of static and dynamic imports is to avoid a cyclic dependency during import, so maybe this optimization isn't handling import cycles correctly? I'll try to reduce the problem. |
|
I've found a reproducer: #8027 The trigger seems to be multiple entry points, and not import cycles. |

closed #4905