chore: wait only not evaluated modules

vitest-dev · Nov 28, 2022 · a9ab9df · a9ab9df
1 parent 53e119e
commit a9ab9df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/packages/vite-node/src/client.ts b/packages/vite-node/src/client.ts
@@ -286,7 +286,7 @@ export class ViteNodeRunner {
       },
     })
 
-    Object.assign(mod, { code: transformed, exports })
+    Object.assign(mod, { code: transformed, exports, evaluated: false })
 
     const __filename = fileURLToPath(url)
     const moduleProxy = {
@@ -349,6 +349,8 @@ export class ViteNodeRunner {
 
     await fn(...Object.values(context))
 
+    mod.evaluated = true
+
     return exports
   }
 

diff --git a/packages/vite-node/src/types.ts b/packages/vite-node/src/types.ts
@@ -44,6 +44,7 @@ export type CreateHotContextFunction = (runner: ViteNodeRunner, url: string) =>
 export interface ModuleCache {
   promise?: Promise<any>
   exports?: any
+  evaluated?: boolean
   code?: string
   map?: RawSourceMap
   /**

diff --git a/packages/vitest/src/integrations/vi.ts b/packages/vitest/src/integrations/vi.ts
@@ -253,7 +253,7 @@ class VitestUtils {
     const state = getWorkerState()
     const promises: Promise<unknown>[] = []
     for (const mod of state.moduleCache.values()) {
-      if (mod.promise)
+      if (mod.promise && !mod.evaluated)
         promises.push(mod.promise)
     }
     if (!promises.length)