Skip to content

Commit c922fa9

Browse files
authored
feat: use Vite 6 for old Vitest (#389)
1 parent 28b46df commit c922fa9

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

tests/waku.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,13 @@ export async function test(options: RunOptions) {
99
build: 'compile',
1010
beforeTest: 'pnpm playwright install chromium',
1111
test: 'test-vite-ecosystem-ci',
12+
overrides: {
13+
// It uses Vitest 3.2+ so we don't need to inject the overrides.
14+
// If we inject overrides, the following error happens due to how waku sets overrides for the test.
15+
//
16+
// npm error code EINVALIDTAGNAME
17+
// npm error Invalid tag name "<3.2.0>vite" of package "vitest@<3.2.0>vite": Tags may not have any characters that encodeURIComponent encodes.
18+
vitest: false,
19+
},
1220
})
1321
}

utils.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,11 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
286286
overrides.vite = options.release
287287
}
288288

289-
if (overrides.rollup !== false || overrides.esbuild === true) {
289+
if (
290+
overrides.rollup !== false ||
291+
overrides.esbuild === true ||
292+
overrides.vitest !== false
293+
) {
290294
const viteManifest = await pacote.manifest(`vite@${options.release}`, {
291295
retry: {
292296
// enable retry with same options with pnpm (https://pnpm.io/settings#fetchretries)
@@ -306,6 +310,11 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
306310
if (overrides.esbuild === true) {
307311
overrides.esbuild = viteManifest.dependencies!.esbuild
308312
}
313+
314+
// skip if `overrides.vitest` is `false`
315+
if (overrides.vitest !== false && agent === 'pnpm') {
316+
overrides['vitest@<3.2.0>vite'] = '^6.3.5'
317+
}
309318
}
310319
} else {
311320
overrides.vite ||= `${options.vitePath}/packages/vite`
@@ -330,6 +339,11 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
330339
overrides.esbuild = vitePackageInfo.dependencies.esbuild.version
331340
}
332341

342+
// skip if `overrides.vitest` is `false`
343+
if (overrides.vitest !== false && agent === 'pnpm') {
344+
overrides['vitest@<3.2.0>vite'] = '^6.3.5'
345+
}
346+
333347
// build and apply local overrides
334348
const localOverrides = await buildOverrides(pkg, options, overrides)
335349
cd(dir) // buildOverrides changed dir, change it back

0 commit comments

Comments
 (0)