Merge branch 'main' into deps/upstream-update

Author: fengmk2

.github/workflows/upgrade-deps.yml

@@ -82,8 +82,9 @@ jobs:
             - Upgrade script: `./.github/scripts/upgrade-deps.ts`
             - Sync-remote tool: `pnpm tool sync-remote` (source in
               `packages/tools/src/sync-remote-deps.ts`) — clones rolldown/vite into the
-              working tree and merges their pnpm-workspace catalogs into the root
-              `pnpm-workspace.yaml`.
+              working tree, merges their pnpm-workspace catalogs into the root
+              `pnpm-workspace.yaml`, and syncs the root `Cargo.toml` oxc crate
+              versions to match `rolldown/Cargo.toml`.
             - Build-upstream action: `./.github/actions/build-upstream/action.yml`
             - Package manager: `pnpm`. Do NOT downgrade any dep — we want the latest.
 
@@ -105,7 +106,15 @@ jobs:
                then re-run `pnpm tool sync-remote` until it exits 0. Finish with
                `pnpm install --no-frozen-lockfile`.
             2. Re-run the steps in `./.github/actions/build-upstream/action.yml`; fix any
-               non-zero exits.
+               non-zero exits. If the Rust build fails inside a vendored `rolldown`
+               crate with an oxc API mismatch (e.g. `oxc_ast::template_element` taking
+               a different number of arguments, or any `oxc_*` type/signature error),
+               the root `Cargo.toml` oxc pins are out of sync with the bumped rolldown.
+               `pnpm tool sync-remote` should already reconcile them; if any `oxc_*`
+               entry in the root `Cargo.toml [workspace.dependencies]` still differs
+               from `rolldown/Cargo.toml`, bump it to match (the oxc same-version
+               family follows rolldown's umbrella `oxc` version), run `cargo update`,
+               and rebuild.
             3. If the rolldown hash changed, follow `.claude/agents/cargo-workspace-merger.md`
                to resync the workspace.
             4. Compare tsdown CLI options with `vp pack` and sync new/removed options per
@@ -182,6 +191,12 @@ jobs:
           pnpm dedupe
 
       - name: Format code
+        # `pnpm fmt` runs `vp fmt`, which loads the freshly built NAPI binding. When
+        # `build-upstream` fails (e.g. an upstream rolldown/oxc desync the in-workflow
+        # fixup could not resolve) the binding is never produced and `vp fmt` aborts.
+        # Keep going so the PR is still created with the broken state surfaced for review,
+        # matching the `continue-on-error` on the build steps above.
+        continue-on-error: true
         run: pnpm fmt
 
       - name: Enhance PR description with Claude

packages/tools/src/__tests__/sync-remote-deps.spec.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from '@voidzero-dev/vite-plus-test';
 import * as semver from 'semver';
 
-import { mergePnpmWorkspaces } from '../sync-remote-deps.ts';
+import { mergePnpmWorkspaces, syncCargoOxcVersions } from '../sync-remote-deps.ts';
 
 describe('mergePnpmWorkspaces() minimumReleaseAgeExclude', () => {
   test('drops versioned upstream entries already covered by a glob or bare pattern', () => {
@@ -80,3 +80,107 @@ describe('mergePnpmWorkspaces() minimumReleaseAgeExclude', () => {
     expect(result.minimumReleaseAgeExclude).toEqual(['@oxc-parser/*', 'oxc-parser']);
   });
 });
+
+// Reproduces the upstream-upgrade build break: when the bumped rolldown hash
+// pins a newer oxc release (e.g. 0.135.0 / oxc_index 5), the vendored rolldown
+// crates fail to compile against vp's stale `Cargo.toml` oxc pin (0.134.0). The
+// root `Cargo.toml` oxc versions must follow rolldown's `Cargo.toml`.
+describe('syncCargoOxcVersions()', () => {
+  const mainCargo = `[workspace]
+members = ["crates/*"]
+
+[workspace.dependencies]
+serde = "1"
+
+# oxc crates with the same version
+oxc = { version = "0.134.0", features = [
+  "ast_visit",
+  "transformer",
+] }
+oxc_allocator = { version = "0.134.0", features = ["pool"] }
+oxc_ast = "0.134.0"
+oxc_parser = "0.134.0"
+oxc_span = "0.134.0"
+oxc_traverse = "0.134.0"
+
+# oxc crates in their own repos
+oxc_index = { version = "4", features = ["rayon", "serde"] }
+oxc_resolver = { version = "11.21.0", features = ["yarn_pnp"] }
+oxc_sourcemap = "7"
+
+[profile.release]
+lto = true
+`;
+
+  const rolldownCargo = `[workspace]
+members = ["crates/*"]
+
+[workspace.dependencies]
+# oxc crates with the same version
+oxc = { version = "0.135.0", features = [
+  "ast_visit",
+  "transformer",
+] }
+oxc_allocator = { version = "0.135.0", features = ["pool"] }
+oxc_traverse = { version = "0.135.0" }
+
+# oxc crates in their own repos
+oxc_index = { version = "5", features = ["rayon", "serde"] }
+oxc_resolver = { version = "11.21.0", features = ["yarn_pnp"] }
+oxc_sourcemap = { version = "7" }
+`;
+
+  test('bumps the oxc same-version family and oxc_index to match rolldown', () => {
+    const { content, changes } = syncCargoOxcVersions(mainCargo, rolldownCargo);
+
+    // Same-version family follows rolldown's umbrella `oxc` version, including
+    // crates rolldown does not declare explicitly (oxc_ast/oxc_parser/oxc_span).
+    expect(content).toContain('oxc = { version = "0.135.0"');
+    expect(content).toContain('oxc_allocator = { version = "0.135.0"');
+    expect(content).toContain('oxc_ast = "0.135.0"');
+    expect(content).toContain('oxc_parser = "0.135.0"');
+    expect(content).toContain('oxc_span = "0.135.0"');
+    expect(content).toContain('oxc_traverse = "0.135.0"');
+    // Independently-versioned crate follows rolldown's own pin.
+    expect(content).toContain('oxc_index = { version = "5"');
+    // Unchanged crates stay put.
+    expect(content).toContain('oxc_resolver = { version = "11.21.0"');
+    expect(content).toContain('oxc_sourcemap = "7"');
+    // Features and unrelated entries are preserved.
+    expect(content).toContain('"ast_visit",');
+    expect(content).toContain('serde = "1"');
+
+    const changed = Object.fromEntries(changes.map((c) => [c.key, c.to]));
+    expect(changed).toMatchObject({
+      oxc: '0.135.0',
+      oxc_allocator: '0.135.0',
+      oxc_ast: '0.135.0',
+      oxc_parser: '0.135.0',
+      oxc_span: '0.135.0',
+      oxc_traverse: '0.135.0',
+      oxc_index: '5',
+    });
+    // No spurious changes for already-matching crates.
+    expect(changes.find((c) => c.key === 'oxc_resolver')).toBeUndefined();
+    expect(changes.find((c) => c.key === 'oxc_sourcemap')).toBeUndefined();
+  });
+
+  test('is a no-op when versions already match', () => {
+    const { content, changes } = syncCargoOxcVersions(mainCargo, mainCargo);
+    expect(content).toBe(mainCargo);
+    expect(changes).toEqual([]);
+  });
+
+  test('only rewrites entries inside [workspace.dependencies]', () => {
+    const withPatch = `${mainCargo}
+[patch.crates-io]
+# pinned override, must not be touched by the oxc sync
+oxc_ast = { git = "https://example.com/oxc", rev = "abc" }
+`;
+    const { content } = syncCargoOxcVersions(withPatch, rolldownCargo);
+    // The dependency entry is bumped...
+    expect(content).toContain('oxc_ast = "0.135.0"');
+    // ...but the [patch] git override is left intact.
+    expect(content).toContain('oxc_ast = { git = "https://example.com/oxc", rev = "abc" }');
+  });
+});

packages/tools/src/sync-remote-deps.ts

@@ -957,6 +957,10 @@ export async function syncRemote() {
 
   execCommand('pnpm install --no-frozen-lockfile', rootDir);
 
+  // Keep the root Cargo.toml oxc pins in lockstep with the vendored rolldown.
+  log('Syncing Cargo.toml oxc versions with rolldown...');
+  syncCargoOxcWithRolldown(rootDir);
+
   // Merge package.json exports
   log('Merging package.json exports...');