chore: merge main into pm selection isolation

Author: liangmiQwQ

.github/workflows/ci.yml

@@ -924,15 +924,17 @@ jobs:
   # flavors on Linux and macOS: the local flavor uses the packages/cli build
   # from this job, the global flavor reuses the installed release binary via
   # VP_SNAP_GLOBAL_VP (no vp_global_cli compile; build-upstream builds or
-  # cache-restores it). One leg per OS: the suite is not sharded. Windows
-  # runs in cli-snapshot-test-windows via the cross-compiled archive.
+  # cache-restores it). Three shards per OS split the trials across runners.
+  # Windows runs in cli-snapshot-test-windows via the cross-compiled archive.
   cli-snapshot-test:
-    name: CLI snapshot test (${{ matrix.target }})
+    name: CLI snapshot test (${{ matrix.target }}, shard ${{ matrix.shard }}/3)
     needs:
       - download-previous-rolldown-binaries
     strategy:
       fail-fast: false
       matrix:
+        os: [namespace-profile-linux-x64-default, namespace-profile-mac-default]
+        shard: [1, 2, 3]
         include:
           - os: namespace-profile-linux-x64-default
             target: x86_64-unknown-linux-gnu
@@ -1020,18 +1022,23 @@ jobs:
           cargo test -p vp_cli_snapshots
         env:
           RUST_BACKTRACE: '1'
+          VP_SNAP_SHARD: ${{ matrix.shard }}/3
 
   # Runs the PTY snapshot suite (crates/vp_cli_snapshots) on Windows with
   # BOTH vp flavors, without a Rust toolchain on the runner: the test binary
   # and vpt arrive cross-compiled in the nextest archive from
   # build-windows-tests, the global vp comes prebuilt from build-windows-cli,
   # and the JS CLI is built here (skip-native) for the local flavor.
   cli-snapshot-test-windows:
-    name: CLI snapshot test (Windows)
+    name: CLI snapshot test (Windows, shard ${{ matrix.shard }}/3)
     needs:
       - download-previous-rolldown-binaries
       - build-windows-cli
       - build-windows-tests
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2, 3]
     # Runs on the Namespace Windows runner. This is a PTY snapshot suite that
     # opens a pseudo-console (ConPTY) and spawns vp into it. It previously stayed
     # on GitHub-hosted windows-latest because Namespace's Windows runners ran
@@ -1129,7 +1136,7 @@ jobs:
           export VP_SNAP_PWSH_BIN="$(cygpath -w "$(command -v pwsh.exe)")"
           # --no-fail-fast: on a snapshot suite every diff is diagnostic
           # signal; cancelling on the first failure hides the rest.
-          cargo-nextest nextest run --archive-file windows-snapshot-tests.tar.zst --workspace-remap . --no-fail-fast
+          cargo-nextest nextest run --archive-file windows-snapshot-tests.tar.zst --workspace-remap . --no-fail-fast --partition hash:${{ matrix.shard }}/3
         env:
           RUST_BACKTRACE: '1'
           # Keep Windows env parity with the `test` recipe in justfile.

crates/vp_cli_snapshots/tests/cli_snapshots/README.md

@@ -56,6 +56,12 @@ cases). Prerequisites: both flavors need `cargo build -p vp_global_cli`
 older than `src`, so a forgotten rebuild never silently tests stale
 local-CLI code.
 
+CI runs three shards per platform. Linux and macOS use `VP_SNAP_SHARD=1/3`
+(then `2/3` and `3/3`) to distribute the ordered trials round-robin. Sharding
+happens before name filtering, so filtered runs keep the same assignment.
+Leave the variable unset to run the whole suite. Windows uses the existing
+nextest runner with `--partition hash:1/3` (then `2/3` and `3/3`).
+
 Environment overrides, mainly for CI:
 
 | Variable                    | Effect                                                              |

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_upgrade_parent_workspace/home/apps-ts/kami/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "kami",
+  "private": true,
+  "devDependencies": {
+    "typescript": "~6.0.2",
+    "vite": "catalog:",
+    "vite-plus": "catalog:"
+  }
+}

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_upgrade_parent_workspace/home/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "home-workspace",
+  "private": true,
+  "dependencies": {
+    "kami": "workspace:*"
+  },
+  "devEngines": {
+    "packageManager": {
+      "name": "pnpm",
+      "version": "11.25.0"
+    }
+  }
+}

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_upgrade_parent_workspace/home/pnpm-lock.yaml

@@ -0,0 +1,5 @@
+packages:
+  - apps-ts/*
+catalog:
+  vite: 8.2.2
+  vite-plus: 0.3.1

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_upgrade_parent_workspace/home/pnpm-workspace.yaml

@@ -0,0 +1,15 @@
+import { existsSync, mkdirSync, realpathSync, symlinkSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+
+const installDir = path.resolve('home/.vite-plus');
+mkdirSync(installDir, { recursive: true });
+
+// Reuse the runner's managed runtime in the installation under the parent workspace.
+const runtime = path.join(process.env.VP_HOME, 'js_runtime');
+if (existsSync(runtime)) {
+  symlinkSync(realpathSync(runtime), path.join(installDir, 'js_runtime'), 'junction');
+}
+
+if (process.argv.includes('--valid-lockfile')) {
+  writeFileSync('home/apps-ts/kami/package.json', '{"name":"kami","private":true}\n');
+}

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_upgrade_parent_workspace/setup.mjs

@@ -0,0 +1,26 @@
+[[case]]
+name = "command_upgrade_parent_workspace_stale_lockfile"
+vp = "global"
+skip-platforms = ["windows"]
+comment = "Regression test for #2639: an upgrade invoked outside a parent pnpm workspace must not read its stale lockfile."
+steps = [
+  { argv = ["node", "setup.mjs"], snapshot = false },
+  # Pin the released payload so the test also runs when the checkout version is unpublished.
+  { argv = ["vp", "upgrade", "0.3.1", "--force"], envs = [["VP_HOME", "${workspace}/home/.vite-plus"]], timeout = 120000, snapshot = false },
+  { argv = ["vpt", "stat-file", "home/.vite-plus/current/node_modules/vite-plus/package.json", "--assert", "file"] },
+  { argv = ["vpt", "stat-file", "home/node_modules", "home/apps-ts/kami/node_modules", "--assert", "missing"] },
+  { argv = ["vpt", "print-file", "home/pnpm-lock.yaml"], comment = "The parent workspace lockfile is unchanged." },
+]
+
+[[case]]
+name = "command_upgrade_parent_workspace_valid_lockfile"
+vp = "global"
+skip-platforms = ["windows"]
+comment = "An upgrade must install its own dependencies even when the parent workspace lockfile is valid."
+steps = [
+  { argv = ["node", "setup.mjs", "--valid-lockfile"], snapshot = false },
+  { argv = ["vp", "upgrade", "0.3.1", "--force"], envs = [["VP_HOME", "${workspace}/home/.vite-plus"]], timeout = 120000, snapshot = false },
+  { argv = ["vpt", "stat-file", "home/.vite-plus/current/node_modules/vite-plus/package.json", "--assert", "file"] },
+  { argv = ["vpt", "stat-file", "home/node_modules", "home/apps-ts/kami/node_modules", "--assert", "missing"] },
+  { argv = ["vpt", "print-file", "home/pnpm-lock.yaml"], comment = "The parent workspace lockfile is unchanged." },
+]

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_upgrade_parent_workspace/snapshots.toml

@@ -0,0 +1,42 @@
+# command_upgrade_parent_workspace_stale_lockfile
+
+Regression test for #2639: an upgrade invoked outside a parent pnpm workspace must not read its stale lockfile.
+
+## `node setup.mjs`
+
+
+## `VP_HOME=${workspace}/home/.vite-plus vp upgrade 0.3.1 --force`
+
+
+## `vpt stat-file home/.vite-plus/current/node_modules/vite-plus/package.json --assert file`
+
+```
+home/.vite-plus/current/node_modules/vite-plus/package.json: file
+```
+
+## `vpt stat-file home/node_modules home/apps-ts/kami/node_modules --assert missing`
+
+```
+home/node_modules: missing
+home/apps-ts/kami/node_modules: missing
+```
+
+## `vpt print-file home/pnpm-lock.yaml`
+
+The parent workspace lockfile is unchanged.
+
+```
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+  .:
+    dependencies:
+      kami:
+        specifier: workspace:*
+        version: link:apps-ts/kami
+  apps-ts/kami: {}
+```

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_upgrade_parent_workspace/snapshots/command_upgrade_parent_workspace_stale_lockfile.md

@@ -0,0 +1,42 @@
+# command_upgrade_parent_workspace_valid_lockfile
+
+An upgrade must install its own dependencies even when the parent workspace lockfile is valid.
+
+## `node setup.mjs --valid-lockfile`
+
+
+## `VP_HOME=${workspace}/home/.vite-plus vp upgrade 0.3.1 --force`
+
+
+## `vpt stat-file home/.vite-plus/current/node_modules/vite-plus/package.json --assert file`
+
+```
+home/.vite-plus/current/node_modules/vite-plus/package.json: file
+```
+
+## `vpt stat-file home/node_modules home/apps-ts/kami/node_modules --assert missing`
+
+```
+home/node_modules: missing
+home/apps-ts/kami/node_modules: missing
+```
+
+## `vpt print-file home/pnpm-lock.yaml`
+
+The parent workspace lockfile is unchanged.
+
+```
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+  .:
+    dependencies:
+      kami:
+        specifier: workspace:*
+        version: link:apps-ts/kami
+  apps-ts/kami: {}
+```