fix(vitest): correctly send console events when state changes

vitest-dev · Mar 28, 2024 · 3463f9b · 3463f9b
1 parent 7e91781
commit 3463f9b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/packages/vitest/src/runtime/console.ts b/packages/vitest/src/runtime/console.ts
@@ -3,7 +3,7 @@ import { Console } from 'node:console'
 import { relative } from 'node:path'
 import { getColors, getSafeTimers } from '@vitest/utils'
 import { RealDate } from '../integrations/mock/date'
-import type { WorkerGlobalState } from '../types'
+import { getWorkerState } from '../utils'
 
 export const UNKNOWN_TEST_ID = '__vitest__unknown_test__'
 
@@ -27,13 +27,15 @@ function getTaskIdByStack(root: string) {
   return UNKNOWN_TEST_ID
 }
 
-export function createCustomConsole(state: WorkerGlobalState) {
+export function createCustomConsole() {
   const stdoutBuffer = new Map<string, any[]>()
   const stderrBuffer = new Map<string, any[]>()
   const timers = new Map<string, { stdoutTime: number; stderrTime: number; timer: any }>()
 
   const { setTimeout, clearTimeout } = getSafeTimers()
 
+  const state = () => getWorkerState()
+
   // group sync console.log calls with macro task
   function schedule(taskId: string) {
     const timer = timers.get(taskId)!
@@ -56,7 +58,7 @@ export function createCustomConsole(state: WorkerGlobalState) {
       return
     const content = buffer.map(i => String(i)).join('')
     const timer = timers.get(taskId)!
-    state.rpc.onUserConsoleLog({
+    state().rpc.onUserConsoleLog({
       type: 'stdout',
       content: content || '<empty line>',
       taskId,
@@ -72,7 +74,7 @@ export function createCustomConsole(state: WorkerGlobalState) {
       return
     const content = buffer.map(i => String(i)).join('')
     const timer = timers.get(taskId)!
-    state.rpc.onUserConsoleLog({
+    state().rpc.onUserConsoleLog({
       type: 'stderr',
       content: content || '<empty line>',
       taskId,
@@ -85,7 +87,8 @@ export function createCustomConsole(state: WorkerGlobalState) {
 
   const stdout = new Writable({
     write(data, encoding, callback) {
-      const id = state?.current?.id || state?.current?.file?.id || getTaskIdByStack(state.ctx.config.root)
+      const s = state()
+      const id = s?.current?.id || s?.current?.file?.id || getTaskIdByStack(s.config.root)
       let timer = timers.get(id)
       if (timer) {
         timer.stdoutTime = timer.stdoutTime || RealDate.now()
@@ -106,7 +109,8 @@ export function createCustomConsole(state: WorkerGlobalState) {
   })
   const stderr = new Writable({
     write(data, encoding, callback) {
-      const id = state?.current?.id || state?.current?.file?.id || getTaskIdByStack(state.ctx.config.root)
+      const s = state()
+      const id = s?.current?.id || s?.current?.file?.id || getTaskIdByStack(s.config.root)
       let timer = timers.get(id)
       if (timer) {
         timer.stderrTime = timer.stderrTime || RealDate.now()

diff --git a/packages/vitest/src/runtime/setup-node.ts b/packages/vitest/src/runtime/setup-node.ts
@@ -4,7 +4,7 @@ import timers from 'node:timers'
 import { isatty } from 'node:tty'
 import { installSourcemapsSupport } from 'vite-node/source-map'
 import { createColors, setupColors } from '@vitest/utils'
-import type { EnvironmentOptions, ResolvedConfig, ResolvedTestEnvironment, WorkerGlobalState } from '../types'
+import type { EnvironmentOptions, ResolvedConfig, ResolvedTestEnvironment } from '../types'
 import { VitestSnapshotEnvironment } from '../integrations/snapshot/environments/node'
 import { getSafeTimers, getWorkerState } from '../utils'
 import * as VitestIndex from '../index'
@@ -56,13 +56,13 @@ export async function setupGlobalEnv(config: ResolvedConfig, { environment }: Re
   })
 
   if (!config.disableConsoleIntercept)
-    await setupConsoleLogSpy(state)
+    await setupConsoleLogSpy()
 }
 
-export async function setupConsoleLogSpy(state: WorkerGlobalState) {
+export async function setupConsoleLogSpy() {
   const { createCustomConsole } = await import('./console')
 
-  globalThis.console = createCustomConsole(state)
+  globalThis.console = createCustomConsole()
 }
 
 export async function withEnv(