Skip to content

refactor(deconflict): extract collect_chunk_scope_captured_names#10006

Merged
graphite-app[bot] merged 1 commit into
mainfrom
refactor/9882-extract-captured-names
Jun 29, 2026
Merged

refactor(deconflict): extract collect_chunk_scope_captured_names#10006
graphite-app[bot] merged 1 commit into
mainfrom
refactor/9882-extract-captured-names

Conversation

@IWANABETHATGUY

@IWANABETHATGUY IWANABETHATGUY commented Jun 29, 2026

Copy link
Copy Markdown
Member

Pure no-op refactor, split out of the #9882 follow-up work — stacked on #9921.

Extracts the inline "chunk-scope captured names" collection block out of deconflict_chunk_symbols into a dedicated collect_chunk_scope_captured_names helper. No behavior change.

Why

The follow-up fix #9970 adds wrapped-ESM namespace-object capture lines to this block, which pushes deconflict_chunk_symbols past clippy's too_many_lines (200) ceiling. Extracting the helper first keeps #9970 focused purely on the actual fix.

Changes

  • Move the captured-names collection into collect_chunk_scope_captured_names(chunk, link_output, format, &renamer) — verbatim logic, just relocated.

Tests

No new behavior → no new fixtures. Verified as a no-op: all topics/deconflict + issues/9882 snapshot tests pass unchanged.

IWANABETHATGUY commented Jun 29, 2026

Copy link
Copy Markdown
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.

@IWANABETHATGUY IWANABETHATGUY marked this pull request as draft June 29, 2026 04:11
@codspeed-hq

codspeed-hq Bot commented Jun 29, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 7 untouched benchmarks
⏩ 10 skipped benchmarks1


Comparing refactor/9882-extract-captured-names (a5f5037) with fix/9882-cjs-wrapped-esm-shadowing (c3968fa)

Open in CodSpeed

Footnotes

  1. 10 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@IWANABETHATGUY IWANABETHATGUY force-pushed the fix/9882-cjs-wrapped-esm-shadowing branch from c3968fa to c04f207 Compare June 29, 2026 05:24
@IWANABETHATGUY IWANABETHATGUY force-pushed the refactor/9882-extract-captured-names branch from a5f5037 to cfad266 Compare June 29, 2026 05:24
@IWANABETHATGUY IWANABETHATGUY force-pushed the fix/9882-cjs-wrapped-esm-shadowing branch from c04f207 to 239c39f Compare June 29, 2026 05:33
@IWANABETHATGUY IWANABETHATGUY force-pushed the refactor/9882-extract-captured-names branch from cfad266 to a5b2c80 Compare June 29, 2026 05:33
@IWANABETHATGUY IWANABETHATGUY marked this pull request as ready for review June 29, 2026 06:03

IWANABETHATGUY commented Jun 29, 2026

Copy link
Copy Markdown
Member Author

Merge activity

  • Jun 29, 6:03 AM UTC: The merge label 'graphite: merge-when-ready' was detected. This PR will be added to the Graphite merge queue once it meets the requirements.
  • Jun 29, 6:07 AM UTC: IWANABETHATGUY added this pull request to the Graphite merge queue.
  • Jun 29, 6:23 AM UTC: Merged by the Graphite merge queue.

)

Pure no-op refactor, split out of the #9882 follow-up work — **stacked on #9921**.

Extracts the inline "chunk-scope captured names" collection block out of `deconflict_chunk_symbols` into a dedicated `collect_chunk_scope_captured_names` helper. No behavior change.

### Why

The follow-up fix #9970 adds wrapped-ESM namespace-object capture lines to this block, which pushes `deconflict_chunk_symbols` past clippy's `too_many_lines` (200) ceiling. Extracting the helper first keeps #9970 focused purely on the actual fix.

### Changes

- Move the captured-names collection into `collect_chunk_scope_captured_names(chunk, link_output, format, &renamer)` — verbatim logic, just relocated.

### Tests

No new behavior → no new fixtures. Verified as a no-op: all `topics/deconflict` + `issues/9882` snapshot tests pass unchanged.
@graphite-app graphite-app Bot force-pushed the fix/9882-cjs-wrapped-esm-shadowing branch from 239c39f to 6345ddf Compare June 29, 2026 06:08
@graphite-app graphite-app Bot force-pushed the refactor/9882-extract-captured-names branch from a5b2c80 to 520d81e Compare June 29, 2026 06:08
Base automatically changed from fix/9882-cjs-wrapped-esm-shadowing to main June 29, 2026 06:12
@graphite-app graphite-app Bot merged commit 520d81e into main Jun 29, 2026
30 of 31 checks passed
@graphite-app graphite-app Bot deleted the refactor/9882-extract-captured-names branch June 29, 2026 06:23
@rolldown-guard rolldown-guard Bot mentioned this pull request Jul 1, 2026
shulaoda added a commit that referenced this pull request Jul 1, 2026
## [1.1.4] - 2026-07-01

### 🚀 Features

- disable `experimental.lazyBarrel` by default (#10071) by @shulaoda

### 🐛 Bug Fixes

- dev: disable lazy barrel in dev mode (#10060) by @shulaoda
- generate: keep full JSON interface under preserveModules namespa… (#10056) by @IWANABETHATGUY
- check finalize_other_specifiers in its own Debug attribute (#10032) by @shulaoda
- serialize the KeepAssign unused minify option as "keep_assign" (#10031) by @shulaoda
- keep fragments after the newline fragment in MagicString::last_line (#10023) by @shulaoda
- generate: undeclared JSON named exports under preserveModules (#10020) (#10027) by @IWANABETHATGUY
- deconflict: rename CJS-wrapped locals that shadow chunk-root bindings (#9921) by @IWANABETHATGUY
- rolldown: keep entry facade when a shared chunk holds another entry's module (#9997) by @hyf0
- treeshake: also bail JSON default split when the object escapes (#9996) by @IWANABETHATGUY
- don't classify await in a strict-mode function as top-level await (#9987) by @shulaoda
- avoid spurious leading newline in addon hooks (banner/footer/intro/outro) (#9989) by @shulaoda
- handle JSON default mutation bailouts (#9972) by @TheAlexLichter
- plugin: make lazy hook metadata enumerable (#9991) by @TheAlexLichter
- dev: make init errors in lazy-compiled modules catchable (#9981) by @h-a-n-a
- treeshake: keep computed-key side effects on namespace member access (#9986) by @shulaoda
- binding: validate replace plugin delimiters length instead of panicking (#9984) by @shulaoda
- reconstruct nested rest patterns in into_expression (#9980) by @IWANABETHATGUY
- reconstruct rest patterns as spread in into_expression (#9976) by @shulaoda
- preserve export keyword on multi-declarator exports under keepNames (#9974) by @shulaoda
- deterministically keep the shortest name for deduplicated assets (#9948) by @x1024
- treeshake: apply @__NO_SIDE_EFFECTS__ to cross-chunk namespace calls (#9960) by @IWANABETHATGUY

### 🚜 Refactor

- drop redundant program scope enter/leave in finalizer (#10049) by @shulaoda
- deconflict: extract collect_chunk_scope_captured_names (#10006) by @IWANABETHATGUY
- unify pre-scan multi-declarator split into one decision site (#9982) by @IWANABETHATGUY
- common: return bool from SymbolRef::is_not_reassigned (#9962) by @IWANABETHATGUY

### 📚 Documentation

- rolldown: remove outdated comment for removing parenthesized expression (#10062) by @Dunqing
- use GitHub-flavored alert for Etiquette note in contribution guide (#10012) by @IWANABETHATGUY
- replace: explain the delimiters left and right boundaries (#9985) by @shulaoda
- ast-mutation: remove stale Address Use section after pre-scan refactor (#9983) by @IWANABETHATGUY
- remove fathom (#9968) by @mdong1909
- contribution-guide: code-format main branch references (#9966) by @IWANABETHATGUY
- contribution-guide: fix stale REPL note and tidy wording (#9957) by @hyf0
- contribution-guide: clarify when to discuss before opening a PR (#9955) by @hyf0

### ⚡ Performance

- disable preserve_parens across all parse paths (#10057) by @Dunqing
- common: inline declared_symbols with SmallVec (#9920) by @IWANABETHATGUY
- common: pack TaggedSymbolRef into 8 bytes (#9919) by @IWANABETHATGUY
- sourcemap: skip newline scan on the no-sourcemap join fast path (#9936) by @Boshen

### 🧪 Testing

- dev: error in lazy module should be catchable (#9975) by @sapphi-red
- dev: reject unknown lazy compile modules (#9969) by @sapphi-red

### ⚙️ Miscellaneous Tasks

- deps: update actions/cache action to v6 (#10001) by @renovate[bot]
- trigger vite ecosystem-ci from PR comments (#10058) by @shulaoda
- deps: update napi to v3.10.0 (#10063) by @renovate[bot]
- remove unused From impl for RolldownLabelSpan (#10055) by @shulaoda
- remove dead Diagnostic::with_kind method (#10054) by @shulaoda
- remove unused StatementExt methods (#10053) by @shulaoda
- remove unused ExpressionExt methods (#10052) by @shulaoda
- remove commented-out re_export_all_names field (#10051) by @shulaoda
- deps: update pnpm to v11.9.0 (#10047) by @renovate[bot]
- remove the unused BindingGenerateHmrPatchReturn napi type (#10034) by @shulaoda
- remove the dead inline_entry_chunk_wrapping scaffolding (#10037) by @shulaoda
- deps: bump oxc_resolver to 11.22.0 (#10045) by @Boshen
- remove never-constructed MatchImportKind::_Ignore variant (#10041) by @shulaoda
- remove the unused ScheduledBuild napi struct (#10033) by @shulaoda
- remove dead compute_hmr_update_single method (#10040) by @shulaoda
- drop the redundant visited.insert in manual code splitting (#10038) by @shulaoda
- remove the dead output_assets vector in render_chunk_to_assets (#10036) by @shulaoda
- remove the unused From<String>/Display impls for BindingLogLevel (#10035) by @shulaoda
- deps: upgrade oxc to 0.138.0 and migrate to per-type AST construction (#10018) by @shulaoda
- deps: update rust crates (#9911) by @renovate[bot]
- deps: update test262 submodule for tests (#10016) by @rolldown-guard[bot]
- deps: update github actions (#9999) by @renovate[bot]
- deps: update npm packages (#10000) by @renovate[bot]

### ◀️ Revert

- "fix(plugin): make lazy hook metadata enumerable (#9991)" (#10005) by @shulaoda

### ❤️ New Contributors

* @x1024 made their first contribution in [#9948](#9948)

Co-authored-by: shulaoda <165626830+shulaoda@users.noreply.github.com>
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.

3 participants