Skip to content

Comments

fix: inline dynamic entry to user defined entry with esm wrap kind#7783

Merged
graphite-app[bot] merged 1 commit intomainfrom
01-07-fix_inline_dynamic_entry_to_user_defined_entry_with_esm_wrap_kind
Jan 7, 2026
Merged

fix: inline dynamic entry to user defined entry with esm wrap kind#7783
graphite-app[bot] merged 1 commit intomainfrom
01-07-fix_inline_dynamic_entry_to_user_defined_entry_with_esm_wrap_kind

Conversation

@IWANABETHATGUY
Copy link
Member

@IWANABETHATGUY IWANABETHATGUY commented Jan 7, 2026

  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.

Copy link
Member Author


How to use the Graphite Merge Queue

Add 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.

@netlify
Copy link

netlify bot commented Jan 7, 2026

Deploy Preview for rolldown-rs ready!

Name Link
🔨 Latest commit 6d4272c
🔍 Latest deploy log https://app.netlify.com/projects/rolldown-rs/deploys/695e1293eb582400083a0deb
😎 Deploy Preview https://deploy-preview-7783--rolldown-rs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@IWANABETHATGUY IWANABETHATGUY force-pushed the 01-07-fix_inline_dynamic_entry_to_user_defined_entry_with_esm_wrap_kind branch from cce2754 to e121e4e Compare January 7, 2026 07:48
@IWANABETHATGUY IWANABETHATGUY marked this pull request as ready for review January 7, 2026 07:52
Copilot AI review requested due to automatic review settings January 7, 2026 07:52
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 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_entry to 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.

@graphite-app
Copy link
Contributor

graphite-app bot commented Jan 7, 2026

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.
@graphite-app graphite-app bot force-pushed the 01-07-fix_inline_dynamic_entry_to_user_defined_entry_with_esm_wrap_kind branch from e121e4e to 6d4272c Compare January 7, 2026 08:00
@graphite-app graphite-app bot merged commit 6d4272c into main Jan 7, 2026
35 checks passed
@graphite-app graphite-app bot deleted the 01-07-fix_inline_dynamic_entry_to_user_defined_entry_with_esm_wrap_kind branch January 7, 2026 08:10
@github-actions
Copy link
Contributor

github-actions bot commented Jan 7, 2026

Benchmarks Rust

  • target: main(71d8ce0)
  • pr: 01-07-fix_inline_dynamic_entry_to_user_defined_entry_with_esm_wrap_kind(6d4272c)
group                                                        pr                                     target
-----                                                        --                                     ------
bundle/bundle@multi-duplicated-top-level-symbol              1.00     60.5±1.12ms        ? ?/sec    1.02     61.6±1.15ms        ? ?/sec
bundle/bundle@multi-duplicated-top-level-symbol-sourcemap    1.00     66.8±1.14ms        ? ?/sec    1.01     67.6±1.16ms        ? ?/sec
bundle/bundle@rome_ts                                        1.00    104.1±2.86ms        ? ?/sec    1.00    103.8±2.07ms        ? ?/sec
bundle/bundle@rome_ts-sourcemap                              1.00    115.3±2.16ms        ? ?/sec    1.00    114.9±1.55ms        ? ?/sec
bundle/bundle@threejs                                        1.01     36.7±2.10ms        ? ?/sec    1.00     36.2±0.52ms        ? ?/sec
bundle/bundle@threejs-sourcemap                              1.00     41.4±0.88ms        ? ?/sec    1.00     41.4±0.54ms        ? ?/sec
bundle/bundle@threejs10x                                     1.00    376.6±2.09ms        ? ?/sec    1.00    377.6±5.88ms        ? ?/sec
bundle/bundle@threejs10x-sourcemap                           1.00    437.4±3.48ms        ? ?/sec    1.00    439.3±3.83ms        ? ?/sec
scan/scan@rome_ts                                            1.03     83.4±4.15ms        ? ?/sec    1.00     81.1±1.39ms        ? ?/sec
scan/scan@threejs                                            1.01     27.2±0.33ms        ? ?/sec    1.00     27.0±0.30ms        ? ?/sec
scan/scan@threejs10x                                         1.02    285.3±4.31ms        ? ?/sec    1.00    280.1±4.52ms        ? ?/sec

@github-actions github-actions bot mentioned this pull request Jan 7, 2026
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]>
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.

2 participants