Merge branch 'main' into copilot/fix-e2e-test-scheduled-run

fengmk2 · web-flow · commit 944156f70cc4 · 2026-04-16T15:50:35.000+08:00
diff --git a/packages/cli/snap-tests-global/runtime-with-incompatible-env-node/snap.txt b/packages/cli/snap-tests-global/runtime-with-incompatible-env-node/snap.txt
@@ -1,6 +1,4 @@
 > vp env use 20.0.0
-Using Node.js v<semver> (resolved from <semver>)
-
 [1]> vp exec node --version
 VITE+ - The Unified Toolchain for the Web
 
diff --git a/packages/cli/snap-tests-global/runtime-with-incompatible-env-node/steps.json b/packages/cli/snap-tests-global/runtime-with-incompatible-env-node/steps.json
@@ -1,6 +1,6 @@
 {
   "serial": true,
   "ignoredPlatforms": ["win32"],
-  "commands": ["vp env use 20.0.0", "vp exec node --version"],
+  "commands": [{ "command": "vp env use 20.0.0", "ignoreOutput": true }, "vp exec node --version"],
   "after": ["vp env use --unset"]
 }
diff --git a/packages/cli/snap-tests-global/runtime-with-incompatible-global-node/snap.txt b/packages/cli/snap-tests-global/runtime-with-incompatible-global-node/snap.txt
@@ -1,8 +1,4 @@
 > vp env default 20.0.0
-VITE+ - The Unified Toolchain for the Web
-
-✓ Default Node.js version set to <semver>
-
 [1]> vp migrate --yes
 error: Node.js <semver> is incompatible with Vite+ CLI.
 Required by Vite+: ^20.19.0 || >=22.12.0
diff --git a/packages/cli/snap-tests-global/runtime-with-incompatible-global-node/steps.json b/packages/cli/snap-tests-global/runtime-with-incompatible-global-node/steps.json
@@ -1,6 +1,6 @@
 {
   "serial": true,
   "env": {},
-  "commands": ["vp env default 20.0.0", "vp migrate --yes"],
+  "commands": [{ "command": "vp env default 20.0.0", "ignoreOutput": true }, "vp migrate --yes"],
   "after": ["vp env default lts"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -84,7 +84,7 @@ catalog:
   oxc-transform: =0.124.0
   oxfmt: =0.45.0
   oxlint: =1.60.0
-  oxlint-tsgolint: =0.20.0
+  oxlint-tsgolint: =0.21.0
   pathe: ^2.0.3
   picocolors: ^1.1.1
   picomatch: ^4.0.2

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"serial": true,`
`3`	`3`	`"ignoredPlatforms": ["win32"],`
`4`		`- "commands": ["vp env use 20.0.0", "vp exec node --version"],`
	`4`	`+ "commands": [{ "command": "vp env use 20.0.0", "ignoreOutput": true }, "vp exec node --version"],`
`5`	`5`	`"after": ["vp env use --unset"]`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"serial": true,`
`3`	`3`	`"env": {},`
`4`		`- "commands": ["vp env default 20.0.0", "vp migrate --yes"],`
	`4`	`+ "commands": [{ "command": "vp env default 20.0.0", "ignoreOutput": true }, "vp migrate --yes"],`
`5`	`5`	`"after": ["vp env default lts"]`
`6`	`6`	`}`