feat(worker): always apply custom resolver conditions (#1934)

vitest-dev · Sep 4, 2022 · 58fe60b · 58fe60b
1 parent 5bfd3c9
commit 58fe60b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/vitest/src/node/pool.ts b/packages/vitest/src/node/pool.ts
@@ -31,7 +31,7 @@ export function createPool(ctx: Vitest): WorkerPool {
   const maxThreads = ctx.config.maxThreads ?? threadsCount
   const minThreads = ctx.config.minThreads ?? threadsCount
 
-  const conditions = ctx.server.config.resolve.conditions?.flatMap(c => ['-C', c])
+  const conditions = ctx.server.config.resolve.conditions?.flatMap(c => ['-C', c]) || []
 
   const options: TinypoolOptions = {
     filename: workerPath,
@@ -48,9 +48,9 @@ export function createPool(ctx: Vitest): WorkerPool {
           suppressLoaderWarningsPath,
           '--experimental-loader',
           loaderPath,
-          ...conditions || [],
+          ...conditions,
         ]
-      : [],
+      : conditions,
   }
 
   if (ctx.config.isolate) {