Skip to content

fix(typecheck): handle re-runs outside tsc #8920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sheremet-va merged 1 commit into from
Nov 3, 2025
Merged

fix(typecheck): handle re-runs outside tsc #8920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/vitest/src/node/pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,11 @@ export function createPool(ctx: Vitest): ProcessPool {
runTests: (files, invalidates) => executeTests('run', files, invalidates),
collectTests: (files, invalidates) => executeTests('collect', files, invalidates),
async close() {
await Promise.all([pool.close(), browserPool?.close?.()])
await Promise.all([
pool.close(),
browserPool?.close?.(),
...ctx.projects.map(project => project.typechecker?.stop()),
])
},
}
}
Expand Down
14 changes: 11 additions & 3 deletions packages/vitest/src/node/pools/workers/typecheckWorker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ async function onMessage(message: WorkerRequest, project: TestProject): Promise<

case 'stop': {
await runPromise
await project.typechecker?.stop()
return { type: 'stopped', __vitest_worker_response__ }
}
}
Expand Down Expand Up @@ -221,8 +220,9 @@ function createRunner(vitest: Vitest) {

const files = specs.map(spec => spec.filepath)
const promise = createDefer<void>()

// check that watcher actually triggered rerun
const _p = new Promise<boolean>((resolve) => {
const triggered = await new Promise<boolean>((resolve) => {
const _i = setInterval(() => {
if (!project.typechecker || rerunTriggered.has(project)) {
resolve(true)
Expand All @@ -234,15 +234,23 @@ function createRunner(vitest: Vitest) {
clearInterval(_i)
}, 500).unref()
})
const triggered = await _p

// Re-run but wasn't triggered by tsc
if (promisesMap.has(project) && !triggered) {
return promisesMap.get(project)
}

if (project.typechecker && !triggered) {
const testFiles = project.typechecker.getTestFiles()

for (const file of testFiles) {
await vitest._testRun.enqueued(project, file)
}

await vitest._testRun.collected(project, testFiles)
await onParseEnd(project, project.typechecker.getResult())
}

promises.push(promise)
promisesMap.set(project, promise)
promises.push(startTypechecker(project, files))
Expand Down
Loading