Skip to content

Comments

refactor: tweak resolve_user_defined_entries#7727

Merged
graphite-app[bot] merged 1 commit intomainfrom
01-01-refactor_tweak_resolve_user_defined_entries
Jan 1, 2026
Merged

refactor: tweak resolve_user_defined_entries#7727
graphite-app[bot] merged 1 commit intomainfrom
01-01-refactor_tweak_resolve_user_defined_entries

Conversation

@shulaoda
Copy link
Member

@shulaoda shulaoda commented Jan 1, 2026

Move resolve_user_defined_entries into ModuleLoader

Copy link
Member Author

shulaoda commented Jan 1, 2026


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 1, 2026

Deploy Preview for rolldown-rs canceled.

Name Link
🔨 Latest commit d992128
🔍 Latest deploy log https://app.netlify.com/projects/rolldown-rs/deploys/695600494513e500088f7e19

@shulaoda shulaoda changed the title refactor: tweak resolve_user_defined_entries refactor: tweak resolve_user_defined_entries Jan 1, 2026
@shulaoda shulaoda marked this pull request as ready for review January 1, 2026 04:49
Copilot AI review requested due to automatic review settings January 1, 2026 04:49
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 refactors resolve_user_defined_entries by moving it from scan_stage.rs into ModuleLoader as an instance method. This change improves code organization by co-locating the entry resolution logic with the module loading functionality.

Key Changes

  • Converted resolve_user_defined_entries from a standalone function to a method on ModuleLoader
  • Simplified the call site by using self to access fields instead of passing them as parameters
  • Added necessary import (join_all) to module_loader.rs and removed unused import from scan_stage.rs

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
crates/rolldown/src/stages/scan_stage.rs Removed the standalone resolve_user_defined_entries function and its usage, along with the now-unused import
crates/rolldown/src/module_loader/module_loader.rs Added resolve_user_defined_entries as a method on ModuleLoader with identical logic, simplified the call site, and added the join_all import

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@graphite-app
Copy link
Contributor

graphite-app bot commented Jan 1, 2026

Merge activity

Move `resolve_user_defined_entries` into `ModuleLoader`
@graphite-app graphite-app bot force-pushed the 01-01-refactor_tweak_resolve_user_defined_entries branch from 9396f72 to d992128 Compare January 1, 2026 05:04
@graphite-app graphite-app bot merged commit d992128 into main Jan 1, 2026
34 checks passed
@graphite-app graphite-app bot deleted the 01-01-refactor_tweak_resolve_user_defined_entries branch January 1, 2026 05:15
@github-actions
Copy link
Contributor

github-actions bot commented Jan 1, 2026

Benchmarks Rust

  • target: main(fe2fa69)
  • pr: 01-01-refactor_tweak_resolve_user_defined_entries(d992128)
group                                                        pr                                     target
-----                                                        --                                     ------
bundle/bundle@multi-duplicated-top-level-symbol              1.05     71.7±1.90ms        ? ?/sec    1.00     68.2±1.92ms        ? ?/sec
bundle/bundle@multi-duplicated-top-level-symbol-sourcemap    1.07     78.8±1.70ms        ? ?/sec    1.00     73.9±2.58ms        ? ?/sec
bundle/bundle@rome_ts                                        1.04    113.4±3.59ms        ? ?/sec    1.00    109.3±1.77ms        ? ?/sec
bundle/bundle@rome_ts-sourcemap                              1.03    126.4±2.21ms        ? ?/sec    1.00    122.7±2.25ms        ? ?/sec
bundle/bundle@threejs                                        1.03     41.0±0.97ms        ? ?/sec    1.00     39.8±0.81ms        ? ?/sec
bundle/bundle@threejs-sourcemap                              1.02     45.5±1.17ms        ? ?/sec    1.00     44.8±1.06ms        ? ?/sec
bundle/bundle@threejs10x                                     1.02    411.1±5.39ms        ? ?/sec    1.00    402.4±4.81ms        ? ?/sec
bundle/bundle@threejs10x-sourcemap                           1.02    474.7±4.85ms        ? ?/sec    1.00    464.0±5.19ms        ? ?/sec
scan/scan@rome_ts                                            1.01     88.0±1.93ms        ? ?/sec    1.00     86.9±2.40ms        ? ?/sec
scan/scan@threejs                                            1.03     30.1±1.74ms        ? ?/sec    1.00     29.3±0.60ms        ? ?/sec
scan/scan@threejs10x                                         1.01    304.5±4.77ms        ? ?/sec    1.00    300.6±4.29ms        ? ?/sec

This was referenced 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