Skip to content

Commit 607fdfc

Browse files
authored
Merge branch 'main' into codex/stabilize-flaky-tests
2 parents f2d3571 + a9c7034 commit 607fdfc

30 files changed

Lines changed: 377 additions & 77 deletions

File tree

.github/workflows/test-vp-create.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,13 @@ jobs:
195195
# `YN0016 ... are quarantined`. The migrate tool is version-pinned to the
196196
# bundled oxlint, so disable the gate for this test (no-op for npm/pnpm/bun).
197197
YARN_NPM_MINIMAL_AGE_GATE: '0'
198+
# pnpm 11's default `minimumReleaseAge` (~24h) makes the bundled vitest's
199+
# auto-installed `vite` peer resolve to the previous upstream release,
200+
# which can predate vite's `@voidzero-dev/vite-task-client` integration and
201+
# surface a false `vp test` cache miss in "Verify cache". Force 0 so the
202+
# latest vite (with the integration) is used. pnpm-only (no-op elsewhere).
203+
# Temporary band-aid; real fix tracked in voidzero-dev/vite-plus#1932.
204+
PNPM_CONFIG_MINIMUM_RELEASE_AGE: '0'
198205
steps:
199206
- uses: taiki-e/checkout-action@7d1e50e93dc4fb3bba58f85018fadf77898aee8b # v1.4.2
200207

Cargo.lock

Lines changed: 89 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ dunce = "1.0.5"
192192
fast-glob = "1.0.0"
193193
flate2 = { version = "=1.1.9", features = ["zlib-rs"] }
194194
form_urlencoded = "1.2.1"
195-
fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "5833b374c6edb05c2f2f8e133ff8c796b378472a" }
195+
fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "8daa9bb72faa89b745cb58c087b416b15d3bddc5" }
196196
futures = "0.3.31"
197197
futures-util = "0.3.31"
198198
glob = "0.3.2"
@@ -304,11 +304,11 @@ vite_pm_cli = { path = "crates/vite_pm_cli" }
304304
vite_setup = { path = "crates/vite_setup" }
305305
vite_shared = { path = "crates/vite_shared" }
306306
vite_static_config = { path = "crates/vite_static_config" }
307-
vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "5833b374c6edb05c2f2f8e133ff8c796b378472a" }
308-
vite_powershell = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "5833b374c6edb05c2f2f8e133ff8c796b378472a" }
309-
vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "5833b374c6edb05c2f2f8e133ff8c796b378472a" }
310-
vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "5833b374c6edb05c2f2f8e133ff8c796b378472a" }
311-
vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "5833b374c6edb05c2f2f8e133ff8c796b378472a" }
307+
vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "8daa9bb72faa89b745cb58c087b416b15d3bddc5" }
308+
vite_powershell = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "8daa9bb72faa89b745cb58c087b416b15d3bddc5" }
309+
vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "8daa9bb72faa89b745cb58c087b416b15d3bddc5" }
310+
vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "8daa9bb72faa89b745cb58c087b416b15d3bddc5" }
311+
vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "8daa9bb72faa89b745cb58c087b416b15d3bddc5" }
312312
walkdir = "2.5.0"
313313
wax = "0.6.0"
314314
which = "8.0.0"

0 commit comments

Comments
 (0)