From 5a4533229ab0f854c2c258e97b45a0cc95f33a52 Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Date: Thu, 22 Jun 2023 10:47:59 +0200
Subject: [PATCH] chore: fix cached vite-node

---
 packages/vitest/src/runtime/execute.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/vitest/src/runtime/execute.ts b/packages/vitest/src/runtime/execute.ts
index 99ceeca27fee..ba094777c583 100644
--- a/packages/vitest/src/runtime/execute.ts
+++ b/packages/vitest/src/runtime/execute.ts
@@ -8,6 +8,7 @@ import { processError } from '@vitest/utils/error'
 import type { MockMap } from '../types/mocker'
 import type { ContextRPC, ContextTestEnvironment, ResolvedConfig, WorkerGlobalState } from '../types'
 import { distDir } from '../paths'
+import { getWorkerState } from '../utils/global'
 import { VitestMocker } from './mocker'
 import { ExternalModulesExecutor } from './external-executor'
 
@@ -60,7 +61,7 @@ export interface ContextExecutorOptions {
 export async function startVitestExecutor(ctx: ContextRPC, options: ContextExecutorOptions) {
   const { config } = ctx
 
-  const rpc = () => options.state.rpc
+  const rpc = () => getWorkerState().rpc
 
   const processExit = process.exit
 
@@ -87,17 +88,19 @@ export async function startVitestExecutor(ctx: ContextRPC, options: ContextExecu
 
   return await createVitestExecutor({
     fetchModule(id) {
-      return rpc().fetch(id, ctx.environment.name)
+      const state = getWorkerState()
+      return rpc().fetch(id, state.environment)
     },
     resolveId(id, importer) {
-      return rpc().resolveId(id, importer, ctx.environment.name)
+      const state = getWorkerState()
+      return rpc().resolveId(id, importer, state.environment)
     },
     moduleCache,
     mockMap,
-    interopDefault: config.deps.interopDefault,
-    moduleDirectories: config.deps.moduleDirectories,
-    root: config.root,
-    base: config.base,
+    get interopDefault() { return config.deps.interopDefault },
+    get moduleDirectories() { return config.deps.moduleDirectories },
+    get root() { return config.root },
+    get base() { return config.base },
     ...options,
   })
 }