vitest 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/vendor/{cli-api.B2QW76dQ.js → cli-api.pZNNj7LX.js}

@@ -1,5 +1,5 @@
-import { dirname, join, resolve, relative, isAbsolute, normalize, basename, toNamespacedPath } from 'pathe';
-import { A as API_PATH, d as defaultPort, e as extraInlineDeps, a as defaultBrowserPort, b as defaultInspectPort, E as EXIT_CODE_RESTART, w as workspacesFiles, C as CONFIG_NAMES, c as configFiles } from './constants.5SOfHUj0.js';
+import { dirname, join, resolve, isAbsolute, relative, normalize, basename, toNamespacedPath } from 'pathe';
+import { A as API_PATH, d as defaultPort, e as extraInlineDeps, a as defaultBrowserPort, b as defaultInspectPort, E as EXIT_CODE_RESTART, w as workspacesFiles, C as CONFIG_NAMES, c as configFiles } from './constants.XmjJgDXx.js';
 import { g as getCoverageProvider, C as CoverageProviderMap } from './coverage.ChSqD-qS.js';
 import { g as getEnvPackageName } from './index.DeR1hhfY.js';
 import { isFileServingAllowed, searchForWorkspaceRoot, version, createServer, mergeConfig } from 'vite';
@@ -19,13 +19,14 @@ import c from 'picocolors';
 import { ViteNodeRunner } from 'vite-node/client';
 import { SnapshotManager } from '@vitest/snapshot/manager';
 import { ViteNodeServer } from 'vite-node/server';
-import { v as version$1 } from './cac.CtP0aXu-.js';
-import { hasFailed, getTasks, getTests } from '@vitest/runner/utils';
-import { n as noop$2, b as isPrimitive, c as groupBy, A as AggregateErrorPonyfill, a as slash$1, t as toArray, d as deepMerge, e as nanoid, w as wildcardPatternToRegExp, f as stdout } from './base._gnK9Slw.js';
+import { v as version$1 } from './cac.f5m2SesE.js';
+import { hasFailed, createFileTask, getTasks, getTests } from '@vitest/runner/utils';
+import { n as noop$1, b as isPrimitive, c as groupBy, A as AggregateErrorPonyfill, a as slash$1, t as toArray, d as deepMerge, e as nanoid, w as wildcardPatternToRegExp, f as stdout } from './base._gnK9Slw.js';
 import { createDefer, toArray as toArray$1, notNullish } from '@vitest/utils';
 import { a as isWindows } from './env.bmJgw1qP.js';
 import { rootDir } from '../path.js';
 import { c as createBirpc } from './index.BpSiYbpB.js';
+import { s as stringify, p as parse$3, w as wrapSerializableConfig, f as Typechecker, R as ReportersMap, e as BenchmarkReportsMap, g as RandomSequencer, B as BaseSequencer, h as findNodeAround, i as generateCodeFrame, j as highlightCode, L as Logger, k as BlobReporter, r as readBlobs } from './index.DOAUPIJU.js';
 import require$$0$4 from 'zlib';
 import require$$0$5 from 'buffer';
 import require$$1 from 'crypto';
@@ -40,7 +41,6 @@ import * as nodeos from 'node:os';
 import nodeos__default, { tmpdir } from 'node:os';
 import EventEmitter$2 from 'node:events';
 import Tinypool$1, { Tinypool } from 'tinypool';
-import { w as wrapSerializableConfig, f as Typechecker, R as ReportersMap, e as BenchmarkReportsMap, g as RandomSequencer, B as BaseSequencer, h as findNodeAround, i as generateCodeFrame, j as highlightCode, L as Logger } from './index.CRxYS9H3.js';
 import crypto, { createHash as createHash$2 } from 'node:crypto';
 import { mkdir, writeFile, rm } from 'node:fs/promises';
 import { builtinModules, createRequire } from 'node:module';
@@ -1790,8 +1790,8 @@ function fastqueue (context, worker, concurrency) {
 
   var self = {
     push: push,
-    drain: noop$1,
-    saturated: noop$1,
+    drain: noop,
+    saturated: noop,
     pause: pause,
     paused: false,
     concurrency: concurrency,
@@ -1801,7 +1801,7 @@ function fastqueue (context, worker, concurrency) {
     length: length,
     getQueue: getQueue,
     unshift: unshift,
-    empty: noop$1,
+    empty: noop,
     kill: kill,
     killAndDrain: killAndDrain,
     error: error
@@ -1860,7 +1860,7 @@ function fastqueue (context, worker, concurrency) {
     current.context = context;
     current.release = release;
     current.value = value;
-    current.callback = done || noop$1;
+    current.callback = done || noop;
     current.errorHandler = errorHandler;
 
     if (_running === self.concurrency || self.paused) {
@@ -1884,7 +1884,7 @@ function fastqueue (context, worker, concurrency) {
     current.context = context;
     current.release = release;
     current.value = value;
-    current.callback = done || noop$1;
+    current.callback = done || noop;
 
     if (_running === self.concurrency || self.paused) {
       if (queueHead) {
@@ -1928,14 +1928,14 @@ function fastqueue (context, worker, concurrency) {
   function kill () {
     queueHead = null;
     queueTail = null;
-    self.drain = noop$1;
+    self.drain = noop;
   }
 
   function killAndDrain () {
     queueHead = null;
     queueTail = null;
     self.drain();
-    self.drain = noop$1;
+    self.drain = noop;
   }
 
   function error (handler) {
@@ -1943,13 +1943,13 @@ function fastqueue (context, worker, concurrency) {
   }
 }
 
-function noop$1 () {}
+function noop () {}
 
 function Task () {
   this.value = null;
-  this.callback = noop$1;
+  this.callback = noop;
   this.next = null;
-  this.release = noop$1;
+  this.release = noop;
   this.context = null;
   this.errorHandler = null;
 
@@ -1960,7 +1960,7 @@ function Task () {
     var errorHandler = self.errorHandler;
     var val = self.value;
     self.value = null;
-    self.callback = noop$1;
+    self.callback = noop;
     if (self.errorHandler) {
       errorHandler(err, val);
     }
@@ -2008,7 +2008,7 @@ function queueAsPromised (context, worker, concurrency) {
     // Let's fork the promise chain to
     // make the error bubble up to the user but
     // not lead to a unhandledRejection
-    p.catch(noop$1);
+    p.catch(noop);
 
     return p
   }
@@ -2027,7 +2027,7 @@ function queueAsPromised (context, worker, concurrency) {
     // Let's fork the promise chain to
     // make the error bubble up to the user but
     // not lead to a unhandledRejection
-    p.catch(noop$1);
+    p.catch(noop);
 
     return p
   }
@@ -3128,113 +3128,6 @@ var out = FastGlob;
 
 var fg = /*@__PURE__*/getDefaultExportFromCjs(out);
 
-/// <reference types="../types/index.d.ts" />
-
-// (c) 2020-present Andrea Giammarchi
-
-const {parse: $parse, stringify: $stringify} = JSON;
-const {keys: keys$1} = Object;
-
-const Primitive = String;   // it could be Number
-const primitive = 'string'; // it could be 'number'
-
-const ignore = {};
-const object = 'object';
-
-const noop = (_, value) => value;
-
-const primitives = value => (
-  value instanceof Primitive ? Primitive(value) : value
-);
-
-const Primitives = (_, value) => (
-  typeof value === primitive ? new Primitive(value) : value
-);
-
-const revive = (input, parsed, output, $) => {
-  const lazy = [];
-  for (let ke = keys$1(output), {length} = ke, y = 0; y < length; y++) {
-    const k = ke[y];
-    const value = output[k];
-    if (value instanceof Primitive) {
-      const tmp = input[value];
-      if (typeof tmp === object && !parsed.has(tmp)) {
-        parsed.add(tmp);
-        output[k] = ignore;
-        lazy.push({k, a: [input, parsed, tmp, $]});
-      }
-      else
-        output[k] = $.call(output, k, tmp);
-    }
-    else if (output[k] !== ignore)
-      output[k] = $.call(output, k, value);
-  }
-  for (let {length} = lazy, i = 0; i < length; i++) {
-    const {k, a} = lazy[i];
-    output[k] = $.call(output, k, revive.apply(null, a));
-  }
-  return output;
-};
-
-const set = (known, input, value) => {
-  const index = Primitive(input.push(value) - 1);
-  known.set(value, index);
-  return index;
-};
-
-/**
- * Converts a specialized flatted string into a JS value.
- * @param {string} text
- * @param {(this: any, key: string, value: any) => any} [reviver]
- * @returns {any}
- */
-const parse$3 = (text, reviver) => {
-  const input = $parse(text, Primitives).map(primitives);
-  const value = input[0];
-  const $ = reviver || noop;
-  const tmp = typeof value === object && value ?
-              revive(input, new Set, value, $) :
-              value;
-  return $.call({'': tmp}, '', tmp);
-};
-
-/**
- * Converts a JS value into a specialized flatted string.
- * @param {any} value
- * @param {((this: any, key: string, value: any) => any) | (string | number)[] | null | undefined} [replacer]
- * @param {string | number | undefined} [space]
- * @returns {string}
- */
-const stringify = (value, replacer, space) => {
-  const $ = replacer && typeof replacer === object ?
-            (k, v) => (k === '' || -1 < replacer.indexOf(k) ? v : void 0) :
-            (replacer || noop);
-  const known = new Map;
-  const input = [];
-  const output = [];
-  let i = +set(known, input, $.call({'': value}, '', value));
-  let firstRun = !i;
-  while (i < input.length) {
-    firstRun = true;
-    output[i] = $stringify(input[i++], replace, space);
-  }
-  return '[' + output.join(',') + ']';
-  function replace(key, value) {
-    if (firstRun) {
-      firstRun = !firstRun;
-      return value;
-    }
-    const after = $.call(this, key, value);
-    switch (typeof after) {
-      case object:
-        if (after === null) return after;
-      case primitive:
-        return known.get(after) || set(known, input, after);
-    }
-    return after;
-  }
-};
-
 var bufferUtil$1 = {exports: {}};
 
 var constants = {
@@ -7817,6 +7710,19 @@ function setup(vitestOrWorkspace, _server) {
           return ctx.state.getUnhandledErrors();
         },
         // TODO: have a separate websocket conection for private browser API
+        triggerCommand(command, testPath, payload) {
+          var _a2;
+          if (!("ctx" in vitestOrWorkspace) || !vitestOrWorkspace.browserProvider)
+            throw new Error("Commands are only available for browser tests.");
+          const commands = (_a2 = vitestOrWorkspace.config.browser) == null ? void 0 : _a2.commands;
+          if (!commands || !commands[command])
+            throw new Error(`Unknown command "${command}".`);
+          return commands[command]({
+            testPath,
+            project: vitestOrWorkspace,
+            provider: vitestOrWorkspace.browserProvider
+          }, ...payload);
+        },
         getBrowserFiles() {
           var _a2;
           if (!("ctx" in vitestOrWorkspace))
@@ -7834,7 +7740,10 @@ function setup(vitestOrWorkspace, _server) {
         },
         async getTestFiles() {
           const spec = await ctx.globTestFiles();
-          return spec.map(([project, file]) => [project.getName(), file]);
+          return spec.map(([project, file]) => [{
+            name: project.getName(),
+            root: project.config.root
+          }, file]);
         }
       },
       {
@@ -7867,7 +7776,15 @@ class WebSocketReporter {
       return;
     this.clients.forEach((client) => {
       var _a, _b, _c;
-      (_c = (_b = (_a = client.onCollected) == null ? void 0 : _a.call(client, files)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$2);
+      (_c = (_b = (_a = client.onCollected) == null ? void 0 : _a.call(client, files)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$1);
+    });
+  }
+  onSpecsCollected(specs) {
+    if (this.clients.size === 0)
+      return;
+    this.clients.forEach((client) => {
+      var _a, _b, _c;
+      (_c = (_b = (_a = client.onSpecsCollected) == null ? void 0 : _a.call(client, specs)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$1);
     });
   }
   async onTaskUpdate(packs) {
@@ -7886,25 +7803,25 @@ class WebSocketReporter {
     });
     this.clients.forEach((client) => {
       var _a, _b, _c;
-      (_c = (_b = (_a = client.onTaskUpdate) == null ? void 0 : _a.call(client, packs)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$2);
+      (_c = (_b = (_a = client.onTaskUpdate) == null ? void 0 : _a.call(client, packs)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$1);
     });
   }
   onFinished(files, errors) {
     this.clients.forEach((client) => {
       var _a, _b, _c;
-      (_c = (_b = (_a = client.onFinished) == null ? void 0 : _a.call(client, files, errors)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$2);
+      (_c = (_b = (_a = client.onFinished) == null ? void 0 : _a.call(client, files, errors)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$1);
     });
   }
   onFinishedReportCoverage() {
     this.clients.forEach((client) => {
       var _a, _b, _c;
-      (_c = (_b = (_a = client.onFinishedReportCoverage) == null ? void 0 : _a.call(client)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$2);
+      (_c = (_b = (_a = client.onFinishedReportCoverage) == null ? void 0 : _a.call(client)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$1);
     });
   }
   onUserConsoleLog(log) {
     this.clients.forEach((client) => {
       var _a, _b, _c;
-      (_c = (_b = (_a = client.onUserConsoleLog) == null ? void 0 : _a.call(client, log)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$2);
+      (_c = (_b = (_a = client.onUserConsoleLog) == null ? void 0 : _a.call(client, log)) == null ? void 0 : _b.catch) == null ? void 0 : _c.call(_b, noop$1);
     });
   }
 }
@@ -7932,7 +7849,7 @@ async function groupFilesByEnv(files) {
   const filesWithEnv = await Promise.all(files.map(async ([project, file]) => {
     var _a, _b;
     const code = await promises$1.readFile(file, "utf-8");
-    let env = (_a = code.match(/@(?:vitest|jest)-environment\s+?([\w-]+)\b/)) == null ? void 0 : _a[1];
+    let env = (_a = code.match(/@(?:vitest|jest)-environment\s+([\w-]+)\b/)) == null ? void 0 : _a[1];
     if (!env) {
       for (const [glob, target] of project.config.environmentMatchGlobs || []) {
         if (mm.isMatch(file, glob, { cwd: project.config.root })) {
@@ -8420,7 +8337,7 @@ function stringToBytes(input, percentageReference) {
     return input;
   if (typeof input === "string") {
     if (Number.isNaN(Number.parseFloat(input.slice(-1)))) {
-      let [, numericString, trailingChars] = input.match(/(.*?)([^0-9.-]+)$/i) || [];
+      let [, numericString, trailingChars] = input.match(/(.*?)([^0-9.-]+)$/) || [];
       if (trailingChars && numericString) {
         const numericValue = Number.parseFloat(numericString);
         trailingChars = trailingChars.toLowerCase();
@@ -9068,6 +8985,9 @@ class StateManager {
     files.forEach((file) => {
       const existing = this.filesMap.get(file.filepath) || [];
       const otherProject = existing.filter((i) => i.projectName !== file.projectName);
+      const currentFile = existing.find((i) => i.projectName === file.projectName);
+      if (currentFile)
+        file.logs = currentFile.logs;
       otherProject.push(file);
       this.filesMap.set(file.filepath, otherProject);
       this.updateId(file);
@@ -9078,13 +8998,21 @@ class StateManager {
     const project = _project;
     paths.forEach((path) => {
       const files = this.filesMap.get(path);
-      if (!files)
+      const fileTask = createFileTask(path, project.config.root, project.config.name);
+      this.idMap.set(fileTask.id, fileTask);
+      if (!files) {
+        this.filesMap.set(path, [fileTask]);
         return;
+      }
       const filtered = files.filter((file) => file.projectName !== project.config.name);
-      if (!filtered.length)
-        this.filesMap.delete(path);
-      else
-        this.filesMap.set(path, filtered);
+      if (!filtered.length) {
+        this.filesMap.set(path, [fileTask]);
+      } else {
+        this.filesMap.set(path, [
+          ...filtered,
+          fileTask
+        ]);
+      }
     });
   }
   updateId(task) {
@@ -9123,25 +9051,7 @@ class StateManager {
     }).length;
   }
   cancelFiles(files, root, projectName) {
-    this.collectFiles(files.map((filepath) => {
-      const file = {
-        filepath,
-        name: relative(root, filepath),
-        id: filepath,
-        mode: "skip",
-        type: "suite",
-        result: {
-          state: "skip"
-        },
-        meta: {},
-        // Cancelled files have not yet collected tests
-        tasks: [],
-        projectName,
-        file: null
-      };
-      file.file = file;
-      return file;
-    }));
+    this.collectFiles(files.map((filepath) => createFileTask(filepath, root, projectName)));
   }
 }
 
@@ -11554,6 +11464,8 @@ function resolveConfig(mode, options, viteConfig, logger) {
   }
   if (resolved.standalone && !resolved.watch)
     throw new Error(`Vitest standalone mode requires --watch`);
+  if (resolved.mergeReports && resolved.watch)
+    throw new Error(`Cannot merge reports with --watch enabled`);
   if (resolved.maxWorkers)
     resolved.maxWorkers = Number(resolved.maxWorkers);
   if (resolved.minWorkers)
@@ -11573,8 +11485,6 @@ function resolveConfig(mode, options, viteConfig, logger) {
       throw new Error(`You cannot use ${inspectOption} without "--no-file-parallelism", "poolOptions.threads.singleThread" or "poolOptions.forks.singleFork"`);
     }
   }
-  if (resolved.coverage.provider === "c8")
-    throw new Error('"coverage.provider: c8" is not supported anymore. Use "coverage.provider: v8" instead');
   if (resolved.coverage.provider === "v8" && resolved.coverage.enabled && isBrowserEnabled(resolved))
     throw new Error("@vitest/coverage-v8 does not work with --browser. Use @vitest/coverage-istanbul instead");
   if (resolved.coverage.enabled && resolved.coverage.reportsDirectory) {
@@ -11901,7 +11811,7 @@ function getBetterEnd(code, node) {
     end += 1;
   return end;
 }
-const regexpHoistable = /\b(vi|vitest)\s*\.\s*(mock|unmock|hoisted|doMock|doUnmock)\(/;
+const regexpHoistable = /\b(?:vi|vitest)\s*\.\s*(?:mock|unmock|hoisted|doMock|doUnmock)\(/;
 const hashbangRE = /^#!.*\n/;
 function hoistMocks(code, id, parse, colors) {
   var _a;
@@ -12345,10 +12255,10 @@ function generateScopedClassName(strategy, name, filename) {
   return `_${name}_${hash}`;
 }
 
-const cssLangs = "\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)";
+const cssLangs = "\\.(?:css|less|sass|scss|styl|stylus|pcss|postcss)(?:$|\\?)";
 const cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
-const cssInlineRE = /[?&]inline(&|$)/;
+const cssInlineRE = /[?&]inline(?:&|$)/;
 function isCSS(id) {
   return cssLangRE.test(id);
 }
@@ -12960,7 +12870,7 @@ function NormalizeURLPlugin() {
       if (ssr || !code.includes("new URL") || !code.includes("import.meta.url"))
         return;
       const cleanString = stripLiteral(code);
-      const assetImportMetaUrlRE = /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/g;
+      const assetImportMetaUrlRE = /\bnew\s+URL\s*\(\s*(?:'[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/g;
       let updatedCode = code;
       let match;
       while (match = assetImportMetaUrlRE.exec(cleanString)) {
@@ -13419,6 +13329,10 @@ ${c.red(divider(c.bold(c.inverse(" Error during global setup "))))}`);
       env: {
         ...(_v = this.server) == null ? void 0 : _v.config.env,
         ...this.config.env
+      },
+      browser: {
+        ...this.ctx.config.browser,
+        commands: {}
       }
     }, this.ctx.configOverride || {});
   }
@@ -13620,6 +13534,9 @@ 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];
   }
+  getProjectByName(name) {
+    return this.projects.find((p) => p.getName() === name) || this.getCoreWorkspaceProject() || this.projects[0];
+  }
   async getWorkspaceConfigPath() {
     if (this.config.workspace)
       return this.config.workspace;
@@ -13766,6 +13683,47 @@ class Vitest {
   async initBrowserProviders() {
     return Promise.all(this.projects.map((w) => w.initBrowserProvider()));
   }
+  async mergeReports() {
+    if (this.reporters.some((r) => r instanceof BlobReporter))
+      throw new Error("Cannot merge reports when `--reporter=blob` is used. Remove blob reporter from the config first.");
+    const { files, errors } = await readBlobs(this.config.mergeReports, this.projects);
+    await this.report("onInit", this);
+    await this.report("onPathsCollected", files.flatMap((f) => f.filepath));
+    const workspaceSpecs = /* @__PURE__ */ new Map();
+    for (const file of files) {
+      const project = this.getProjectByName(file.projectName);
+      const specs = workspaceSpecs.get(project) || [];
+      specs.push(file);
+      workspaceSpecs.set(project, specs);
+    }
+    for (const [project, files2] of workspaceSpecs) {
+      const filepaths = files2.map((f) => f.filepath);
+      this.state.clearFiles(project, filepaths);
+      files2.forEach((file) => {
+        var _a;
+        (_a = file.logs) == null ? void 0 : _a.forEach((log) => this.state.updateUserLog(log));
+      });
+      this.state.collectFiles(files2);
+    }
+    await this.report("onCollected", files).catch(noop$1);
+    for (const file of files) {
+      const logs = [];
+      const taskPacks = [];
+      const tasks = getTasks(file);
+      for (const task of tasks) {
+        if (task.logs)
+          logs.push(...task.logs);
+        taskPacks.push([task.id, task.result, task.meta]);
+      }
+      logs.sort((log1, log2) => log1.time - log2.time);
+      for (const log of logs)
+        await this.report("onUserConsoleLog", log).catch(noop$1);
+      await this.report("onTaskUpdate", taskPacks).catch(noop$1);
+    }
+    if (hasFailed(files))
+      process.exitCode = 1;
+    await this.report("onFinished", files, errors);
+  }
   async start(filters) {
     var _a, _b;
     this._onClose = [];
@@ -13884,11 +13842,14 @@ class Vitest {
     const vitestDir = projectVitestPath ? resolve(projectVitestPath.id, "../..") : rootDir;
     this.distPath = join(vitestDir, "dist");
   }
-  async runFiles(paths, allTestsRun) {
+  async runFiles(specs, allTestsRun) {
     await this.initializeDistPath();
-    const filepaths = paths.map(([, file]) => file);
+    const filepaths = specs.map(([, file]) => file);
     this.state.collectPaths(filepaths);
     await this.report("onPathsCollected", filepaths);
+    await this.report("onSpecsCollected", specs.map(
+      ([project, file]) => [{ name: project.getName(), root: project.config.root }, file]
+    ));
     await this.runningPromise;
     this._onCancelListeners = [];
     this.isCancelling = false;
@@ -13902,9 +13863,9 @@ class Vitest {
       this.state.clearErrors();
       if (!this.isFirstRun && this.config.coverage.cleanOnRerun)
         await ((_a = this.coverageProvider) == null ? void 0 : _a.clean());
-      await this.initializeGlobalSetup(paths);
+      await this.initializeGlobalSetup(specs);
       try {
-        await this.pool.runTests(paths, invalidates);
+        await this.pool.runTests(specs, invalidates);
       } catch (err) {
         this.state.catchError(err, "Unhandled Error");
       }
@@ -13914,8 +13875,8 @@ class Vitest {
       this.cache.results.updateResults(files);
       await this.cache.results.writeToCache();
     })().finally(async () => {
-      const specs = Array.from(new Set(paths.map(([, p]) => p)));
-      await this.report("onFinished", this.state.getFiles(specs), this.state.getUnhandledErrors());
+      const files = Array.from(new Set(specs.map(([, p]) => p)));
+      await this.report("onFinished", this.state.getFiles(files), this.state.getUnhandledErrors());
       await this.reportCoverage(allTestsRun);
       this.runningPromise = void 0;
       this.isFirstRun = false;
@@ -14037,7 +13998,7 @@ class Vitest {
       tests.map((test) => slash$1(test))
     );
   }
-  unregisterWatcher = noop$2;
+  unregisterWatcher = noop$1;
   registerWatcher() {
     const updateLastChanged = (filepath) => {
       const projects = this.getModuleProjects(filepath);
@@ -14101,7 +14062,7 @@ class Vitest {
       watcher.off("change", onChange);
       watcher.off("unlink", onUnlink);
       watcher.off("add", onAdd);
-      this.unregisterWatcher = noop$2;
+      this.unregisterWatcher = noop$1;
     };
   }
   /**
@@ -14396,14 +14357,9 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
             console.log("[debug] watcher is ready");
           });
         }
-        try {
-          await ctx.setServer(options, server, userConfig);
-          if (options.api && options.watch)
-            (await Promise.resolve().then(function () { return setup$1; })).setup(ctx);
-        } catch (err) {
-          ctx.logger.printError(err, { fullStack: true });
-          process.exit(1);
-        }
+        await ctx.setServer(options, server, userConfig);
+        if (options.api && options.watch)
+          (await Promise.resolve().then(function () { return setup$1; })).setup(ctx);
         if (!options.watch)
           await server.watcher.close();
       }
@@ -21038,7 +20994,9 @@ async function startVitest(mode, cliFilters = [], options = {}, viteOverrides, v
       ctx.start(cliFilters);
   });
   try {
-    if (ctx.config.standalone)
+    if (ctx.config.mergeReports)
+      await ctx.mergeReports();
+    else if (ctx.config.standalone)
       await ctx.init();
     else
       await ctx.start(cliFilters);

package/dist/vendor/{constants.5SOfHUj0.js → constants.XmjJgDXx.js}

@@ -4,8 +4,8 @@ const defaultInspectPort = 9229;
 const EXIT_CODE_RESTART = 43;
 const API_PATH = "/__vitest_api__";
 const extraInlineDeps = [
-  /^(?!.*(?:node_modules)).*\.mjs$/,
-  /^(?!.*(?:node_modules)).*\.cjs\.js$/,
+  /^(?!.*node_modules).*\.mjs$/,
+  /^(?!.*node_modules).*\.cjs\.js$/,
   // Vite client
   /vite\w*\/dist\/client\/env.mjs/,
   // Nuxt

package/dist/vendor/{execute.CLLNVNnK.js → execute.Bwzklsfj.js}

@@ -368,7 +368,7 @@ async function createVitestExecutor(options) {
   return runner;
 }
 const externalizeMap = /* @__PURE__ */ new Map();
-const bareVitestRegexp = /^@?vitest(\/|$)/;
+const bareVitestRegexp = /^@?vitest(?:\/|$)/;
 const dispose = [];
 function listenForErrors(state) {
   dispose.forEach((fn) => fn());

package/dist/vendor/{index.BfoZyXD1.js → index.BHPXakMe.js}

@@ -4,7 +4,7 @@ import { distDir } from '../path.js';
 import { g as getWorkerState } from './global.7bFbnyXl.js';
 import { r as rpc } from './rpc.DRDE9Pu1.js';
 import { t as takeCoverageInsideWorker } from './coverage.ChSqD-qS.js';
-import { l as loadDiffConfig, a as loadSnapshotSerializers } from './setup-common.XeoZAW8t.js';
+import { l as loadDiffConfig, a as loadSnapshotSerializers } from './setup-common.6St9QHh1.js';
 
 function setupChaiConfig(config) {
   Object.assign(chai.config, config);

package/dist/vendor/{index.CmILuxzC.js → index.BkeKAX-R.js}

@@ -1,7 +1,7 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';
 import { b as bench } from './benchmark.BNLebNi5.js';
 import { i as isFirstRun, a as runOnce } from './run-once.DLomgGUH.js';
-import { c as createExpect, a as globalExpect, v as vi, b as vitest } from './vi.ClD3hi7L.js';
+import { c as createExpect, a as globalExpect, v as vi, b as vitest } from './vi.B31D70yH.js';
 import { g as getWorkerState } from './global.7bFbnyXl.js';
 import * as chai from 'chai';
 import { assert, should } from 'chai';