vitest 1.2.0 → 1.2.2

package/dist/vendor/{execute.3_hyGknJ.js → execute.TxmaEFIQ.js}

@@ -2,12 +2,12 @@ import vm from 'node:vm';
 import { pathToFileURL } from 'node:url';
 import { ViteNodeRunner, DEFAULT_REQUEST_STUBS } from 'vite-node/client';
 import { isNodeBuiltin, isInternalRequest, toFilePath, isPrimitive } from 'vite-node/utils';
-import { resolve, isAbsolute, dirname, join, basename, extname, relative, normalize } from 'pathe';
+import { resolve, isAbsolute, dirname, join, basename, extname, normalize, relative } from 'pathe';
 import { processError } from '@vitest/utils/error';
 import { distDir } from '../path.js';
 import { existsSync, readdirSync } from 'node:fs';
 import { highlight, getType } from '@vitest/utils';
-import { e as getAllMockableProperties } from './base.dzu0Y6Hj.js';
+import { e as getAllMockableProperties } from './base.QYERqzkH.js';
 
 const spyModulePath = resolve(distDir, "spy.js");
 class RefTracker {
@@ -118,7 +118,7 @@ class VitestMocker {
       if (mock.type === "unmock")
         this.unmockPath(fsPath);
       if (mock.type === "mock")
-        this.mockPath(mock.id, fsPath, external, mock.factory, mock.throwIfCached);
+        this.mockPath(mock.id, fsPath, external, mock.factory);
     }));
     VitestMocker.pendingIds = [];
   }
@@ -295,19 +295,8 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
       delete mock[id];
     this.deleteCachedItem(id);
   }
-  mockPath(originalId, path, external, factory, throwIfExists) {
-    var _a, _b, _c, _d;
+  mockPath(originalId, path, external, factory) {
     const id = this.normalizePath(path);
-    const { config } = this.executor.state;
-    const isIsolatedThreads = config.pool === "threads" && (((_b = (_a = config.poolOptions) == null ? void 0 : _a.threads) == null ? void 0 : _b.isolate) ?? true);
-    const isIsolatedForks = config.pool === "forks" && (((_d = (_c = config.poolOptions) == null ? void 0 : _c.forks) == null ? void 0 : _d.isolate) ?? true);
-    if (throwIfExists && (isIsolatedThreads || isIsolatedForks || config.pool === "vmThreads")) {
-      const cached = this.moduleCache.has(id) && this.moduleCache.getByModuleId(id);
-      if (cached && cached.importers.size)
-        throw new Error(`[vitest] Cannot mock "${originalId}" because it is already loaded by "${[...cached.importers.values()].map((i) => relative(this.root, i)).join('", "')}".
-
-Please, remove the import if you want static imports to be mocked, or clear module cache by calling "vi.resetModules()" before mocking if you are going to import the file again. See: https://vitest.dev/guide/common-errors.html#cannot-mock-mocked-file-js-because-it-is-already-loaded`);
-    }
     const suitefile = this.getSuiteFilepath();
     const mocks = this.mockMap.get(suitefile) || {};
     const resolves = this.resolveCache.get(suitefile) || {};

package/dist/vendor/{index.3iX2R_Z5.js → index.LgG0iblq.js}

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

package/dist/vendor/{index.D-jOsMas.js → index.RDKo8czB.js}

@@ -5,7 +5,7 @@ import { distDir } from '../path.js';
 import { g as getWorkerState } from './global.CkGT_TMy.js';
 import { r as rpc } from './rpc.w4v8oCkK.js';
 import { t as takeCoverageInsideWorker } from './coverage.E7sG1b3r.js';
-import { l as loadDiffConfig } from './setup-common.j9IXYrbN.js';
+import { l as loadDiffConfig } from './setup-common.C2iBd0K0.js';
 
 function setupChaiConfig(config) {
   Object.assign(chai.config, config);

package/dist/vendor/{node.xyYo9ZvH.js → node.Zme77R4t.js}

@@ -25,9 +25,9 @@ import nodeos__default from 'node:os';
 import EventEmitter from 'node:events';
 import Tinypool$1, { Tinypool } from 'tinypool';
 import { c as createBirpc } from './index.cAUulNDf.js';
-import { g as groupBy, A as AggregateErrorPonyfill, b as slash$1, t as toArray, a as isPrimitive, d as deepMerge, n as noop$1, c as stdout } from './base.dzu0Y6Hj.js';
+import { g as groupBy, A as AggregateErrorPonyfill, b as slash$1, t as toArray, a as isPrimitive, d as deepMerge, n as noop$1, c as stdout } from './base.QYERqzkH.js';
 import { MessageChannel } from 'node:worker_threads';
-import { createDefer, shuffle, inspect, positionToOffset, lineSplitRE, highlight, toArray as toArray$1, notNullish } from '@vitest/utils';
+import { createDefer, shuffle, highlight, inspect, positionToOffset, lineSplitRE, toArray as toArray$1, notNullish } from '@vitest/utils';
 import { writeFile, rm } from 'node:fs/promises';
 import { performance } from 'node:perf_hooks';
 import { execa } from 'execa';
@@ -35,7 +35,7 @@ import { TraceMap, generatedPositionFor, parseErrorStacktrace } from '@vitest/ut
 import ge from 'module';
 import { ancestor, findNodeAround } from 'acorn-walk';
 import { generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, getTasks, hasFailed, getTests } 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.2PaQ2peU.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.cA9x-5v-.js';
 import { resolveModule, isPackageExists } from 'local-pkg';
 import { isCI, provider as provider$1 } from 'std-env';
 import crypto, { createHash } from 'node:crypto';
@@ -64,7 +64,7 @@ function _mergeNamespaces(n, m) {
   return Object.freeze(n);
 }
 
-var version$1 = "1.2.0";
+var version$1 = "1.2.2";
 
 /*
 How it works:
@@ -3417,7 +3417,8 @@ function createThreadsPool(ctx, { execArgv, env }) {
         await pool.run(data, { transferList: [workerPort], name });
       } catch (error) {
         if (error instanceof Error && /Failed to terminate worker/.test(error.message))
-          ctx.state.addProcessTimeoutCause(`Failed to terminate worker while running ${files.join(", ")}.`);
+          ctx.state.addProcessTimeoutCause(`Failed to terminate worker while running ${files.join(", ")}. 
+See https://vitest.dev/guide/common-errors.html#failed-to-terminate-worker for troubleshooting.`);
         else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
           ctx.state.cancelFiles(files, ctx.config.root, project.config.name);
         else
@@ -3523,7 +3524,8 @@ function createBrowserPool(ctx) {
     });
     const provider = project.browserProvider;
     providers.add(provider);
-    const origin = `http://${((_a = ctx.config.browser.api) == null ? void 0 : _a.host) || "localhost"}:${project.browser.config.server.port}`;
+    const resolvedUrls = (_a = project.browser) == null ? void 0 : _a.resolvedUrls;
+    const origin = (resolvedUrls == null ? void 0 : resolvedUrls.local[0]) ?? (resolvedUrls == null ? void 0 : resolvedUrls.network[0]);
     const paths = files.map((file) => relative(project.config.root, file));
     if (project.config.browser.isolate) {
       for (const path of paths) {
@@ -3704,7 +3706,8 @@ function createVmThreadsPool(ctx, { execArgv, env }) {
         await pool.run(data, { transferList: [workerPort], name });
       } catch (error) {
         if (error instanceof Error && /Failed to terminate worker/.test(error.message))
-          ctx.state.addProcessTimeoutCause(`Failed to terminate worker while running ${files.join(", ")}.`);
+          ctx.state.addProcessTimeoutCause(`Failed to terminate worker while running ${files.join(", ")}. 
+See https://vitest.dev/guide/common-errors.html#failed-to-terminate-worker for troubleshooting.`);
         else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
           ctx.state.cancelFiles(files, ctx.config.root, project.config.name);
         else
@@ -4250,7 +4253,7 @@ function createTypecheckPool(ctx) {
     await ctx.report("onTaskUpdate", checker.getTestPacks());
     if (!project.config.typecheck.ignoreSourceErrors)
       sourceErrors.forEach((error) => ctx.state.catchError(error, "Unhandled Source Error"));
-    const processError = !hasFailed(files) && checker.getExitCode();
+    const processError = !hasFailed(files) && !sourceErrors.length && checker.getExitCode();
     if (processError) {
       const error = new Error(checker.getOutput());
       error.stack = "";
@@ -4475,7 +4478,6 @@ function getMemoryLimit(config) {
 
 const builtinPools = ["forks", "threads", "browser", "vmThreads", "vmForks", "typescript"];
 function createPool(ctx) {
-  var _a;
   const pools = {
     forks: null,
     threads: null,
@@ -4504,7 +4506,14 @@ function createPool(ctx) {
     }
     return getDefaultPoolName(project, file);
   }
-  const conditions = ((_a = ctx.server.config.resolve.conditions) == null ? void 0 : _a.flatMap((c) => ["--conditions", c])) || [];
+  const potentialConditions = /* @__PURE__ */ new Set(["production", "development", ...ctx.server.config.resolve.conditions]);
+  const conditions = [...potentialConditions].filter((condition) => {
+    if (condition === "production")
+      return ctx.server.config.isProduction;
+    if (condition === "development")
+      return !ctx.server.config.isProduction;
+    return true;
+  }).flatMap((c) => ["--conditions", c]);
   const execArgv = process.execArgv.filter(
     (execArg) => execArg.startsWith("--cpu-prof") || execArg.startsWith("--heap-prof") || execArg.startsWith("--diagnostic-dir")
   );
@@ -4567,7 +4576,7 @@ function createPool(ctx) {
       return sequencer.sort(specs);
     }
     await Promise.all(Object.entries(filesByPool).map(async (entry) => {
-      var _a2;
+      var _a;
       const [pool, files2] = entry;
       if (!files2.length)
         return null;
@@ -4578,7 +4587,7 @@ function createPool(ctx) {
         return pools[pool].runTests(specs, invalidate);
       }
       const poolHandler = await resolveCustomPool(pool);
-      pools[_a2 = poolHandler.name] ?? (pools[_a2] = poolHandler);
+      pools[_a = poolHandler.name] ?? (pools[_a] = poolHandler);
       return poolHandler.runTests(specs, invalidate);
     }));
   }
@@ -4587,8 +4596,8 @@ function createPool(ctx) {
     runTests,
     async close() {
       await Promise.all(Object.values(pools).map((p) => {
-        var _a2;
-        return (_a2 = p == null ? void 0 : p.close) == null ? void 0 : _a2.call(p);
+        var _a;
+        return (_a = p == null ? void 0 : p.close) == null ? void 0 : _a.call(p);
       }));
     }
   };
@@ -6573,7 +6582,23 @@ createLogUpdate(process$2.stdout);
 
 createLogUpdate(process$2.stderr);
 
-var version = "1.2.0";
+var version = "1.2.2";
+
+const HIGHLIGHT_SUPPORTED_EXTS = new Set(["js", "ts"].flatMap((lang) => [
+  `.${lang}`,
+  `.m${lang}`,
+  `.c${lang}`,
+  `.${lang}x`,
+  `.m${lang}x`,
+  `.c${lang}x`
+]));
+function highlightCode(id, source, colors) {
+  const ext = extname(id);
+  if (!HIGHLIGHT_SUPPORTED_EXTS.has(ext))
+    return source;
+  const isJsx = ext.endsWith("x");
+  return highlight(source, { jsx: isJsx, colors: colors || c });
+}
 
 async function printError(error, project, options) {
   const { showCodeFrame = true, fullStack = false, type } = options;
@@ -6807,14 +6832,6 @@ const ERASE_DOWN = `${ESC$1}J`;
 const ERASE_SCROLLBACK = `${ESC$1}3J`;
 const CURSOR_TO_START = `${ESC$1}1;1H`;
 const CLEAR_SCREEN = "\x1Bc";
-const HIGHLIGHT_SUPPORTED_EXTS = new Set(["js", "ts"].flatMap((lang) => [
-  `.${lang}`,
-  `.m${lang}`,
-  `.c${lang}`,
-  `.${lang}x`,
-  `.m${lang}x`,
-  `.c${lang}x`
-]));
 class Logger {
   constructor(ctx, console = globalThis.console) {
     this.ctx = ctx;
@@ -6880,11 +6897,7 @@ class Logger {
   highlight(filename, source) {
     if (this._highlights.has(filename))
       return this._highlights.get(filename);
-    const ext = extname(filename);
-    if (!HIGHLIGHT_SUPPORTED_EXTS.has(ext))
-      return source;
-    const isJsx = ext.endsWith("x");
-    const code = highlight(source, { jsx: isJsx, colors: c });
+    const code = highlightCode(filename, source);
     this._highlights.set(filename, code);
     return code;
   }
@@ -6935,12 +6948,13 @@ No ${config.mode} files found, exiting with code 1`));
     if (this.ctx.config.sequence.sequencer === RandomSequencer)
       this.log(c.gray(`      Running tests with seed "${this.ctx.config.sequence.seed}"`));
     this.ctx.projects.forEach((project) => {
-      var _a2;
       if (!project.browser)
         return;
       const name = project.getName();
       const output = project.isCore() ? "" : ` [${name}]`;
-      this.log(c.dim(c.green(`     ${output} Browser runner started at http://${((_a2 = project.config.browser.api) == null ? void 0 : _a2.host) || "localhost"}:${c.bold(`${project.browser.config.server.port}`)}`)));
+      const resolvedUrls = project.browser.resolvedUrls;
+      const origin = (resolvedUrls == null ? void 0 : resolvedUrls.local[0]) ?? (resolvedUrls == null ? void 0 : resolvedUrls.network[0]);
+      this.log(c.dim(c.green(`     ${output} Browser runner started at ${new URL("/", origin)}`)));
     });
     if (this.ctx.config.ui)
       this.log(c.dim(c.green(`      UI started at http://${((_a = this.ctx.config.api) == null ? void 0 : _a.host) || "localhost"}:${c.bold(`${this.ctx.server.config.server.port}`)}${this.ctx.config.uiBase}`)));
@@ -7023,12 +7037,11 @@ function getBetterEnd(code, node) {
     end += 1;
   return end;
 }
-const regexpHoistable = /^[ \t]*\b(vi|vitest)\s*\.\s*(mock|unmock|hoisted)\(/m;
-const regexpAssignedHoisted = /=[ \t]*(\bawait|)[ \t]*\b(vi|vitest)\s*\.\s*hoisted\(/;
+const regexpHoistable = /\b(vi|vitest)\s*\.\s*(mock|unmock|hoisted)\(/;
 const hashbangRE = /^#!.*\n/;
-function hoistMocks(code, id, parse) {
+function hoistMocks(code, id, parse, colors) {
   var _a;
-  const needHoisting = regexpHoistable.test(code) || regexpAssignedHoisted.test(code);
+  const needHoisting = regexpHoistable.test(code);
   if (!needHoisting)
     return;
   const s = new MagicString(code);
@@ -7092,6 +7105,35 @@ ${err.message}`);
   }
   const declaredConst = /* @__PURE__ */ new Set();
   const hoistedNodes = [];
+  function createSyntaxError(node, message) {
+    const _error = new SyntaxError(message);
+    Error.captureStackTrace(_error, createSyntaxError);
+    return {
+      name: "SyntaxError",
+      message: _error.message,
+      stack: _error.stack,
+      frame: generateCodeFrame(highlightCode(id, code, colors), 4, node.start + 1)
+    };
+  }
+  function assertNotDefaultExport(node, error) {
+    var _a2;
+    const defaultExport = (_a2 = findNodeAround(ast, node.start, "ExportDefaultDeclaration")) == null ? void 0 : _a2.node;
+    if ((defaultExport == null ? void 0 : defaultExport.declaration) === node || (defaultExport == null ? void 0 : defaultExport.declaration.type) === "AwaitExpression" && defaultExport.declaration.argument === node)
+      throw createSyntaxError(defaultExport, error);
+  }
+  function assertNotNamedExport(node, error) {
+    var _a2;
+    const nodeExported = (_a2 = findNodeAround(ast, node.start, "ExportNamedDeclaration")) == null ? void 0 : _a2.node;
+    if ((nodeExported == null ? void 0 : nodeExported.declaration) === node)
+      throw createSyntaxError(nodeExported, error);
+  }
+  function getVariableDeclaration(node) {
+    var _a2, _b;
+    const declarationNode = (_a2 = findNodeAround(ast, node.start, "VariableDeclaration")) == null ? void 0 : _a2.node;
+    const init = (_b = declarationNode == null ? void 0 : declarationNode.declarations[0]) == null ? void 0 : _b.init;
+    if (init && (init === node || init.type === "AwaitExpression" && init.argument === node))
+      return declarationNode;
+  }
   esmWalker(ast, {
     onIdentifier(id2, info, parentStack) {
       const binding = idToImportMap.get(id2.name);
@@ -7114,22 +7156,25 @@ ${err.message}`);
       }
     },
     onCallExpression(node) {
-      var _a2, _b, _c;
+      var _a2;
       if (node.callee.type === "MemberExpression" && isIdentifier(node.callee.object) && (node.callee.object.name === "vi" || node.callee.object.name === "vitest") && isIdentifier(node.callee.property)) {
         const methodName = node.callee.property.name;
-        if (methodName === "mock" || methodName === "unmock")
+        if (methodName === "mock" || methodName === "unmock") {
+          const method = `${node.callee.object.name}.${methodName}`;
+          assertNotDefaultExport(node, `Cannot export the result of "${method}". Remove export declaration because "${method}" doesn't return anything.`);
+          const declarationNode = getVariableDeclaration(node);
+          if (declarationNode)
+            assertNotNamedExport(declarationNode, `Cannot export the result of "${method}". Remove export declaration because "${method}" doesn't return anything.`);
           hoistedNodes.push(node);
+        }
         if (methodName === "hoisted") {
-          const declarationNode = (_a2 = findNodeAround(ast, node.start, "VariableDeclaration")) == null ? void 0 : _a2.node;
-          const init = (_b = declarationNode == null ? void 0 : declarationNode.declarations[0]) == null ? void 0 : _b.init;
-          const isViHoisted = (node2) => {
-            return node2.callee.type === "MemberExpression" && isIdentifier(node2.callee.object) && (node2.callee.object.name === "vi" || node2.callee.object.name === "vitest") && isIdentifier(node2.callee.property) && node2.callee.property.name === "hoisted";
-          };
-          const canMoveDeclaration = init && init.type === "CallExpression" && isViHoisted(init) || init && init.type === "AwaitExpression" && init.argument.type === "CallExpression" && isViHoisted(init.argument);
-          if (canMoveDeclaration) {
+          assertNotDefaultExport(node, "Cannot export hoisted variable. You can control hoisting behavior by placing the import from this file first.");
+          const declarationNode = getVariableDeclaration(node);
+          if (declarationNode) {
+            assertNotNamedExport(declarationNode, "Cannot export hoisted variable. You can control hoisting behavior by placing the import from this file first.");
             hoistedNodes.push(declarationNode);
           } else {
-            const awaitedExpression = (_c = findNodeAround(ast, node.start, "AwaitExpression")) == null ? void 0 : _c.node;
+            const awaitedExpression = (_a2 = findNodeAround(ast, node.start, "AwaitExpression")) == null ? void 0 : _a2.node;
             hoistedNodes.push((awaitedExpression == null ? void 0 : awaitedExpression.argument) === node ? awaitedExpression : node);
           }
         }
@@ -7161,14 +7206,10 @@ ${err.message}`);
   function createError(outsideNode, insideNode) {
     const outsideCall = getNodeCall(outsideNode);
     const insideCall = getNodeCall(insideNode);
-    const _error = new SyntaxError(`Cannot call ${getNodeName(insideCall)} inside ${getNodeName(outsideCall)}: both methods are hoisted to the top of the file and not actually called inside each other.`);
-    const error = {
-      name: "SyntaxError",
-      message: _error.message,
-      stack: _error.stack,
-      frame: generateCodeFrame(highlight(code), 4, insideCall.start + 1)
-    };
-    throw error;
+    throw createSyntaxError(
+      insideCall,
+      `Cannot call ${getNodeName(insideCall)} inside ${getNodeName(outsideCall)}: both methods are hoisted to the top of the file and not actually called inside each other.`
+    );
   }
   for (let i = 0; i < hoistedNodes.length; i++) {
     const node = hoistedNodes[i];
@@ -7299,10 +7340,13 @@ function resolveFsAllow(projectRoot, rootConfigFile) {
 }
 
 async function createBrowserServer(project, configFile) {
+  var _a;
   const root = project.config.root;
   await project.ctx.packageInstaller.ensureInstalled("@vitest/browser", root);
   const configPath = typeof configFile === "string" ? configFile : false;
   const server = await createServer({
+    ...project.options,
+    // spread project config inlined in root workspace config
     logLevel: "error",
     mode: project.config.mode,
     configFile: configPath,
@@ -7314,14 +7358,15 @@ async function createBrowserServer(project, configFile) {
       }
     },
     plugins: [
+      ...((_a = project.options) == null ? void 0 : _a.plugins) || [],
       (await import('@vitest/browser')).default(project, "/"),
       CoverageTransform(project.ctx),
       {
         enforce: "post",
         name: "vitest:browser:config",
         async config(config) {
-          var _a, _b, _c;
-          const server2 = resolveApiServerConfig(((_a = config.test) == null ? void 0 : _a.browser) || {}) || {
+          var _a2, _b, _c;
+          const server2 = resolveApiServerConfig(((_a2 = config.test) == null ? void 0 : _a2.browser) || {}) || {
             port: defaultBrowserPort
           };
           server2.middlewareMode = false;
@@ -7351,7 +7396,7 @@ async function createBrowserServer(project, configFile) {
     ]
   });
   await server.listen();
-  (await import('../chunks/api-setup.MAoRkVWJ.js')).setup(project, server);
+  (await import('../chunks/api-setup.srzH0bDf.js')).setup(project, server);
   return server;
 }
 
@@ -7680,7 +7725,7 @@ async function loadGlobalSetupFile(file, runner) {
 
 async function initializeProject(workspacePath, ctx, options) {
   var _a;
-  const project = new WorkspaceProject(workspacePath, ctx);
+  const project = new WorkspaceProject(workspacePath, ctx, options);
   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 : workspacePath.endsWith("/") ? workspacePath : dirname(workspacePath));
   const config = {
@@ -7699,9 +7744,10 @@ async function initializeProject(workspacePath, ctx, options) {
   return project;
 }
 class WorkspaceProject {
-  constructor(path, ctx) {
+  constructor(path, ctx, options) {
     this.path = path;
     this.ctx = ctx;
+    this.options = options;
   }
   configOverride;
   config;
@@ -8294,9 +8340,8 @@ class Vitest {
     this.config.related = void 0;
     if (files.length) {
       await this.cache.stats.populateStats(this.config.root, files);
-      await this.runFiles(files);
+      await this.runFiles(files, true);
     }
-    await this.reportCoverage(true);
     if (this.config.watch)
       await this.report("onWatcherStart");
   }
@@ -8304,6 +8349,7 @@ class Vitest {
     const addImports = async ([project, filepath2]) => {
       if (deps.has(filepath2))
         return;
+      deps.add(filepath2);
       const mod = project.server.moduleGraph.getModuleById(filepath2);
       const transformed = (mod == null ? void 0 : mod.ssrTransformResult) || await project.vitenode.transformRequest(filepath2);
       if (!transformed)
@@ -8312,13 +8358,12 @@ class Vitest {
       await Promise.all(dependencies.map(async (dep) => {
         const path = await project.server.pluginContainer.resolveId(dep, filepath2, { ssr: true });
         const fsPath = path && !path.external && path.id.split("?")[0];
-        if (fsPath && !fsPath.includes("node_modules") && !deps.has(fsPath) && existsSync(fsPath)) {
-          deps.add(fsPath);
+        if (fsPath && !fsPath.includes("node_modules") && !deps.has(fsPath) && existsSync(fsPath))
           await addImports([project, fsPath]);
-        }
       }));
     };
     await addImports(filepath);
+    deps.delete(filepath[1]);
     return deps;
   }
   async filterTestsBySource(specs) {
@@ -8369,7 +8414,7 @@ class Vitest {
     for await (const project of projects)
       await project.initializeGlobalSetup();
   }
-  async runFiles(paths) {
+  async runFiles(paths, allTestsRun) {
     const filepaths = paths.map(([, file]) => file);
     this.state.collectPaths(filepaths);
     await this.report("onPathsCollected", filepaths);
@@ -8377,12 +8422,15 @@ class Vitest {
     this._onCancelListeners = [];
     this.isCancelling = false;
     this.runningPromise = (async () => {
+      var _a;
       if (!this.pool)
         this.pool = createPool(this);
       const invalidates = Array.from(this.invalidates);
       this.invalidates.clear();
       this.snapshot.clear();
       this.state.clearErrors();
+      if (!this.isFirstRun && this.config.coverage.cleanOnRerun)
+        await ((_a = this.coverageProvider) == null ? void 0 : _a.clean());
       await this.initializeGlobalSetup(paths);
       try {
         await this.pool.runTests(paths, invalidates);
@@ -8397,7 +8445,9 @@ class Vitest {
     })().finally(async () => {
       const specs = Array.from(new Set(paths.map(([, p]) => p)));
       await this.report("onFinished", this.state.getFiles(specs), this.state.getUnhandledErrors());
+      await this.reportCoverage(allTestsRun);
       this.runningPromise = void 0;
+      this.isFirstRun = false;
     });
     return await this.runningPromise;
   }
@@ -8410,11 +8460,8 @@ class Vitest {
       const filteredFiles = await this.globTestFiles([this.filenamePattern]);
       files = files.filter((file) => filteredFiles.some((f) => f[1] === file));
     }
-    if (this.coverageProvider && this.config.coverage.cleanOnRerun)
-      await this.coverageProvider.clean();
     await this.report("onWatcherRerun", files, trigger);
-    await this.runFiles(files.flatMap((file) => this.getProjectsByTestFile(file)));
-    await this.reportCoverage(!trigger);
+    await this.runFiles(files.flatMap((file) => this.getProjectsByTestFile(file)), !trigger);
     await this.report("onWatcherStart", this.state.getFiles(files));
   }
   async changeProjectName(pattern) {
@@ -8482,13 +8529,10 @@ class Vitest {
           return;
       }
       this.changedTests.clear();
-      if (this.coverageProvider && this.config.coverage.cleanOnRerun)
-        await this.coverageProvider.clean();
       const triggerIds = new Set(triggerId.map((id) => relative(this.config.root, id)));
       const triggerLabel = Array.from(triggerIds).join(", ");
       await this.report("onWatcherRerun", files, triggerLabel);
-      await this.runFiles(files.flatMap((file) => this.getProjectsByTestFile(file)));
-      await this.reportCoverage(false);
+      await this.runFiles(files.flatMap((file) => this.getProjectsByTestFile(file)), false);
       await this.report("onWatcherStart", this.state.getFiles(files));
     }, WATCHER_DEBOUNCE);
   }
@@ -8542,6 +8586,10 @@ class Vitest {
         this.projectsTestFiles.set(id, new Set(matchingProjects));
         this.changedTests.add(id);
         this.scheduleRerun([id]);
+      } else {
+        const needsRerun = this.handleFileChanged(id);
+        if (needsRerun.length)
+          this.scheduleRerun(needsRerun);
       }
     };
     const watcher = this.server.watcher;
@@ -8833,7 +8881,7 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
         try {
           await ctx.setServer(options, server, userConfig);
           if (options.api && options.watch)
-            (await import('../chunks/api-setup.MAoRkVWJ.js')).setup(ctx);
+            (await import('../chunks/api-setup.srzH0bDf.js')).setup(ctx);
         } catch (err) {
           await ctx.logger.printError(err, { fullStack: true });
           process.exit(1);

package/dist/vendor/{reporters.2PaQ2peU.js → reporters.cA9x-5v-.js}

@@ -1,9 +1,9 @@
 import { performance } from 'node:perf_hooks';
 import c from 'picocolors';
 import { b as isNode, c as relativePath } from './index.rJjbcrrp.js';
-import { UNKNOWN_TEST_ID } from '../chunks/runtime-console.hf2msWA9.js';
+import { UNKNOWN_TEST_ID } from '../chunks/runtime-console.Iloo9fIt.js';
 import { isAbsolute, relative, dirname, basename, resolve } from 'pathe';
-import { b as slash, t as toArray } from './base.dzu0Y6Hj.js';
+import { b as slash, t as toArray } from './base.QYERqzkH.js';
 import { g as getFullName, h as hasFailedSnapshot } from './tasks.IknbGB2n.js';
 import { getSafeTimers, notNullish } from '@vitest/utils';
 import { isCI } from 'std-env';

package/dist/vendor/{setup-common.j9IXYrbN.js → setup-common.C2iBd0K0.js}

@@ -10,7 +10,7 @@ async function setupCommonEnv(config) {
   globalSetup = true;
   setSafeTimers();
   if (config.globals)
-    (await import('../chunks/integrations-globals.VbxbZ7hn.js')).registerApiGlobally();
+    (await import('../chunks/integrations-globals.J_6tnlri.js')).registerApiGlobally();
 }
 function setupDefines(defines) {
   for (const key in defines)

package/dist/vendor/{vi.smj1Ggd4.js → vi.PPwhENHF.js}

@@ -9,7 +9,7 @@ import { g as getFullName } from './tasks.IknbGB2n.js';
 import { g as getWorkerState, a as getCurrentEnvironment } from './global.CkGT_TMy.js';
 import { getSafeTimers, assertTypes, createSimpleStackTrace } from '@vitest/utils';
 import { parseSingleStack } from '@vitest/utils/source-map';
-import { i as isChildProcess } from './base.dzu0Y6Hj.js';
+import { i as isChildProcess } from './base.QYERqzkH.js';
 import { R as RealDate, r as resetDate, m as mockDate } from './date.Ns1pGd_X.js';
 import { spyOn, fn, isMockFunction, mocks } from '@vitest/spy';
 
@@ -3036,6 +3036,7 @@ defaultImplementation.install;
 var withGlobal_1 = withGlobal;
 
 class FakeTimers {
+  _global;
   _clock;
   _fakingTime;
   _fakingDate;
@@ -3050,6 +3051,7 @@ class FakeTimers {
     this._fakingDate = false;
     this._fakingTime = false;
     this._fakeTimers = withGlobal_1(global);
+    this._global = global;
   }
   clearAllTimers() {
     if (this._fakingTime)
@@ -3118,7 +3120,7 @@ class FakeTimers {
     }
   }
   useFakeTimers() {
-    var _a, _b;
+    var _a, _b, _c;
     if (this._fakingDate) {
       throw new Error(
         '"setSystemTime" was called already and date was mocked. Reset timers using `vi.useRealTimers()` if you want to use fake timers again.'
@@ -3128,10 +3130,19 @@ class FakeTimers {
       const toFake = Object.keys(this._fakeTimers.timers).filter((timer) => timer !== "nextTick");
       if (((_b = (_a = this._userConfig) == null ? void 0 : _a.toFake) == null ? void 0 : _b.includes("nextTick")) && isChildProcess())
         throw new Error("process.nextTick cannot be mocked inside child_process");
+      const existingFakedMethods = (((_c = this._userConfig) == null ? void 0 : _c.toFake) || toFake).filter((method) => {
+        switch (method) {
+          case "setImmediate":
+          case "clearImmediate":
+            return method in this._global && this._global[method];
+          default:
+            return true;
+        }
+      });
       this._clock = this._fakeTimers.install({
         now: Date.now(),
-        toFake,
-        ...this._userConfig
+        ...this._userConfig,
+        toFake: existingFakedMethods
       });
       this._fakingTime = true;
     }