feat: improve treeshaking logic to handle empty parameter list in dynamic import .then() callbacks#7781
Merged
sapphi-red merged 8 commits intomainfrom Jan 7, 2026
Merged
Conversation
✅ Deploy Preview for rolldown-rs canceled.
|
Co-authored-by: sapphi-red <[email protected]>
Co-authored-by: sapphi-red <[email protected]>
Copilot
AI
changed the title
[WIP] Fix tree shaking handling for import syntax variations
fix(tree-shaking): handle empty parameter list in dynamic import .then() callbacks
Jan 7, 2026
sapphi-red
reviewed
Jan 7, 2026
Co-authored-by: sapphi-red <[email protected]>
sapphi-red
reviewed
Jan 7, 2026
Signed-off-by: 翠 <[email protected]>
sapphi-red
reviewed
Jan 7, 2026
crates/rolldown/tests/rolldown/tree_shaking/dynamic_import_then_empty_param/main.js
Outdated
Show resolved
Hide resolved
Co-authored-by: sapphi-red <[email protected]>
IWANABETHATGUY
approved these changes
Jan 7, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a tree-shaking inconsistency where dynamic imports with empty parameter lists in .then() callbacks were not being tree-shaken properly. The change ensures that import('./dynamic.js').then(() => {}) is treated the same as import('./dynamic.js').then(({}) => {}) for tree-shaking purposes.
Key changes:
- Modified the parameter extraction logic to handle empty parameter lists explicitly
- Changed from early-return-on-None (
?operator) to explicit None handling with let-else pattern - Added test case demonstrating the fix
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
crates/rolldown/src/ast_scanner/dynamic_import.rs |
Core fix: Removes ? operator from parameter extraction and adds explicit handling for empty parameter lists to return empty usage set instead of bailing out |
crates/rolldown/tests/rolldown/tree_shaking/dynamic_import_then_empty_param/main.js |
Test input demonstrating the issue: dynamic import with empty callback parameters |
crates/rolldown/tests/rolldown/tree_shaking/dynamic_import_then_empty_param/lib.js |
Test library with exports that should be tree-shaken |
crates/rolldown/tests/rolldown/tree_shaking/dynamic_import_then_empty_param/artifacts.snap |
Expected output snapshot showing proper tree-shaking with empty frozen object |
crates/rolldown/tests/rolldown/tree_shaking/dynamic_import_then_empty_param/_config.json |
Empty test configuration file |
crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap |
Updated hash snapshot including new test case |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Benchmarks Rust |
Member
|
@copilot update the snapshot that happens with |
Co-authored-by: sapphi-red <[email protected]>
Contributor
Author
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
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.
Fix tree shaking for dynamic imports with empty .then() callbacks
Issue
import('./dynamic.js').then(() => {})should be treated the same asimport('./dynamic.js').then(({}) => {})when tree shaking, but currently the former bails out to complete usage while the latter correctly tree-shakes unused exports.Root Cause
In
crates/rolldown/src/ast_scanner/dynamic_import.rs, theinit_dynamic_import_usage_with_member_exprfunction handles.then()calls. When the callback has no parameters (like() => {}),func.params.items.first()returnsNone, causing the function to bail out and mark the import as having complete usage. However, when there's an empty destructured object parameter (like({}) => {}), it correctly identifies this as an empty set of exports being used.Solution
Modified the
init_dynamic_import_usage_with_member_exprfunction to:func.params.items.first()?tofunc.params.items.first()(removing the?operator)Nonecase explicitly by returningSome(FxHashSet::default())which indicates an empty set of used exportsChanges
ast_scanner/dynamic_import.rstree_shaking/dynamic_import_then_empty_param)Testing
tree_shaking/dynamic_import_then_empty_paramthat demonstrates the fix.then(() => {})produces optimized output with complete tree-shakingOriginal prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.