vitest 1.0.4 → 1.1.1

package/dist/vendor/{node.vEetZgP7.js → node.d5m7SYoI.js}

@@ -39,12 +39,12 @@ import { isCI, provider as provider$1 } from 'std-env';
 import ge from 'module';
 import { ancestor, simple, findNodeAround } from 'acorn-walk';
 import { generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, getTasks, hasFailed } from '@vitest/runner/utils';
-import { R as ReportersMap, B as BenchmarkReportsMap, s as stripAnsi, a as ansiStyles, b as sliceAnsi, d as divider, F as F_POINTER, c as cliTruncate } from './reporters.r0gTYN3L.js';
+import { R as ReportersMap, B as BenchmarkReportsMap, s as stripAnsi, a as ansiStyles, b as sliceAnsi, d as divider, F as F_POINTER, c as cliTruncate } from './reporters.oUR9etwS.js';
 import crypto, { createHash } from 'node:crypto';
 import require$$0$3 from 'assert';
 import MagicString from 'magic-string';
 import { stripLiteral } from 'strip-literal';
-import { g as getEnvPackageName } from './environments.v4R4vGad.js';
+import { g as getEnvPackageName } from './environments.QJtma9XQ.js';
 import readline from 'node:readline';
 import require$$0$4 from 'readline';
 
@@ -63,7 +63,7 @@ function _mergeNamespaces(n, m) {
   return Object.freeze(n);
 }
 
-var version$1 = "1.0.4";
+var version$1 = "1.1.1";
 
 const __dirname$1 = url.fileURLToPath(new URL(".", import.meta.url));
 async function ensurePackageInstalled(dependency, root) {
@@ -3251,11 +3251,12 @@ function stringifyRegex(input) {
   return `$$vitest:${input.toString()}`;
 }
 function createChildProcessPool(ctx, { execArgv, env, forksPath }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a;
   const numCpus = typeof nodeos.availableParallelism === "function" ? nodeos.availableParallelism() : nodeos.cpus().length;
   const threadsCount = ctx.config.watch ? Math.max(Math.floor(numCpus / 2), 1) : Math.max(numCpus - 1, 1);
-  const maxThreads = ((_b = (_a = ctx.config.poolOptions) == null ? void 0 : _a.forks) == null ? void 0 : _b.maxForks) ?? threadsCount;
-  const minThreads = ((_d = (_c = ctx.config.poolOptions) == null ? void 0 : _c.forks) == null ? void 0 : _d.minForks) ?? threadsCount;
+  const poolOptions = ((_a = ctx.config.poolOptions) == null ? void 0 : _a.forks) ?? {};
+  const maxThreads = poolOptions.maxForks ?? ctx.config.maxWorkers ?? threadsCount;
+  const minThreads = poolOptions.minForks ?? ctx.config.minWorkers ?? threadsCount;
   const options = {
     runtime: "child_process",
     filename: forksPath,
@@ -3263,17 +3264,16 @@ function createChildProcessPool(ctx, { execArgv, env, forksPath }) {
     minThreads,
     env,
     execArgv: [
-      ...((_f = (_e = ctx.config.poolOptions) == null ? void 0 : _e.forks) == null ? void 0 : _f.execArgv) ?? [],
+      ...poolOptions.execArgv ?? [],
       ...execArgv
     ],
-    terminateTimeout: ctx.config.teardownTimeout
+    terminateTimeout: ctx.config.teardownTimeout,
+    concurrentTasksPerWorker: 1
   };
-  if (((_h = (_g = ctx.config.poolOptions) == null ? void 0 : _g.forks) == null ? void 0 : _h.isolate) ?? true) {
+  const isolated = poolOptions.isolate ?? true;
+  if (isolated)
     options.isolateWorkers = true;
-    options.concurrentTasksPerWorker = 1;
-  }
-  if ((_j = (_i = ctx.config.poolOptions) == null ? void 0 : _i.forks) == null ? void 0 : _j.singleFork) {
-    options.concurrentTasksPerWorker = 1;
+  if (poolOptions.singleFork || !ctx.config.fileParallelism) {
     options.maxThreads = 1;
     options.minThreads = 1;
   }
@@ -3299,7 +3299,7 @@ function createChildProcessPool(ctx, { execArgv, env, forksPath }) {
         if (error instanceof Error && /Failed to terminate worker/.test(error.message))
           ctx.state.addProcessTimeoutCause(`Failed to terminate worker while running ${files.join(", ")}.`);
         else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
-          ctx.state.cancelFiles(files, ctx.config.root, project.getName());
+          ctx.state.cancelFiles(files, ctx.config.root, project.config.name);
         else
           throw error;
       } finally {
@@ -3307,7 +3307,6 @@ function createChildProcessPool(ctx, { execArgv, env, forksPath }) {
       }
     }
     return async (specs, invalidates) => {
-      var _a2, _b2;
       ctx.onCancel(() => pool.cancelPendingTasks());
       const configs = /* @__PURE__ */ new Map();
       const getConfig = (project) => {
@@ -3329,18 +3328,18 @@ function createChildProcessPool(ctx, { execArgv, env, forksPath }) {
         workspaceMap.set(file, workspaceFiles);
       }
       const singleFork = specs.filter(([project]) => {
-        var _a3, _b3;
-        return (_b3 = (_a3 = project.config.poolOptions) == null ? void 0 : _a3.forks) == null ? void 0 : _b3.singleFork;
+        var _a2, _b;
+        return (_b = (_a2 = project.config.poolOptions) == null ? void 0 : _a2.forks) == null ? void 0 : _b.singleFork;
       });
       const multipleForks = specs.filter(([project]) => {
-        var _a3, _b3;
-        return !((_b3 = (_a3 = project.config.poolOptions) == null ? void 0 : _a3.forks) == null ? void 0 : _b3.singleFork);
+        var _a2, _b;
+        return !((_b = (_a2 = project.config.poolOptions) == null ? void 0 : _a2.forks) == null ? void 0 : _b.singleFork);
       });
       if (multipleForks.length) {
         const filesByEnv = await groupFilesByEnv(multipleForks);
         const files = Object.values(filesByEnv).flat();
         const results = [];
-        if (((_b2 = (_a2 = ctx.config.poolOptions) == null ? void 0 : _a2.forks) == null ? void 0 : _b2.isolate) ?? true) {
+        if (isolated) {
           results.push(...await Promise.allSettled(files.map(({ file, environment, project }) => runFiles(project, getConfig(project), [file], environment, invalidates))));
         } else {
           const grouped = groupBy(files, ({ project, environment }) => project.getName() + environment.name + JSON.stringify(environment.options));
@@ -3402,31 +3401,31 @@ function createWorkerChannel$1(project) {
   return { workerPort, port };
 }
 function createThreadsPool(ctx, { execArgv, env, workerPath }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a;
   const numCpus = typeof nodeos.availableParallelism === "function" ? nodeos.availableParallelism() : nodeos.cpus().length;
   const threadsCount = ctx.config.watch ? Math.max(Math.floor(numCpus / 2), 1) : Math.max(numCpus - 1, 1);
-  const maxThreads = ((_b = (_a = ctx.config.poolOptions) == null ? void 0 : _a.threads) == null ? void 0 : _b.maxThreads) ?? threadsCount;
-  const minThreads = ((_d = (_c = ctx.config.poolOptions) == null ? void 0 : _c.threads) == null ? void 0 : _d.minThreads) ?? threadsCount;
+  const poolOptions = ((_a = ctx.config.poolOptions) == null ? void 0 : _a.threads) ?? {};
+  const maxThreads = poolOptions.maxThreads ?? ctx.config.maxWorkers ?? threadsCount;
+  const minThreads = poolOptions.minThreads ?? ctx.config.minWorkers ?? threadsCount;
   const options = {
     filename: workerPath,
     // TODO: investigate further
     // It seems atomics introduced V8 Fatal Error https://github.com/vitest-dev/vitest/issues/1191
-    useAtomics: ((_f = (_e = ctx.config.poolOptions) == null ? void 0 : _e.threads) == null ? void 0 : _f.useAtomics) ?? false,
+    useAtomics: poolOptions.useAtomics ?? false,
     maxThreads,
     minThreads,
     env,
     execArgv: [
-      ...((_h = (_g = ctx.config.poolOptions) == null ? void 0 : _g.threads) == null ? void 0 : _h.execArgv) ?? [],
+      ...poolOptions.execArgv ?? [],
       ...execArgv
     ],
-    terminateTimeout: ctx.config.teardownTimeout
+    terminateTimeout: ctx.config.teardownTimeout,
+    concurrentTasksPerWorker: 1
   };
-  if (((_j = (_i = ctx.config.poolOptions) == null ? void 0 : _i.threads) == null ? void 0 : _j.isolate) ?? true) {
+  const isolated = poolOptions.isolate ?? true;
+  if (isolated)
     options.isolateWorkers = true;
-    options.concurrentTasksPerWorker = 1;
-  }
-  if ((_l = (_k = ctx.config.poolOptions) == null ? void 0 : _k.threads) == null ? void 0 : _l.singleThread) {
-    options.concurrentTasksPerWorker = 1;
+  if (poolOptions.singleThread || !ctx.config.fileParallelism) {
     options.maxThreads = 1;
     options.minThreads = 1;
   }
@@ -3453,7 +3452,7 @@ function createThreadsPool(ctx, { execArgv, env, workerPath }) {
         if (error instanceof Error && /Failed to terminate worker/.test(error.message))
           ctx.state.addProcessTimeoutCause(`Failed to terminate worker while running ${files.join(", ")}.`);
         else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
-          ctx.state.cancelFiles(files, ctx.config.root, project.getName());
+          ctx.state.cancelFiles(files, ctx.config.root, project.config.name);
         else
           throw error;
       } finally {
@@ -3462,7 +3461,6 @@ function createThreadsPool(ctx, { execArgv, env, workerPath }) {
       }
     }
     return async (specs, invalidates) => {
-      var _a2, _b2;
       ctx.onCancel(() => pool.cancelPendingTasks());
       const configs = /* @__PURE__ */ new Map();
       const getConfig = (project) => {
@@ -3479,18 +3477,18 @@ function createThreadsPool(ctx, { execArgv, env, workerPath }) {
         workspaceMap.set(file, workspaceFiles);
       }
       const singleThreads = specs.filter(([project]) => {
-        var _a3, _b3;
-        return (_b3 = (_a3 = project.config.poolOptions) == null ? void 0 : _a3.threads) == null ? void 0 : _b3.singleThread;
+        var _a2, _b;
+        return (_b = (_a2 = project.config.poolOptions) == null ? void 0 : _a2.threads) == null ? void 0 : _b.singleThread;
       });
       const multipleThreads = specs.filter(([project]) => {
-        var _a3, _b3;
-        return !((_b3 = (_a3 = project.config.poolOptions) == null ? void 0 : _a3.threads) == null ? void 0 : _b3.singleThread);
+        var _a2, _b;
+        return !((_b = (_a2 = project.config.poolOptions) == null ? void 0 : _a2.threads) == null ? void 0 : _b.singleThread);
       });
       if (multipleThreads.length) {
         const filesByEnv = await groupFilesByEnv(multipleThreads);
         const files = Object.values(filesByEnv).flat();
         const results = [];
-        if (((_b2 = (_a2 = ctx.config.poolOptions) == null ? void 0 : _a2.threads) == null ? void 0 : _b2.isolate) ?? true) {
+        if (isolated) {
           results.push(...await Promise.allSettled(files.map(({ file, environment, project }) => runFiles(project, getConfig(project), [file], environment, invalidates))));
         } else {
           const grouped = groupBy(files, ({ project, environment }) => project.getName() + environment.name + JSON.stringify(environment.options));
@@ -3568,7 +3566,7 @@ function createBrowserPool(ctx) {
     if (project.config.browser.isolate) {
       for (const path of paths) {
         if (isCancelled) {
-          ctx.state.cancelFiles(files.slice(paths.indexOf(path)), ctx.config.root, project.getName());
+          ctx.state.cancelFiles(files.slice(paths.indexOf(path)), ctx.config.root, project.config.name);
           break;
         }
         const url = new URL("/", origin);
@@ -3690,16 +3688,17 @@ function createWorkerChannel(project) {
   return { workerPort, port };
 }
 function createVmThreadsPool(ctx, { execArgv, env, vmPath }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a;
   const numCpus = typeof nodeos.availableParallelism === "function" ? nodeos.availableParallelism() : nodeos.cpus().length;
   const threadsCount = ctx.config.watch ? Math.max(Math.floor(numCpus / 2), 1) : Math.max(numCpus - 1, 1);
-  const maxThreads = ((_b = (_a = ctx.config.poolOptions) == null ? void 0 : _a.vmThreads) == null ? void 0 : _b.maxThreads) ?? threadsCount;
-  const minThreads = ((_d = (_c = ctx.config.poolOptions) == null ? void 0 : _c.vmThreads) == null ? void 0 : _d.minThreads) ?? threadsCount;
+  const poolOptions = ((_a = ctx.config.poolOptions) == null ? void 0 : _a.vmThreads) ?? {};
+  const maxThreads = poolOptions.maxThreads ?? ctx.config.maxWorkers ?? threadsCount;
+  const minThreads = poolOptions.minThreads ?? ctx.config.minWorkers ?? threadsCount;
   const options = {
     filename: vmPath,
     // TODO: investigate further
     // It seems atomics introduced V8 Fatal Error https://github.com/vitest-dev/vitest/issues/1191
-    useAtomics: ((_f = (_e = ctx.config.poolOptions) == null ? void 0 : _e.vmThreads) == null ? void 0 : _f.useAtomics) ?? false,
+    useAtomics: poolOptions.useAtomics ?? false,
     maxThreads,
     minThreads,
     env,
@@ -3708,14 +3707,14 @@ function createVmThreadsPool(ctx, { execArgv, env, vmPath }) {
       "--experimental-vm-modules",
       "--require",
       suppressWarningsPath,
-      ...((_h = (_g = ctx.config.poolOptions) == null ? void 0 : _g.vmThreads) == null ? void 0 : _h.execArgv) ?? [],
+      ...poolOptions.execArgv ?? [],
       ...execArgv
     ],
     terminateTimeout: ctx.config.teardownTimeout,
+    concurrentTasksPerWorker: 1,
     maxMemoryLimitBeforeRecycle: getMemoryLimit(ctx.config) || void 0
   };
-  if ((_j = (_i = ctx.config.poolOptions) == null ? void 0 : _i.vmThreads) == null ? void 0 : _j.singleThread) {
-    options.concurrentTasksPerWorker = 1;
+  if (poolOptions.singleThread || !ctx.config.fileParallelism) {
     options.maxThreads = 1;
     options.minThreads = 1;
   }
@@ -3742,7 +3741,7 @@ function createVmThreadsPool(ctx, { execArgv, env, vmPath }) {
         if (error instanceof Error && /Failed to terminate worker/.test(error.message))
           ctx.state.addProcessTimeoutCause(`Failed to terminate worker while running ${files.join(", ")}.`);
         else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
-          ctx.state.cancelFiles(files, ctx.config.root, project.getName());
+          ctx.state.cancelFiles(files, ctx.config.root, project.config.name);
         else
           throw error;
       } finally {
@@ -3751,6 +3750,7 @@ function createVmThreadsPool(ctx, { execArgv, env, vmPath }) {
       }
     }
     return async (specs, invalidates) => {
+      ctx.onCancel(() => pool.cancelPendingTasks());
       const configs = /* @__PURE__ */ new Map();
       const getConfig = (project) => {
         if (configs.has(project))
@@ -4351,7 +4351,7 @@ function createTypecheckPool(ctx) {
         setTimeout(() => {
           resolve(false);
           clearInterval(_i);
-        }, 500);
+        }, 500).unref();
       });
       const triggered = await _p;
       if (project.typechecker && !triggered) {
@@ -4750,6 +4750,7 @@ const fakeTimersDefaults = {
 };
 const config = {
   allowOnly: !isCI,
+  isolate: true,
   watch: !isCI,
   globals: false,
   environment: "node",
@@ -4978,6 +4979,11 @@ const extraInlineDeps = [
   // Nuxt
   "@nuxt/test-utils"
 ];
+function resolvePath(path, root) {
+  return normalize(
+    resolveModule(path, { paths: [root] }) ?? resolve(root, path)
+  );
+}
 function resolveApiServerConfig(options) {
   let api;
   if (options.ui && !options.api)
@@ -5040,12 +5046,17 @@ function resolveConfig(mode, options, viteConfig) {
       throw new Error("--shard <index> must be a positive number less then <count>");
     resolved.shard = { index, count };
   }
+  resolved.fileParallelism ?? (resolved.fileParallelism = true);
+  if (!resolved.fileParallelism) {
+    resolved.maxWorkers = 1;
+    resolved.minWorkers = 1;
+  }
   if (resolved.inspect || resolved.inspectBrk) {
     const isSingleThread = resolved.pool === "threads" && ((_c = (_b = resolved.poolOptions) == null ? void 0 : _b.threads) == null ? void 0 : _c.singleThread);
     const isSingleFork = resolved.pool === "forks" && ((_e = (_d = resolved.poolOptions) == null ? void 0 : _d.forks) == null ? void 0 : _e.singleFork);
-    if (!isSingleThread && !isSingleFork) {
+    if (resolved.fileParallelism && !isSingleThread && !isSingleFork) {
       const inspectOption = `--inspect${resolved.inspectBrk ? "-brk" : ""}`;
-      throw new Error(`You cannot use ${inspectOption} without "poolOptions.threads.singleThread" or "poolOptions.forks.singleFork"`);
+      throw new Error(`You cannot use ${inspectOption} without "--no-file-parallelism", "poolOptions.threads.singleThread" or "poolOptions.forks.singleFork"`);
     }
   }
   if (resolved.coverage.provider === "c8")
@@ -5091,6 +5102,8 @@ function resolveConfig(mode, options, viteConfig) {
     if (resolved.server.deps[option] === void 0)
       resolved.server.deps[option] = resolved.deps[option];
   });
+  if (resolved.cliExclude)
+    resolved.exclude.push(...resolved.cliExclude);
   if (resolved.server.deps.inline !== true) {
     const ssrOptions = viteConfig.ssr;
     if ((ssrOptions == null ? void 0 : ssrOptions.noExternal) === true && resolved.server.deps.inline == null) {
@@ -5102,9 +5115,8 @@ function resolveConfig(mode, options, viteConfig) {
   }
   (_r = resolved.server.deps).moduleDirectories ?? (_r.moduleDirectories = []);
   resolved.server.deps.moduleDirectories.push(...resolved.deps.moduleDirectories);
-  if (resolved.runner) {
-    resolved.runner = resolveModule(resolved.runner, { paths: [resolved.root] }) ?? resolve(resolved.root, resolved.runner);
-  }
+  if (resolved.runner)
+    resolved.runner = resolvePath(resolved.runner, resolved.root);
   resolved.testNamePattern = resolved.testNamePattern ? resolved.testNamePattern instanceof RegExp ? resolved.testNamePattern : new RegExp(resolved.testNamePattern) : void 0;
   if (resolved.snapshotFormat && "plugins" in resolved.snapshotFormat)
     resolved.snapshotFormat.plugins = [];
@@ -5164,17 +5176,14 @@ function resolveConfig(mode, options, viteConfig) {
       }
     };
   }
-  if (!builtinPools.includes(resolved.pool)) {
-    resolved.pool = normalize(
-      resolveModule(resolved.pool, { paths: [resolved.root] }) ?? resolve(resolved.root, resolved.pool)
-    );
+  if (resolved.workspace) {
+    resolved.workspace = options.workspace && options.workspace[0] === "." ? resolve(process.cwd(), options.workspace) : resolvePath(resolved.workspace, resolved.root);
   }
+  if (!builtinPools.includes(resolved.pool))
+    resolved.pool = resolvePath(resolved.pool, resolved.root);
   resolved.poolMatchGlobs = (resolved.poolMatchGlobs || []).map(([glob, pool]) => {
-    if (!builtinPools.includes(pool)) {
-      pool = normalize(
-        resolveModule(pool, { paths: [resolved.root] }) ?? resolve(resolved.root, pool)
-      );
-    }
+    if (!builtinPools.includes(pool))
+      pool = resolvePath(pool, resolved.root);
     return [glob, pool];
   });
   if (mode === "benchmark") {
@@ -5199,14 +5208,10 @@ function resolveConfig(mode, options, viteConfig) {
       resolved.benchmark.outputFile = options.outputFile;
   }
   resolved.setupFiles = toArray(resolved.setupFiles || []).map(
-    (file) => normalize(
-      resolveModule(file, { paths: [resolved.root] }) ?? resolve(resolved.root, file)
-    )
+    (file) => resolvePath(file, resolved.root)
   );
   resolved.globalSetup = toArray(resolved.globalSetup || []).map(
-    (file) => normalize(
-      resolveModule(file, { paths: [resolved.root] }) ?? resolve(resolved.root, file)
-    )
+    (file) => resolvePath(file, resolved.root)
   );
   resolved.coverage.exclude.push(...resolved.setupFiles.map((file) => `${resolved.coverage.allowExternal ? "**/" : ""}${relative(resolved.root, file)}`));
   resolved.forceRerunTriggers = [
@@ -5214,9 +5219,7 @@ function resolveConfig(mode, options, viteConfig) {
     ...resolved.setupFiles
   ];
   if (resolved.diff) {
-    resolved.diff = normalize(
-      resolveModule(resolved.diff, { paths: [resolved.root] }) ?? resolve(resolved.root, resolved.diff)
-    );
+    resolved.diff = resolvePath(resolved.diff, resolved.root);
     resolved.forceRerunTriggers.push(resolved.diff);
   }
   resolved.api = resolveApiServerConfig(options);
@@ -6476,7 +6479,7 @@ createLogUpdate(process$2.stdout);
 
 createLogUpdate(process$2.stderr);
 
-var version = "1.0.4";
+var version = "1.1.1";
 
 async function printError(error, project, options) {
   const { showCodeFrame = true, fullStack = false, type } = options;
@@ -7340,7 +7343,7 @@ function WorkspaceVitestPlugin(project, options) {
         let name = testConfig.name;
         if (!name) {
           if (typeof options.workspacePath === "string")
-            name = dirname(options.workspacePath).split("/").pop();
+            name = basename(options.workspacePath.endsWith("/") ? options.workspacePath.slice(0, -1) : dirname(options.workspacePath));
           else
             name = options.workspacePath.toString();
         }
@@ -7461,16 +7464,17 @@ async function loadGlobalSetupFile(file, runner) {
 }
 
 async function initializeProject(workspacePath, ctx, options) {
+  var _a;
   const project = new WorkspaceProject(workspacePath, ctx);
   const configFile = options.extends ? resolve(dirname(options.workspaceConfigPath), options.extends) : typeof workspacePath === "number" || workspacePath.endsWith("/") ? false : workspacePath;
-  const root = options.root || (typeof workspacePath === "number" ? void 0 : dirname(workspacePath));
+  const root = options.root || (typeof workspacePath === "number" ? void 0 : workspacePath.endsWith("/") ? workspacePath : dirname(workspacePath));
   const config = {
     ...options,
     root,
     logLevel: "error",
     configFile,
     // this will make "mode": "test" | "benchmark" inside defineConfig
-    mode: options.mode || ctx.config.mode,
+    mode: ((_a = options.test) == null ? void 0 : _a.mode) || options.mode || ctx.config.mode,
     plugins: [
       ...options.plugins || [],
       WorkspaceVitestPlugin(project, { ...options, root, workspacePath })
@@ -7739,9 +7743,8 @@ ${c.red(divider(c.bold(c.inverse(" Error during global setup "))))}`);
       this.closingPromise = Promise.all([
         this.server.close(),
         (_a = this.typechecker) == null ? void 0 : _a.stop(),
-        (_b = this.browser) == null ? void 0 : _b.close(),
-        () => this._provided = {}
-      ].filter(Boolean));
+        (_b = this.browser) == null ? void 0 : _b.close()
+      ].filter(Boolean)).then(() => this._provided = {});
     }
     return this.closingPromise;
   }
@@ -7882,15 +7885,22 @@ class Vitest {
     const projectName = task.projectName || ((_a = task == null ? void 0 : task.file) == null ? void 0 : _a.projectName);
     return this.projects.find((p) => p.getName() === projectName) || this.getCoreWorkspaceProject() || this.projects[0];
   }
-  async resolveWorkspace(cliOptions) {
+  async getWorkspaceConfigPath() {
+    if (this.config.workspace)
+      return this.config.workspace;
     const configDir = this.server.config.configFile ? dirname(this.server.config.configFile) : this.config.root;
     const rootFiles = await promises.readdir(configDir);
     const workspaceConfigName = workspacesFiles.find((configFile) => {
       return rootFiles.includes(configFile);
     });
     if (!workspaceConfigName)
+      return null;
+    return join(configDir, workspaceConfigName);
+  }
+  async resolveWorkspace(cliOptions) {
+    const workspaceConfigPath = await this.getWorkspaceConfigPath();
+    if (!workspaceConfigPath)
       return [await this.createCoreProject()];
-    const workspaceConfigPath = join(configDir, workspaceConfigName);
     const workspaceModule = await this.runner.executeFile(workspaceConfigPath);
     if (!workspaceModule.default || !Array.isArray(workspaceModule.default))
       throw new Error(`Workspace config file ${workspaceConfigPath} must export a default array of project paths.`);
@@ -7929,7 +7939,7 @@ class Vitest {
       return filepath;
     }));
     const workspacesByFolder = resolvedWorkspacesPaths.reduce((configByFolder, filepath) => {
-      const dir = dirname(filepath);
+      const dir = filepath.endsWith("/") ? filepath.slice(0, -1) : dirname(filepath);
       configByFolder[dir] ?? (configByFolder[dir] = []);
       configByFolder[dir].push(filepath);
       return configByFolder;
@@ -7947,8 +7957,12 @@ class Vitest {
       "testTimeout",
       "pool",
       "globals",
-      "mode",
-      "expandSnapshotDiff"
+      "expandSnapshotDiff",
+      "retry",
+      "testNamePattern",
+      "passWithNoTests",
+      "bail",
+      "isolate"
     ];
     const cliOverrides = overridesOptions.reduce((acc, name) => {
       if (name in cliOptions)
@@ -8433,7 +8447,7 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
         this.meta.watchMode = false;
       },
       async config(viteConfig) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
         if (options.watch) {
           options = deepMerge({}, userConfig);
         }
@@ -8444,13 +8458,18 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
           removeUndefinedValues(viteConfig.test ?? {})
         );
         testConfig.api = resolveApiServerConfig(testConfig);
+        testConfig.poolOptions ?? (testConfig.poolOptions = {});
+        (_a = testConfig.poolOptions).threads ?? (_a.threads = {});
+        (_b = testConfig.poolOptions).forks ?? (_b.forks = {});
+        testConfig.poolOptions.threads.isolate = ((_d = (_c = options.poolOptions) == null ? void 0 : _c.threads) == null ? void 0 : _d.isolate) ?? options.isolate ?? testConfig.poolOptions.threads.isolate ?? ((_e = viteConfig.test) == null ? void 0 : _e.isolate);
+        testConfig.poolOptions.forks.isolate = ((_g = (_f = options.poolOptions) == null ? void 0 : _f.forks) == null ? void 0 : _g.isolate) ?? options.isolate ?? testConfig.poolOptions.forks.isolate ?? ((_h = viteConfig.test) == null ? void 0 : _h.isolate);
         const defines = deleteDefineConfig(viteConfig);
         options.defines = defines;
         let open = false;
         if (testConfig.ui && testConfig.open)
           open = testConfig.uiBase ?? "/__vitest__/";
         const config = {
-          root: ((_a = viteConfig.test) == null ? void 0 : _a.root) || options.root,
+          root: ((_i = viteConfig.test) == null ? void 0 : _i.root) || options.root,
           esbuild: viteConfig.esbuild === false ? false : {
             sourcemap: "external",
             // Enables using ignore hint for coverage providers with @preserve keyword
@@ -8474,16 +8493,19 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
             fs: {
               allow: resolveFsAllow(getRoot(), testConfig.config)
             }
+          },
+          test: {
+            poolOptions: testConfig.poolOptions
           }
         };
         if (process.platform === "darwin" && process.env.VITE_TEST_WATCHER_DEBUG) {
           config.server.watch.useFsEvents = false;
           config.server.watch.usePolling = false;
         }
-        const classNameStrategy = typeof testConfig.css !== "boolean" && ((_c = (_b = testConfig.css) == null ? void 0 : _b.modules) == null ? void 0 : _c.classNameStrategy) || "stable";
+        const classNameStrategy = typeof testConfig.css !== "boolean" && ((_k = (_j = testConfig.css) == null ? void 0 : _j.modules) == null ? void 0 : _k.classNameStrategy) || "stable";
         if (classNameStrategy !== "scoped") {
           config.css ?? (config.css = {});
-          (_d = config.css).modules ?? (_d.modules = {});
+          (_l = config.css).modules ?? (_l.modules = {});
           if (config.css.modules) {
             config.css.modules.generateScopedName = (name, filename) => {
               const root = getRoot();

package/dist/vendor/{reporters.r0gTYN3L.js → reporters.oUR9etwS.js}

@@ -1949,7 +1949,7 @@ let JsonReporter$1 = class JsonReporter {
       success,
       testResults
     };
-    await this.writeReport(JSON.stringify(result, null, 2));
+    await this.writeReport(JSON.stringify(result));
   }
   async onFinished(files = this.ctx.state.getFiles()) {
     await this.logTasks(files);
@@ -2253,13 +2253,13 @@ class JUnitReporter {
     var _a;
     await this.logger.log('<?xml version="1.0" encoding="UTF-8" ?>');
     const transformed = files.map((file) => {
-      var _a2;
+      var _a2, _b;
       const tasks = file.tasks.flatMap((task) => flattenTasks$1(task));
       const stats2 = tasks.reduce((stats3, task) => {
-        var _a3, _b;
+        var _a3, _b2;
         return {
           passed: stats3.passed + Number(((_a3 = task.result) == null ? void 0 : _a3.state) === "pass"),
-          failures: stats3.failures + Number(((_b = task.result) == null ? void 0 : _b.state) === "fail"),
+          failures: stats3.failures + Number(((_b2 = task.result) == null ? void 0 : _b2.state) === "fail"),
           skipped: stats3.skipped + Number(task.mode === "skip" || task.mode === "todo")
         };
       }, {
@@ -2267,7 +2267,14 @@ class JUnitReporter {
         failures: 0,
         skipped: 0
       });
-      if (tasks.length === 0 && ((_a2 = file.result) == null ? void 0 : _a2.state) === "fail") {
+      const suites = getSuites(file);
+      for (const suite of suites) {
+        if ((_a2 = suite.result) == null ? void 0 : _a2.errors) {
+          tasks.push(suite);
+          stats2.failures += 1;
+        }
+      }
+      if (tasks.length === 0 && ((_b = file.result) == null ? void 0 : _b.state) === "fail") {
         stats2.failures = 1;
         tasks.push({
           id: file.id,

package/dist/vendor/{vi.pk4NToBt.js → vi.ciwVQ0al.js}

@@ -3406,7 +3406,7 @@ function createVitest() {
       _mocker.queueMock(
         path,
         importer,
-        factory ? () => factory(() => _mocker.importActual(path, importer)) : void 0
+        factory ? () => factory(() => _mocker.importActual(path, importer, _mocker.getMockContext().callstack)) : void 0
       );
     },
     unmock(path) {
@@ -3417,14 +3417,18 @@ function createVitest() {
       _mocker.queueMock(
         path,
         importer,
-        factory ? () => factory(() => _mocker.importActual(path, importer)) : void 0
+        factory ? () => factory(() => _mocker.importActual(path, importer, _mocker.getMockContext().callstack)) : void 0
       );
     },
     doUnmock(path) {
       _mocker.queueUnmock(path, getImporter());
     },
     async importActual(path) {
-      return _mocker.importActual(path, getImporter());
+      return _mocker.importActual(
+        path,
+        getImporter(),
+        _mocker.getMockContext().callstack
+      );
     },
     async importMock(path) {
       return _mocker.importMock(path, getImporter());

package/dist/vm.js

@@ -7,13 +7,12 @@ import { c as createBirpc } from './vendor/index.cAUulNDf.js';
 import { resolve } from 'pathe';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { distDir } from './paths.js';
-import { l as loadEnvironment } from './vendor/loader.zIj6SiI8.js';
-import { b as startVitestExecutor } from './vendor/execute.1R_t2FPL.js';
+import { l as loadEnvironment } from './vendor/loader.L9CYwKn1.js';
+import { b as startVitestExecutor } from './vendor/execute.vStuEOaI.js';
 import { createCustomConsole } from './chunks/runtime-console.hf2msWA9.js';
 import { c as createSafeRpc } from './vendor/rpc.Bl-ysZIr.js';
-import './vendor/environments.v4R4vGad.js';
+import './vendor/environments.QJtma9XQ.js';
 import 'node:console';
-import 'local-pkg';
 import 'vite-node/utils';
 import '@vitest/utils/error';
 import 'node:fs';

package/dist/worker.js

@@ -2,15 +2,14 @@ import { performance } from 'node:perf_hooks';
 import { c as createBirpc } from './vendor/index.cAUulNDf.js';
 import { workerId } from 'tinypool';
 import { g as getWorkerState } from './vendor/global.L7JRz1qU.js';
-import { l as loadEnvironment } from './vendor/loader.zIj6SiI8.js';
-import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor/execute.1R_t2FPL.js';
+import { l as loadEnvironment } from './vendor/loader.L9CYwKn1.js';
+import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor/execute.vStuEOaI.js';
 import { s as setupInspect } from './vendor/inspector.lFAeuaAt.js';
 import { r as rpcDone, c as createSafeRpc } from './vendor/rpc.Bl-ysZIr.js';
 import 'pathe';
 import 'vite-node/client';
-import './vendor/environments.v4R4vGad.js';
+import './vendor/environments.QJtma9XQ.js';
 import 'node:console';
-import 'local-pkg';
 import 'node:url';
 import 'node:vm';
 import 'vite-node/utils';