vitest 2.0.0-beta.3 → 2.0.0-beta.5

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

@@ -1,12 +1,12 @@
-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 { join, resolve, isAbsolute, relative, dirname, normalize, basename, extname as extname$1, toNamespacedPath } from 'pathe';
+import { A as API_PATH, d as defaultPort, e as extraInlineDeps, a as defaultBrowserPort, b as defaultInspectPort, B as BROWSER_API_PATH, E as EXIT_CODE_RESTART, w as workspacesFiles, C as CONFIG_NAMES, c as configFiles } from './constants.TCjCaw2D.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';
+import { searchForWorkspaceRoot, version, isFileServingAllowed, createServer, mergeConfig } from 'vite';
 import path$8, { win32 } from 'node:path';
 import url, { fileURLToPath as fileURLToPath$1, pathToFileURL as pathToFileURL$1, URL as URL$2 } from 'node:url';
 import process$1 from 'node:process';
-import fs$8, { promises as promises$1, existsSync, statSync as statSync$1, realpathSync, readFileSync } from 'node:fs';
+import fs$8, { promises as promises$1, existsSync, statSync as statSync$1, realpathSync, readdirSync, readFileSync } from 'node:fs';
 import { MessageChannel, isMainThread } from 'node:worker_threads';
 import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './_commonjsHelpers.BFTU3MAI.js';
 import require$$0 from 'os';
@@ -19,14 +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.f5m2SesE.js';
+import { v as version$1 } from './cac.sXjWMctD.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 { rootDir, distDir } 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 { 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.CyGfDRbW.js';
 import require$$0$4 from 'zlib';
 import require$$0$5 from 'buffer';
 import require$$1 from 'crypto';
@@ -47,13 +47,13 @@ import { builtinModules, createRequire } from 'node:module';
 import assert from 'node:assert';
 import { format as format$2, inspect } from 'node:util';
 import { isCI, provider as provider$1 } from 'std-env';
-import { normalizeRequestId, cleanUrl } from 'vite-node/utils';
+import { normalizeRequestId, isNodeBuiltin, cleanUrl } from 'vite-node/utils';
 import MagicString from 'magic-string';
 import { esmWalker } from '@vitest/utils/ast';
-import { d as divider, s as stripAnsi } from './utils.D5gGkwyH.js';
 import { a as removeUndefinedValues } from './index._7XLd8Kd.js';
 import readline from 'node:readline';
 import require$$0$6 from 'readline';
+import { s as stripAnsi } from './utils.YuQ3LT2a.js';
 
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -70,21 +70,23 @@ function _mergeNamespaces(n, m) {
   return Object.freeze(n);
 }
 
-async function getModuleGraph(ctx, id) {
+async function getModuleGraph(ctx, projectName, id, browser = false) {
   const graph = {};
   const externalized = /* @__PURE__ */ new Set();
   const inlined = /* @__PURE__ */ new Set();
+  const project = ctx.getProjectByName(projectName);
   function clearId(id2) {
     return (id2 == null ? void 0 : id2.replace(/\?v=\w+$/, "")) || "";
   }
   async function get(mod, seen = /* @__PURE__ */ new Map()) {
+    var _a;
     if (!mod || !mod.id)
       return;
     if (seen.has(mod))
       return seen.get(mod);
     let id2 = clearId(mod.id);
     seen.set(mod, id2);
-    const rewrote = await ctx.vitenode.shouldExternalize(id2);
+    const rewrote = browser ? ((_a = mod.file) == null ? void 0 : _a.includes(project.browser.config.cacheDir)) ? mod.id : false : await project.vitenode.shouldExternalize(id2);
     if (rewrote) {
       id2 = rewrote;
       externalized.add(id2);
@@ -96,7 +98,10 @@ async function getModuleGraph(ctx, id) {
     graph[id2] = (await Promise.all(mods.map((m) => get(m, seen)))).filter(Boolean);
     return id2;
   }
-  await get(ctx.server.moduleGraph.getModuleById(id));
+  if (browser && project.browser)
+    await get(project.browser.moduleGraph.getModuleById(id));
+  else
+    await get(project.server.moduleGraph.getModuleById(id));
   return {
     graph,
     externalized: Array.from(externalized),
@@ -7582,9 +7587,8 @@ function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
 
 var WebSocketServer$1 = /*@__PURE__*/getDefaultExportFromCjs(websocketServer);
 
-function setup(vitestOrWorkspace, _server) {
+function setup(ctx, _server) {
   var _a;
-  const ctx = "ctx" in vitestOrWorkspace ? vitestOrWorkspace.ctx : vitestOrWorkspace;
   const wss = new WebSocketServer$1({ noServer: true });
   const clients = /* @__PURE__ */ new Map();
   const server = _server || ctx.server;
@@ -7599,16 +7603,9 @@ function setup(vitestOrWorkspace, _server) {
       setupClient(ws);
     });
   });
-  function checkFileAccess(path) {
-    if (!isFileServingAllowed(path, server))
-      throw new Error(`Access denied to "${path}". See Vite config documentation for "server.fs": https://vitejs.dev/config/server-options.html#server-fs-strict.`);
-  }
   function setupClient(ws) {
     const rpc = createBirpc(
       {
-        async onUnhandledError(error, type) {
-          ctx.state.catchError(error, type);
-        },
         async onCollected(files) {
           ctx.state.collectFiles(files);
           await ctx.report("onCollected", files);
@@ -7617,31 +7614,12 @@ function setup(vitestOrWorkspace, _server) {
           ctx.state.updateTasks(packs);
           await ctx.report("onTaskUpdate", packs);
         },
-        onAfterSuiteRun(meta) {
-          var _a2;
-          (_a2 = ctx.coverageProvider) == null ? void 0 : _a2.onAfterSuiteRun(meta);
-        },
         getFiles() {
           return ctx.state.getFiles();
         },
         getPaths() {
           return ctx.state.getPaths();
         },
-        sendLog(log) {
-          return ctx.report("onUserConsoleLog", log);
-        },
-        resolveSnapshotPath(testPath) {
-          return ctx.snapshot.resolvePath(testPath);
-        },
-        resolveSnapshotRawPath(testPath, rawPath) {
-          return ctx.snapshot.resolveRawPath(testPath, rawPath);
-        },
-        async readSnapshotFile(snapshotPath) {
-          checkFileAccess(snapshotPath);
-          if (!existsSync(snapshotPath))
-            return null;
-          return promises$1.readFile(snapshotPath, "utf-8");
-        },
         async readTestFile(id) {
           if (!ctx.state.filesMap.has(id) || !existsSync(id))
             return null;
@@ -7652,32 +7630,11 @@ function setup(vitestOrWorkspace, _server) {
             throw new Error(`Test file "${id}" was not registered, so it cannot be updated using the API.`);
           return promises$1.writeFile(id, content, "utf-8");
         },
-        async saveSnapshotFile(id, content) {
-          checkFileAccess(id);
-          await promises$1.mkdir(dirname(id), { recursive: true });
-          return promises$1.writeFile(id, content, "utf-8");
-        },
-        async removeSnapshotFile(id) {
-          checkFileAccess(id);
-          if (!existsSync(id))
-            throw new Error(`Snapshot file "${id}" does not exist.`);
-          return promises$1.unlink(id);
-        },
-        snapshotSaved(snapshot) {
-          ctx.snapshot.add(snapshot);
-        },
         async rerun(files) {
           await ctx.rerunFiles(files);
         },
         getConfig() {
-          return vitestOrWorkspace.config;
-        },
-        async getBrowserFileSourceMap(id) {
-          var _a2, _b;
-          if (!("ctx" in vitestOrWorkspace))
-            return void 0;
-          const mod = (_a2 = vitestOrWorkspace.browser) == null ? void 0 : _a2.moduleGraph.getModuleById(id);
-          return (_b = mod == null ? void 0 : mod.transformResult) == null ? void 0 : _b.map;
+          return ctx.config;
         },
         async getTransformResult(id) {
           const result = await ctx.vitenode.transformRequest(id);
@@ -7689,59 +7646,21 @@ function setup(vitestOrWorkspace, _server) {
             return result;
           }
         },
-        async getModuleGraph(id) {
-          return getModuleGraph(ctx, id);
+        async getModuleGraph(project, id, browser) {
+          return getModuleGraph(ctx, project, id, browser);
         },
         updateSnapshot(file) {
           if (!file)
             return ctx.updateSnapshot();
           return ctx.updateSnapshot([file.filepath]);
         },
-        onCancel(reason) {
-          ctx.cancelCurrentRun(reason);
-        },
-        debug(...args) {
-          ctx.logger.console.debug(...args);
-        },
-        getCountOfFailedTests() {
-          return ctx.state.getCountOfFailedTests();
-        },
         getUnhandledErrors() {
           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))
-            throw new Error("`getBrowserTestFiles` is only available in the browser API");
-          return ((_a2 = vitestOrWorkspace.browserState) == null ? void 0 : _a2.files) ?? [];
-        },
-        finishBrowserTests() {
-          var _a2;
-          if (!("ctx" in vitestOrWorkspace))
-            throw new Error("`finishBrowserTests` is only available in the browser API");
-          return (_a2 = vitestOrWorkspace.browserState) == null ? void 0 : _a2.resolve();
-        },
-        getProvidedContext() {
-          return "ctx" in vitestOrWorkspace ? vitestOrWorkspace.getProvidedContext() : {};
-        },
         async getTestFiles() {
           const spec = await ctx.globTestFiles();
           return spec.map(([project, file]) => [{
-            name: project.getName(),
+            name: project.config.name,
             root: project.config.root
           }, file]);
         }
@@ -7749,7 +7668,7 @@ function setup(vitestOrWorkspace, _server) {
       {
         post: (msg) => ws.send(msg),
         on: (fn) => ws.on("message", fn),
-        eventNames: ["onUserConsoleLog", "onFinished", "onFinishedReportCoverage", "onCollected", "onCancel", "onTaskUpdate"],
+        eventNames: ["onUserConsoleLog", "onFinished", "onFinishedReportCoverage", "onCollected", "onTaskUpdate"],
         serialize: (data) => stringify(data, stringifyReplace),
         deserialize: parse$3,
         onTimeoutError(functionName) {
@@ -7757,7 +7676,6 @@ function setup(vitestOrWorkspace, _server) {
         }
       }
     );
-    ctx.onCancel((reason) => rpc.onCancel(reason));
     clients.set(ws, rpc);
     ws.on("close", () => {
       clients.delete(ws);
@@ -8291,6 +8209,11 @@ function createBrowserPool(ctx) {
   const runTests = async (project, files) => {
     var _a;
     ctx.state.clearFiles(project, files);
+    const mocker = project.browserMocker;
+    mocker.mocks.forEach((_, id) => {
+      mocker.invalidateModuleById(id);
+    });
+    mocker.mocks.clear();
     const provider = project.browserProvider;
     providers.add(provider);
     const resolvedUrls = (_a = project.browser) == null ? void 0 : _a.resolvedUrls;
@@ -8298,7 +8221,14 @@ function createBrowserPool(ctx) {
     if (!origin)
       throw new Error(`Can't find browser origin URL for project "${project.config.name}"`);
     const promise = waitForTests(project, files);
-    await provider.openPage(new URL("/", origin).toString());
+    const orchestrators = project.browserRpc.orchestrators;
+    if (orchestrators.size) {
+      orchestrators.forEach((orchestrator) => {
+        orchestrator.createTesters(files);
+      });
+    } else {
+      await provider.openPage(new URL("/", origin).toString());
+    }
     await promise;
   };
   const runWorkspaceTests = async (specs) => {
@@ -11423,7 +11353,7 @@ function resolveApiServerConfig(options) {
   return api;
 }
 function resolveConfig(mode, options, viteConfig, logger) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O;
   if (options.dom) {
     if (((_a = viteConfig.test) == null ? void 0 : _a.environment) != null && viteConfig.test.environment !== "happy-dom") {
       logger.console.warn(
@@ -11471,15 +11401,14 @@ function resolveConfig(mode, options, viteConfig, logger) {
   if (resolved.minWorkers)
     resolved.minWorkers = Number(resolved.minWorkers);
   resolved.browser ?? (resolved.browser = {});
-  (_c = resolved.browser).fileParallelism ?? (_c.fileParallelism = resolved.fileParallelism ?? false);
   resolved.fileParallelism ?? (resolved.fileParallelism = mode !== "benchmark");
   if (!resolved.fileParallelism) {
     resolved.maxWorkers = 1;
     resolved.minWorkers = 1;
   }
   if (resolved.inspect || resolved.inspectBrk) {
-    const isSingleThread = resolved.pool === "threads" && ((_e = (_d = resolved.poolOptions) == null ? void 0 : _d.threads) == null ? void 0 : _e.singleThread);
-    const isSingleFork = resolved.pool === "forks" && ((_g = (_f = resolved.poolOptions) == null ? void 0 : _f.forks) == null ? void 0 : _g.singleFork);
+    const isSingleThread = resolved.pool === "threads" && ((_d = (_c = resolved.poolOptions) == null ? void 0 : _c.threads) == null ? void 0 : _d.singleThread);
+    const isSingleFork = resolved.pool === "forks" && ((_f = (_e = resolved.poolOptions) == null ? void 0 : _e.forks) == null ? void 0 : _f.singleFork);
     if (resolved.fileParallelism && !isSingleThread && !isSingleFork) {
       const inspectOption = `--inspect${resolved.inspectBrk ? "-brk" : ""}`;
       throw new Error(`You cannot use ${inspectOption} without "--no-file-parallelism", "poolOptions.threads.singleThread" or "poolOptions.forks.singleFork"`);
@@ -11492,8 +11421,9 @@ function resolveConfig(mode, options, viteConfig, logger) {
     if (reportsDirectory === resolved.root || reportsDirectory === process.cwd())
       throw new Error(`You cannot set "coverage.reportsDirectory" as ${reportsDirectory}. Vitest needs to be able to remove this directory before test run`);
   }
+  resolved.expect ?? (resolved.expect = {});
   resolved.deps ?? (resolved.deps = {});
-  (_h = resolved.deps).moduleDirectories ?? (_h.moduleDirectories = []);
+  (_g = resolved.deps).moduleDirectories ?? (_g.moduleDirectories = []);
   resolved.deps.moduleDirectories = resolved.deps.moduleDirectories.map((dir) => {
     if (!dir.startsWith("/"))
       dir = `/${dir}`;
@@ -11503,17 +11433,17 @@ function resolveConfig(mode, options, viteConfig, logger) {
   });
   if (!resolved.deps.moduleDirectories.includes("/node_modules/"))
     resolved.deps.moduleDirectories.push("/node_modules/");
-  (_i = resolved.deps).optimizer ?? (_i.optimizer = {});
-  (_j = resolved.deps.optimizer).ssr ?? (_j.ssr = {});
-  (_k = resolved.deps.optimizer.ssr).enabled ?? (_k.enabled = true);
-  (_l = resolved.deps.optimizer).web ?? (_l.web = {});
-  (_m = resolved.deps.optimizer.web).enabled ?? (_m.enabled = true);
-  (_n = resolved.deps).web ?? (_n.web = {});
-  (_o = resolved.deps.web).transformAssets ?? (_o.transformAssets = true);
-  (_p = resolved.deps.web).transformCss ?? (_p.transformCss = true);
-  (_q = resolved.deps.web).transformGlobPattern ?? (_q.transformGlobPattern = []);
+  (_h = resolved.deps).optimizer ?? (_h.optimizer = {});
+  (_i = resolved.deps.optimizer).ssr ?? (_i.ssr = {});
+  (_j = resolved.deps.optimizer.ssr).enabled ?? (_j.enabled = true);
+  (_k = resolved.deps.optimizer).web ?? (_k.web = {});
+  (_l = resolved.deps.optimizer.web).enabled ?? (_l.enabled = true);
+  (_m = resolved.deps).web ?? (_m.web = {});
+  (_n = resolved.deps.web).transformAssets ?? (_n.transformAssets = true);
+  (_o = resolved.deps.web).transformCss ?? (_o.transformCss = true);
+  (_p = resolved.deps.web).transformGlobPattern ?? (_p.transformGlobPattern = []);
   resolved.server ?? (resolved.server = {});
-  (_r = resolved.server).deps ?? (_r.deps = {});
+  (_q = resolved.server).deps ?? (_q.deps = {});
   const deprecatedDepsOptions = ["inline", "external", "fallbackCJS"];
   deprecatedDepsOptions.forEach((option) => {
     if (resolved.deps[option] === void 0)
@@ -11538,11 +11468,11 @@ function resolveConfig(mode, options, viteConfig, logger) {
     if ((ssrOptions == null ? void 0 : ssrOptions.noExternal) === true && resolved.server.deps.inline == null) {
       resolved.server.deps.inline = true;
     } else {
-      (_s = resolved.server.deps).inline ?? (_s.inline = []);
+      (_r = resolved.server.deps).inline ?? (_r.inline = []);
       resolved.server.deps.inline.push(...extraInlineDeps);
     }
   }
-  (_t = resolved.server.deps).moduleDirectories ?? (_t.moduleDirectories = []);
+  (_s = resolved.server.deps).moduleDirectories ?? (_s.moduleDirectories = []);
   resolved.server.deps.moduleDirectories.push(...resolved.deps.moduleDirectories);
   if (resolved.runner)
     resolved.runner = resolvePath(resolved.runner, resolved.root);
@@ -11572,11 +11502,11 @@ function resolveConfig(mode, options, viteConfig, logger) {
     resolved.poolOptions = {
       ...resolved.poolOptions,
       threads: {
-        ...(_u = resolved.poolOptions) == null ? void 0 : _u.threads,
+        ...(_t = resolved.poolOptions) == null ? void 0 : _t.threads,
         maxThreads: Number.parseInt(process.env.VITEST_MAX_THREADS)
       },
       vmThreads: {
-        ...(_v = resolved.poolOptions) == null ? void 0 : _v.vmThreads,
+        ...(_u = resolved.poolOptions) == null ? void 0 : _u.vmThreads,
         maxThreads: Number.parseInt(process.env.VITEST_MAX_THREADS)
       }
     };
@@ -11585,11 +11515,11 @@ function resolveConfig(mode, options, viteConfig, logger) {
     resolved.poolOptions = {
       ...resolved.poolOptions,
       threads: {
-        ...(_w = resolved.poolOptions) == null ? void 0 : _w.threads,
+        ...(_v = resolved.poolOptions) == null ? void 0 : _v.threads,
         minThreads: Number.parseInt(process.env.VITEST_MIN_THREADS)
       },
       vmThreads: {
-        ...(_x = resolved.poolOptions) == null ? void 0 : _x.vmThreads,
+        ...(_w = resolved.poolOptions) == null ? void 0 : _w.vmThreads,
         minThreads: Number.parseInt(process.env.VITEST_MIN_THREADS)
       }
     };
@@ -11598,11 +11528,11 @@ function resolveConfig(mode, options, viteConfig, logger) {
     resolved.poolOptions = {
       ...resolved.poolOptions,
       forks: {
-        ...(_y = resolved.poolOptions) == null ? void 0 : _y.forks,
+        ...(_x = resolved.poolOptions) == null ? void 0 : _x.forks,
         maxForks: Number.parseInt(process.env.VITEST_MAX_FORKS)
       },
       vmForks: {
-        ...(_z = resolved.poolOptions) == null ? void 0 : _z.vmForks,
+        ...(_y = resolved.poolOptions) == null ? void 0 : _y.vmForks,
         maxForks: Number.parseInt(process.env.VITEST_MAX_FORKS)
       }
     };
@@ -11611,11 +11541,11 @@ function resolveConfig(mode, options, viteConfig, logger) {
     resolved.poolOptions = {
       ...resolved.poolOptions,
       forks: {
-        ...(_A = resolved.poolOptions) == null ? void 0 : _A.forks,
+        ...(_z = resolved.poolOptions) == null ? void 0 : _z.forks,
         minForks: Number.parseInt(process.env.VITEST_MIN_FORKS)
       },
       vmForks: {
-        ...(_B = resolved.poolOptions) == null ? void 0 : _B.vmForks,
+        ...(_A = resolved.poolOptions) == null ? void 0 : _A.vmForks,
         minForks: Number.parseInt(process.env.VITEST_MIN_FORKS)
       }
     };
@@ -11711,8 +11641,8 @@ function resolveConfig(mode, options, viteConfig, logger) {
     resolved.passWithNoTests ?? (resolved.passWithNoTests = true);
   resolved.css ?? (resolved.css = {});
   if (typeof resolved.css === "object") {
-    (_C = resolved.css).modules ?? (_C.modules = {});
-    (_D = resolved.css.modules).classNameStrategy ?? (_D.classNameStrategy = "stable");
+    (_B = resolved.css).modules ?? (_B.modules = {});
+    (_C = resolved.css.modules).classNameStrategy ?? (_C.classNameStrategy = "stable");
   }
   if (resolved.cache !== false) {
     let cacheDir = VitestCache.resolveCacheDir("", resolve(viteConfig.cacheDir, "vitest"), resolved.name);
@@ -11729,29 +11659,34 @@ function resolveConfig(mode, options, viteConfig, logger) {
   resolved.sequence ?? (resolved.sequence = {});
   if (resolved.sequence.shuffle && typeof resolved.sequence.shuffle === "object") {
     const { files, tests } = resolved.sequence.shuffle;
-    (_E = resolved.sequence).sequencer ?? (_E.sequencer = files ? RandomSequencer : BaseSequencer);
+    (_D = resolved.sequence).sequencer ?? (_D.sequencer = files ? RandomSequencer : BaseSequencer);
     resolved.sequence.shuffle = tests;
   }
-  if (!((_F = resolved.sequence) == null ? void 0 : _F.sequencer)) {
+  if (!((_E = resolved.sequence) == null ? void 0 : _E.sequencer)) {
     resolved.sequence.sequencer = resolved.sequence.shuffle ? RandomSequencer : BaseSequencer;
   }
-  (_G = resolved.sequence).hooks ?? (_G.hooks = "stack");
+  (_F = resolved.sequence).hooks ?? (_F.hooks = "stack");
   if (resolved.sequence.sequencer === RandomSequencer)
-    (_H = resolved.sequence).seed ?? (_H.seed = Date.now());
+    (_G = resolved.sequence).seed ?? (_G.seed = Date.now());
   resolved.typecheck = {
     ...configDefaults.typecheck,
     ...resolved.typecheck
   };
-  resolved.environmentMatchGlobs = (resolved.environmentMatchGlobs || []).map((i) => [resolve(resolved.root, i[0]), i[1]]);
+  resolved.environmentMatchGlobs = (resolved.environmentMatchGlobs || []).map(
+    (i) => [resolve(resolved.root, i[0]), i[1]]
+  );
   resolved.typecheck ?? (resolved.typecheck = {});
-  (_I = resolved.typecheck).enabled ?? (_I.enabled = false);
+  (_H = resolved.typecheck).enabled ?? (_H.enabled = false);
   if (resolved.typecheck.enabled)
     logger.console.warn(c.yellow("Testing types with tsc and vue-tsc is an experimental feature.\nBreaking changes might not follow SemVer, please pin Vitest's version when using it."));
   resolved.browser ?? (resolved.browser = {});
-  (_J = resolved.browser).enabled ?? (_J.enabled = false);
-  (_K = resolved.browser).headless ?? (_K.headless = isCI);
-  (_L = resolved.browser).slowHijackESM ?? (_L.slowHijackESM = false);
-  (_M = resolved.browser).isolate ?? (_M.isolate = true);
+  (_I = resolved.browser).enabled ?? (_I.enabled = false);
+  (_J = resolved.browser).headless ?? (_J.headless = isCI);
+  (_K = resolved.browser).isolate ?? (_K.isolate = true);
+  (_L = resolved.browser).ui ?? (_L.ui = !isCI);
+  (_M = resolved.browser).viewport ?? (_M.viewport = {});
+  (_N = resolved.browser.viewport).width ?? (_N.width = 414);
+  (_O = resolved.browser.viewport).height ?? (_O.height = 896);
   if (resolved.browser.enabled && provider$1 === "stackblitz")
     resolved.browser.provider = "none";
   resolved.browser.api = resolveApiServerConfig(resolved.browser) || {
@@ -12061,6 +11996,8 @@ function MocksPlugin() {
     name: "vitest:mocks",
     enforce: "post",
     transform(code, id) {
+      if (id.includes(distDir))
+        return;
       return hoistMocks(code, id, this.parse);
     }
   };
@@ -12163,6 +12100,157 @@ function resolveFsAllow(projectRoot, rootConfigFile) {
   return [dirname(rootConfigFile), searchForWorkspaceRoot(projectRoot), rootDir];
 }
 
+function setupBrowserRpc(project, server) {
+  var _a;
+  const ctx = project.ctx;
+  const wss = new WebSocketServer$1({ noServer: true });
+  (_a = server.httpServer) == null ? void 0 : _a.on("upgrade", (request, socket, head) => {
+    if (!request.url)
+      return;
+    const { pathname, searchParams } = new URL(request.url, "http://localhost");
+    if (pathname !== BROWSER_API_PATH)
+      return;
+    const type = searchParams.get("type") ?? "tester";
+    const sessionId = searchParams.get("sessionId") ?? "0";
+    wss.handleUpgrade(request, socket, head, (ws) => {
+      wss.emit("connection", ws, request);
+      const rpc = setupClient(sessionId, ws);
+      const rpcs = project.browserRpc;
+      const clients = type === "tester" ? rpcs.testers : rpcs.orchestrators;
+      clients.set(sessionId, rpc);
+      ws.on("close", () => {
+        clients.delete(sessionId);
+      });
+    });
+  });
+  function checkFileAccess(path) {
+    if (!isFileServingAllowed(path, server))
+      throw new Error(`Access denied to "${path}". See Vite config documentation for "server.fs": https://vitejs.dev/config/server-options.html#server-fs-strict.`);
+  }
+  function setupClient(sessionId, ws) {
+    const rpc = createBirpc(
+      {
+        async onUnhandledError(error, type) {
+          ctx.state.catchError(error, type);
+        },
+        async onCollected(files) {
+          ctx.state.collectFiles(files);
+          await ctx.report("onCollected", files);
+        },
+        async onTaskUpdate(packs) {
+          ctx.state.updateTasks(packs);
+          await ctx.report("onTaskUpdate", packs);
+        },
+        onAfterSuiteRun(meta) {
+          var _a2;
+          (_a2 = ctx.coverageProvider) == null ? void 0 : _a2.onAfterSuiteRun(meta);
+        },
+        sendLog(log) {
+          return ctx.report("onUserConsoleLog", log);
+        },
+        resolveSnapshotPath(testPath) {
+          return ctx.snapshot.resolvePath(testPath);
+        },
+        resolveSnapshotRawPath(testPath, rawPath) {
+          return ctx.snapshot.resolveRawPath(testPath, rawPath);
+        },
+        snapshotSaved(snapshot) {
+          ctx.snapshot.add(snapshot);
+        },
+        async readSnapshotFile(snapshotPath) {
+          checkFileAccess(snapshotPath);
+          if (!existsSync(snapshotPath))
+            return null;
+          return promises$1.readFile(snapshotPath, "utf-8");
+        },
+        async saveSnapshotFile(id, content) {
+          checkFileAccess(id);
+          await promises$1.mkdir(dirname(id), { recursive: true });
+          return promises$1.writeFile(id, content, "utf-8");
+        },
+        async removeSnapshotFile(id) {
+          checkFileAccess(id);
+          if (!existsSync(id))
+            throw new Error(`Snapshot file "${id}" does not exist.`);
+          return promises$1.unlink(id);
+        },
+        async getBrowserFileSourceMap(id) {
+          var _a2, _b;
+          const mod = (_a2 = project.browser) == null ? void 0 : _a2.moduleGraph.getModuleById(id);
+          return (_b = mod == null ? void 0 : mod.transformResult) == null ? void 0 : _b.map;
+        },
+        onCancel(reason) {
+          ctx.cancelCurrentRun(reason);
+        },
+        async resolveId(id, importer) {
+          const result = await project.server.pluginContainer.resolveId(id, importer, {
+            ssr: false
+          });
+          return result;
+        },
+        debug(...args) {
+          ctx.logger.console.debug(...args);
+        },
+        getCountOfFailedTests() {
+          return ctx.state.getCountOfFailedTests();
+        },
+        triggerCommand(command, testPath, payload) {
+          var _a2;
+          if (!project.browserProvider)
+            throw new Error("Commands are only available for browser tests.");
+          const commands = (_a2 = project.config.browser) == null ? void 0 : _a2.commands;
+          if (!commands || !commands[command])
+            throw new Error(`Unknown command "${command}".`);
+          return commands[command]({
+            testPath,
+            project,
+            provider: project.browserProvider
+          }, ...payload);
+        },
+        getBrowserFiles() {
+          var _a2;
+          return ((_a2 = project.browserState) == null ? void 0 : _a2.files) ?? [];
+        },
+        finishBrowserTests() {
+          var _a2;
+          return (_a2 = project.browserState) == null ? void 0 : _a2.resolve();
+        },
+        getProvidedContext() {
+          return "ctx" in project ? project.getProvidedContext() : {};
+        },
+        async queueMock(id, importer, hasFactory) {
+          return project.browserMocker.mock(sessionId, id, importer, hasFactory);
+        },
+        async queueUnmock(id, importer) {
+          return project.browserMocker.unmock(id, importer);
+        },
+        resolveMock(rawId, importer) {
+          return project.browserMocker.resolveMock(rawId, importer, false);
+        },
+        invalidateMocks() {
+          const mocker = project.browserMocker;
+          mocker.mocks.forEach((_, id) => {
+            mocker.invalidateModuleById(id);
+          });
+          mocker.mocks.clear();
+        }
+      },
+      {
+        post: (msg) => ws.send(msg),
+        on: (fn) => ws.on("message", fn),
+        eventNames: ["onCancel"],
+        serialize: (data) => stringify(data, stringifyReplace),
+        deserialize: parse$3,
+        onTimeoutError(functionName) {
+          throw new Error(`[vitest-api]: Timeout calling "${functionName}"`);
+        }
+      }
+    );
+    ctx.onCancel((reason) => rpc.onCancel(reason));
+    return rpc;
+  }
+}
+
 async function createBrowserServer(project, configFile) {
   var _a;
   const root = project.config.root;
@@ -12177,12 +12265,11 @@ async function createBrowserServer(project, configFile) {
     // watch is handled by Vitest
     server: {
       hmr: false,
-      watch: {
-        ignored: ["**/**"]
-      }
+      watch: null
     },
     plugins: [
       ...((_a = project.options) == null ? void 0 : _a.plugins) || [],
+      MocksPlugin(),
       (await import('@vitest/browser')).default(project, "/"),
       CoverageTransform(project.ctx),
       {
@@ -12211,16 +12298,18 @@ async function createBrowserServer(project, configFile) {
               alias: (_c = config.test) == null ? void 0 : _c.alias
             },
             server: {
-              watch: null
+              watch: null,
+              preTransformRequests: false
             }
           };
         }
-      },
-      MocksPlugin()
+      }
     ]
   });
   await server.listen();
-  (await Promise.resolve().then(function () { return setup$1; })).setup(project, server);
+  setupBrowserRpc(project, server);
+  if (project.config.browser.ui)
+    setup(project.ctx, server);
   return server;
 }
 
@@ -12243,6 +12332,91 @@ async function getBrowserProvider(options, project) {
   return customProviderModule.default;
 }
 
+var __defProp = Object.defineProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
+var _project;
+class VitestBrowserServerMocker {
+  constructor(project) {
+    // string means it will read from __mocks__ folder
+    // undefined means there is a factory mock that will be called on the server
+    // null means it should be auto mocked
+    __publicField(this, "mocks", /* @__PURE__ */ new Map());
+    // private because the typecheck fails on build if it's exposed
+    // due to a self reference
+    __privateAdd(this, _project);
+    __privateSet(this, _project, project);
+  }
+  async mock(sessionId, rawId, importer, hasFactory) {
+    const { type, mockPath, resolvedId } = await this.resolveMock(rawId, importer, hasFactory);
+    this.invalidateModuleById(resolvedId);
+    if (type === "factory") {
+      this.mocks.set(resolvedId, { sessionId, mock: void 0 });
+      return resolvedId;
+    }
+    this.mocks.set(resolvedId, { sessionId, mock: mockPath });
+    return resolvedId;
+  }
+  async unmock(rawId, importer) {
+    const { id } = await this.resolveId(rawId, importer);
+    this.invalidateModuleById(id);
+    this.mocks.delete(id);
+    return id;
+  }
+  async resolveMock(rawId, importer, hasFactory) {
+    const { id, fsPath, external } = await this.resolveId(rawId, importer);
+    if (hasFactory)
+      return { type: "factory", resolvedId: id };
+    const mockPath = this.resolveMockPath(fsPath, external);
+    return {
+      type: mockPath === null ? "automock" : "redirect",
+      mockPath,
+      resolvedId: id
+    };
+  }
+  invalidateModuleById(id) {
+    const moduleGraph = __privateGet(this, _project).browser.moduleGraph;
+    const module = moduleGraph.getModuleById(id);
+    if (module)
+      moduleGraph.invalidateModule(module, /* @__PURE__ */ new Set(), Date.now(), true);
+  }
+  async resolveId(rawId, importer) {
+    const resolved = await __privateGet(this, _project).browser.pluginContainer.resolveId(rawId, importer, {
+      ssr: false
+    });
+    return __privateGet(this, _project).vitenode.resolveModule(rawId, resolved);
+  }
+  resolveMockPath(mockPath, external) {
+    const path = external || mockPath;
+    if (external || isNodeBuiltin(mockPath) || !existsSync(mockPath)) {
+      const mockDirname = dirname(path);
+      const mockFolder = join(__privateGet(this, _project).config.root, "__mocks__", mockDirname);
+      if (!existsSync(mockFolder))
+        return null;
+      const files = readdirSync(mockFolder);
+      const baseOriginal = basename(path);
+      for (const file of files) {
+        const baseFile = basename(file, extname$1(file));
+        if (baseFile === baseOriginal)
+          return resolve(mockFolder, file);
+      }
+      return null;
+    }
+    const dir = dirname(path);
+    const baseId = basename(path);
+    const fullPath = resolve(dir, "__mocks__", baseId);
+    return existsSync(fullPath) ? fullPath : null;
+  }
+}
+_project = new WeakMap();
+
 function generateCssFilenameHash(filepath) {
   return createHash$2("md5").update(filepath).digest("hex").slice(0, 6);
 }
@@ -12963,17 +13137,12 @@ function WorkspaceVitestPlugin(project, options) {
         hijackVitePluginInject(viteConfig);
       },
       async configureServer(server) {
-        try {
-          const options2 = deepMerge(
-            {},
-            configDefaults,
-            server.config.test || {}
-          );
-          await project.setServer(options2, server);
-        } catch (err) {
-          project.ctx.logger.printError(err, { fullStack: true });
-          process.exit(1);
-        }
+        const options2 = deepMerge(
+          {},
+          configDefaults,
+          server.config.test || {}
+        );
+        await project.setServer(options2, server);
         await server.watcher.close();
       }
     },
@@ -13062,7 +13231,14 @@ class WorkspaceProject {
   browser;
   typechecker;
   closingPromise;
+  // TODO: abstract browser related things and move to @vitest/browser
   browserProvider;
+  browserMocker = new VitestBrowserServerMocker(this);
+  // TODO: I mean, we really need to abstract it
+  browserRpc = {
+    orchestrators: /* @__PURE__ */ new Map(),
+    testers: /* @__PURE__ */ new Map()
+  };
   browserState;
   testFilesList = null;
   id = nanoid();
@@ -13098,35 +13274,21 @@ class WorkspaceProject {
     if (this._globalSetups)
       return;
     this._globalSetups = await loadGlobalSetupFiles(this.runner, this.config.globalSetup);
-    try {
-      for (const globalSetupFile of this._globalSetups) {
-        const teardown = await ((_a = globalSetupFile.setup) == null ? void 0 : _a.call(globalSetupFile, { provide: this.provide, config: this.config }));
-        if (teardown == null || !!globalSetupFile.teardown)
-          continue;
-        if (typeof teardown !== "function")
-          throw new Error(`invalid return value in globalSetup file ${globalSetupFile.file}. Must return a function`);
-        globalSetupFile.teardown = teardown;
-      }
-    } catch (e) {
-      this.logger.error(`
-${c.red(divider(c.bold(c.inverse(" Error during global setup "))))}`);
-      this.logger.printError(e);
-      process.exit(1);
+    for (const globalSetupFile of this._globalSetups) {
+      const teardown = await ((_a = globalSetupFile.setup) == null ? void 0 : _a.call(globalSetupFile, { provide: this.provide, config: this.config }));
+      if (teardown == null || !!globalSetupFile.teardown)
+        continue;
+      if (typeof teardown !== "function")
+        throw new Error(`invalid return value in globalSetup file ${globalSetupFile.file}. Must return a function`);
+      globalSetupFile.teardown = teardown;
     }
   }
   async teardownGlobalSetup() {
     var _a;
     if (!this._globalSetups)
       return;
-    for (const globalSetupFile of [...this._globalSetups].reverse()) {
-      try {
-        await ((_a = globalSetupFile.teardown) == null ? void 0 : _a.call(globalSetupFile));
-      } catch (error) {
-        this.logger.error(`error during global teardown of ${globalSetupFile.file}`, error);
-        this.logger.printError(error);
-        process.exitCode = 1;
-      }
-    }
+    for (const globalSetupFile of [...this._globalSetups].reverse())
+      await ((_a = globalSetupFile.teardown) == null ? void 0 : _a.call(globalSetupFile));
   }
   get logger() {
     return this.ctx.logger;
@@ -13332,8 +13494,11 @@ ${c.red(divider(c.bold(c.inverse(" Error during global setup "))))}`);
       },
       browser: {
         ...this.ctx.config.browser,
+        indexScripts: [],
+        testerScripts: [],
         commands: {}
-      }
+      },
+      printConsoleTrace: this.config.printConsoleTrace ?? this.ctx.config.printConsoleTrace
     }, this.ctx.configOverride || {});
   }
   close() {
@@ -13531,10 +13696,10 @@ class Vitest {
   getProjectByTaskId(taskId) {
     var _a;
     const task = this.state.idMap.get(taskId);
-    const projectName = task.projectName || ((_a = task == null ? void 0 : task.file) == null ? void 0 : _a.projectName);
+    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) {
+  getProjectByName(name = "") {
     return this.projects.find((p) => p.getName() === name) || this.getCoreWorkspaceProject() || this.projects[0];
   }
   async getWorkspaceConfigPath() {
@@ -13624,7 +13789,8 @@ class Vitest {
       "testNamePattern",
       "passWithNoTests",
       "bail",
-      "isolate"
+      "isolate",
+      "printConsoleTrace"
     ];
     const cliOverrides = overridesOptions.reduce((acc, name) => {
       if (name in cliOptions)
@@ -13684,9 +13850,10 @@ class Vitest {
     return Promise.all(this.projects.map((w) => w.initBrowserProvider()));
   }
   async mergeReports() {
+    var _a, _b;
     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);
+    const { files, errors, coverages } = 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();
@@ -13700,8 +13867,8 @@ class Vitest {
       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));
+        var _a2;
+        (_a2 = file.logs) == null ? void 0 : _a2.forEach((log) => this.state.updateUserLog(log));
       });
       this.state.collectFiles(files2);
     }
@@ -13723,9 +13890,11 @@ class Vitest {
     if (hasFailed(files))
       process.exitCode = 1;
     await this.report("onFinished", files, errors);
+    await this.initCoverageProvider();
+    await ((_b = (_a = this.coverageProvider) == null ? void 0 : _a.mergeReports) == null ? void 0 : _b.call(_a, coverages));
   }
   async start(filters) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     this._onClose = [];
     try {
       await this.initCoverageProvider();
@@ -13738,9 +13907,10 @@ class Vitest {
       await this.globTestFiles(filters)
     );
     if (!files.length) {
-      await this.reportCoverage(true);
+      const coverage = await ((_c = (_b = this.coverageProvider) == null ? void 0 : _b.generateCoverage) == null ? void 0 : _c.call(_b, { allTestsRun: true }));
+      await this.reportCoverage(coverage, true);
       this.logger.printNoTestFound(filters);
-      if (!this.config.watch || !(this.config.changed || ((_b = this.config.related) == null ? void 0 : _b.length))) {
+      if (!this.config.watch || !(this.config.changed || ((_d = this.config.related) == null ? void 0 : _d.length))) {
         const exitCode = this.config.passWithNoTests ? 0 : 1;
         process.exit(exitCode);
       }
@@ -13848,7 +14018,7 @@ class Vitest {
     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]
+      ([project, file]) => [{ name: project.config.name, root: project.config.root }, file]
     ));
     await this.runningPromise;
     this._onCancelListeners = [];
@@ -13875,9 +14045,11 @@ class Vitest {
       this.cache.results.updateResults(files);
       await this.cache.results.writeToCache();
     })().finally(async () => {
+      var _a;
       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);
+      const coverage = await ((_a = this.coverageProvider) == null ? void 0 : _a.generateCoverage({ allTestsRun }));
+      await this.report("onFinished", this.state.getFiles(files), this.state.getUnhandledErrors(), coverage);
+      await this.reportCoverage(coverage, allTestsRun);
       this.runningPromise = void 0;
       this.isFirstRun = false;
       this.config.changed = false;
@@ -14109,11 +14281,11 @@ class Vitest {
     }
     return Array.from(new Set(files));
   }
-  async reportCoverage(allTestsRun) {
+  async reportCoverage(coverage, allTestsRun) {
     if (!this.config.coverage.reportOnFailure && this.state.getCountOfFailedTests() > 0)
       return;
     if (this.coverageProvider) {
-      await this.coverageProvider.reportCoverage({ allTestsRun });
+      await this.coverageProvider.reportCoverage(coverage, { allTestsRun });
       for (const reporter of this.reporters) {
         if (reporter instanceof WebSocketReporter)
           reporter.onFinishedReportCoverage();
@@ -21002,7 +21174,7 @@ async function startVitest(mode, cliFilters = [], options = {}, viteOverrides, v
       await ctx.start(cliFilters);
   } catch (e) {
     process.exitCode = 1;
-    await ctx.logger.printError(e, { fullStack: true, type: "Unhandled Error" });
+    ctx.logger.printError(e, { fullStack: true, type: "Unhandled Error" });
     ctx.logger.error("\n\n");
     return ctx;
   }