Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tests/waku.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,13 @@ export async function test(options: RunOptions) {
build: 'compile',
beforeTest: 'pnpm playwright install chromium',
test: 'test-vite-ecosystem-ci',
overrides: {
// It uses Vitest 3.2+ so we don't need to inject the overrides.
// If we inject overrides, the following error happens due to how waku sets overrides for the test.
//
// npm error code EINVALIDTAGNAME
// 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.
vitest: false,
},
})
}
16 changes: 15 additions & 1 deletion utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,11 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
overrides.vite = options.release
}

if (overrides.rollup !== false || overrides.esbuild === true) {
if (
overrides.rollup !== false ||
overrides.esbuild === true ||
overrides.vitest !== false
) {
const viteManifest = await pacote.manifest(`vite@${options.release}`, {
retry: {
// enable retry with same options with pnpm (https://pnpm.io/settings#fetchretries)
Expand All @@ -306,6 +310,11 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
if (overrides.esbuild === true) {
overrides.esbuild = viteManifest.dependencies!.esbuild
}

// skip if `overrides.vitest` is `false`
if (overrides.vitest !== false && agent === 'pnpm') {
overrides['vitest@<3.2.0>vite'] = '^6.3.5'
}
}
} else {
overrides.vite ||= `${options.vitePath}/packages/vite`
Expand All @@ -330,6 +339,11 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
overrides.esbuild = vitePackageInfo.dependencies.esbuild.version
}

// skip if `overrides.vitest` is `false`
if (overrides.vitest !== false && agent === 'pnpm') {
overrides['vitest@<3.2.0>vite'] = '^6.3.5'
}

// build and apply local overrides
const localOverrides = await buildOverrides(pkg, options, overrides)
cd(dir) // buildOverrides changed dir, change it back
Expand Down