vitest 0.16.0 → 0.18.0

package/dist/{chunk-install-pkg.3fa50769.mjs → chunk-install-pkg.2dcb2c04.mjs}

@@ -2,7 +2,7 @@ import path$2 from 'path';
 import fs$2 from 'fs';
 import require$$0 from 'util';
 import childProcess$1 from 'child_process';
-import { p as pathKey, s as signalExit, m as mergeStream$1, g as getStream$1, c as crossSpawn$1, o as onetime$1 } from './vendor-index.e5dc6622.mjs';
+import { p as pathKey, s as signalExit, m as mergeStream$1, g as getStream$1, c as crossSpawn$1, o as onetime$1 } from './vendor-index.4bf9c627.mjs';
 import require$$0$1 from 'os';
 import './vendor-_commonjsHelpers.4da45ef5.mjs';
 import 'assert';

package/dist/{chunk-integrations-globals.d0c363a6.mjs → chunk-integrations-globals.61e4d6ae.mjs}

@@ -1,21 +1,21 @@
-import { g as globalApis } from './chunk-constants.7b9cfc82.mjs';
-import { i as index } from './vendor-entry.efeeaa5c.mjs';
+import { g as globalApis } from './chunk-constants.8eb2ed35.mjs';
+import { i as index } from './vendor-entry.78de67ab.mjs';
 import 'url';
-import './chunk-utils-global.79a8b1cc.mjs';
+import './chunk-utils-global.1b22c4fd.mjs';
 import 'tty';
 import 'local-pkg';
 import 'path';
 import 'fs';
-import './chunk-runtime-chain.7103058b.mjs';
+import './chunk-env-node.26c72624.mjs';
+import 'module';
+import './chunk-runtime-chain.eb764dff.mjs';
 import 'chai';
 import './vendor-_commonjsHelpers.4da45ef5.mjs';
-import './chunk-runtime-rpc.5e78af38.mjs';
-import './chunk-utils-source-map.2556cba8.mjs';
+import './chunk-runtime-rpc.cc6a06a2.mjs';
+import './chunk-utils-source-map.957e7756.mjs';
 import './chunk-integrations-spy.674b628e.mjs';
 import 'tinyspy';
 import 'util';
-import './chunk-defaults.dc6dc23d.mjs';
-import 'module';
 
 function registerApiGlobally() {
   globalApis.forEach((api) => {

package/dist/{chunk-runtime-chain.7103058b.mjs → chunk-runtime-chain.eb764dff.mjs}

@@ -1,31 +1,12 @@
 import chai$1, { expect, AssertionError, util } from 'chai';
 import { c as commonjsGlobal } from './vendor-_commonjsHelpers.4da45ef5.mjs';
-import { r as rpc } from './chunk-runtime-rpc.5e78af38.mjs';
-import { i as isObject, j as join, d as dirname, g as getCallLastIndex, s as slash, a as getWorkerState, b as getNames, c as assertTypes, p as picocolors, e as getFullName, f as safeSetTimeout, h as safeClearTimeout, n as noop, r as resetModules } from './chunk-utils-global.79a8b1cc.mjs';
+import { r as rpc } from './chunk-runtime-rpc.cc6a06a2.mjs';
+import { i as isObject, j as join, d as dirname, g as getCallLastIndex, s as slash, a as getWorkerState, b as getNames, c as assertTypes, p as picocolors, e as getFullName, f as safeSetTimeout, h as safeClearTimeout, n as noop, R as RealDate, r as resetDate, m as mockDate, k as resetModules } from './chunk-utils-global.1b22c4fd.mjs';
 import fs, { promises } from 'fs';
-import { p as plugins_1, f as format_1, g as getOriginalPos, a as posToNumber, n as numberToPos, l as lineSplitRE, b as parseStacktrace, u as unifiedDiff, s as stringify, m as matcherUtils } from './chunk-utils-source-map.2556cba8.mjs';
+import { p as plugins_1, f as format_1, g as getOriginalPos, a as posToNumber, n as numberToPos, l as lineSplitRE, b as parseStacktrace, u as unifiedDiff, s as stringify, m as matcherUtils } from './chunk-utils-source-map.957e7756.mjs';
 import { i as isMockFunction, s as spyOn, f as fn, a as spies } from './chunk-integrations-spy.674b628e.mjs';
 import require$$0, { format } from 'util';
 
-var __defProp$5 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 function createChainable(keys, fn) {
   function create(obj) {
     const chain2 = function(...args) {
@@ -34,7 +15,7 @@ function createChainable(keys, fn) {
     for (const key of keys) {
       Object.defineProperty(chain2, key, {
         get() {
-          return create(__spreadProps$2(__spreadValues$5({}, obj), { [key]: true }));
+          return create({ ...obj, [key]: true });
         }
       });
     }
@@ -466,22 +447,6 @@ const addSerializer = (plugin) => {
 };
 const getSerializers = () => PLUGINS;
 
-var __defProp$4 = Object.defineProperty;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
-    }
-  return a;
-};
 const SNAPSHOT_VERSION = "1";
 const writeSnapshotVersion = () => `// Vitest Snapshot v${SNAPSHOT_VERSION}`;
 const testNameToKey = (testName, count) => `${testName} ${count}`;
@@ -514,12 +479,13 @@ const removeExtraLineBreaks = (string) => string.length > 2 && string.startsWith
 const escapeRegex = true;
 const printFunctionName = false;
 function serialize(val, indent = 2, formatOverrides = {}) {
-  return normalizeNewlines(format_1(val, __spreadValues$4({
+  return normalizeNewlines(format_1(val, {
     escapeRegex,
     indent,
     plugins: getSerializers(),
-    printFunctionName
-  }, formatOverrides)));
+    printFunctionName,
+    ...formatOverrides
+  }));
 }
 function escapeBacktickString(str) {
   return str.replace(/`|\\|\${/g, "\\$&");
@@ -581,7 +547,7 @@ function deepMergeArray(target = [], source = []) {
 }
 function deepMergeSnapshot(target, source) {
   if (isObject(target) && isObject(source)) {
-    const mergedOutput = __spreadValues$4({}, target);
+    const mergedOutput = { ...target };
     Object.keys(source).forEach((key) => {
       if (isObject(source[key]) && !source[key].$$typeof) {
         if (!(key in target))
@@ -694,22 +660,6 @@ function stripSnapshotIndentation(inlineSnapshot) {
   return inlineSnapshot;
 }
 
-var __defProp$3 = Object.defineProperty;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
-    }
-  return a;
-};
 class SnapshotState {
   constructor(testFilePath, snapshotPath, options) {
     this.testFilePath = testFilePath;
@@ -727,9 +677,10 @@ class SnapshotState {
     this.unmatched = 0;
     this._updateSnapshot = options.updateSnapshot;
     this.updated = 0;
-    this._snapshotFormat = __spreadValues$3({
-      printBasicPrototype: false
-    }, options.snapshotFormat);
+    this._snapshotFormat = {
+      printBasicPrototype: false,
+      ...options.snapshotFormat
+    };
   }
   markSnapshotsAsCheckedForTest(testName) {
     this._uncheckedKeys.forEach((uncheckedKey) => {
@@ -756,9 +707,10 @@ class SnapshotState {
 ${JSON.stringify(stacks)}`);
       }
       stack.column--;
-      this._inlineSnapshots.push(__spreadValues$3({
-        snapshot: receivedSerialized
-      }, stack));
+      this._inlineSnapshots.push({
+        snapshot: receivedSerialized,
+        ...stack
+      });
     } else {
       this._snapshotData[key] = receivedSerialized;
     }
@@ -992,13 +944,21 @@ function getSnapshotClient() {
     _client = new SnapshotClient();
   return _client;
 }
-const getErrorString = (expected) => {
+const getErrorMessage = (err) => {
+  if (err instanceof Error)
+    return err.message;
+  return err;
+};
+const getErrorString = (expected, promise) => {
+  if (typeof expected !== "function") {
+    if (!promise)
+      throw new Error(`expected must be a function, received ${typeof expected}`);
+    return getErrorMessage(expected);
+  }
   try {
     expected();
   } catch (e) {
-    if (e instanceof Error)
-      return e.message;
-    return e;
+    return getErrorMessage(e);
   }
   throw new Error("snapshot function didn't threw");
 };
@@ -1048,9 +1008,10 @@ const SnapshotPlugin = (chai, utils) => {
   utils.addMethod(chai.Assertion.prototype, "toThrowErrorMatchingSnapshot", function(message) {
     const expected = utils.flag(this, "object");
     const test = utils.flag(this, "vitest-test");
+    const promise = utils.flag(this, "promise");
     const errorMessage = utils.flag(this, "message");
     getSnapshotClient().assert({
-      received: getErrorString(expected),
+      received: getErrorString(expected, promise),
       test,
       message,
       errorMessage
@@ -1060,9 +1021,10 @@ const SnapshotPlugin = (chai, utils) => {
     const expected = utils.flag(this, "object");
     const error = utils.flag(this, "error");
     const test = utils.flag(this, "vitest-test");
+    const promise = utils.flag(this, "promise");
     const errorMessage = utils.flag(this, "message");
     getSnapshotClient().assert({
-      received: getErrorString(expected),
+      received: getErrorString(expected, promise),
       test,
       message,
       inlineSnapshot,
@@ -1500,25 +1462,6 @@ function toString(value) {
   }
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class AsymmetricMatcher {
   constructor(sample, inverse = false) {
     this.sample = sample;
@@ -1526,11 +1469,12 @@ class AsymmetricMatcher {
     this.$$typeof = Symbol.for("jest.asymmetricMatcher");
   }
   getMatcherContext(expect) {
-    return __spreadProps$1(__spreadValues$2({}, getState(expect || globalThis[GLOBAL_EXPECT])), {
+    return {
+      ...getState(expect || globalThis[GLOBAL_EXPECT]),
       equals,
       isNot: this.inverse,
       utils: matcherUtils
-    });
+    };
   }
 }
 class StringContaining extends AsymmetricMatcher {
@@ -1700,42 +1644,25 @@ const JestAsymmetricMatchers = (chai, utils) => {
   };
 };
 
-var __defProp$1 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 const isAsyncFunction = (fn) => typeof fn === "function" && fn[Symbol.toStringTag] === "AsyncFunction";
 const getMatcherState = (assertion, expect) => {
   const obj = assertion._obj;
   const isNot = util.flag(assertion, "negate");
   const promise = util.flag(assertion, "promise") || "";
-  const jestUtils = __spreadProps(__spreadValues$1({}, matcherUtils), {
+  const jestUtils = {
+    ...matcherUtils,
     iterableEquality,
     subsetEquality
-  });
-  const matcherState = __spreadProps(__spreadValues$1({}, getState(expect)), {
+  };
+  const matcherState = {
+    ...getState(expect),
     isNot,
     utils: jestUtils,
     promise,
     equals,
     suppressedErrors: [],
     snapshotState: getSnapshotClient().snapshotState
-  });
+  };
   return {
     state: matcherState,
     isNot,
@@ -1957,7 +1884,8 @@ function formatTitle(template, items, idx) {
 }
 const describe = suite;
 const it = test;
-const defaultSuite = suite("");
+const workerState = getWorkerState();
+const defaultSuite = workerState.config.sequence.shuffle ? suite.shuffle("") : suite("");
 function clearCollectorContext() {
   collectorContext.tasks.length = 0;
   defaultSuite.clear();
@@ -1975,7 +1903,7 @@ function createSuiteHooks() {
   };
 }
 function createSuiteCollector(name, factory = () => {
-}, mode, concurrent) {
+}, mode, concurrent, shuffle) {
   const tasks = [];
   const factoryQueue = [];
   let suite2;
@@ -1992,6 +1920,8 @@ function createSuiteCollector(name, factory = () => {
     };
     if (this.concurrent || concurrent)
       test3.concurrent = true;
+    if (shuffle)
+      test3.shuffle = true;
     const context = createTestContext(test3);
     Object.defineProperty(test3, "context", {
       value: context,
@@ -2019,6 +1949,7 @@ function createSuiteCollector(name, factory = () => {
       type: "suite",
       name,
       mode,
+      shuffle,
       tasks: []
     };
     setHooks(suite2, createSuiteHooks());
@@ -2048,9 +1979,9 @@ function createSuiteCollector(name, factory = () => {
   return collector;
 }
 function createSuite() {
-  const suite2 = createChainable(["concurrent", "skip", "only", "todo"], function(name, factory) {
+  const suite2 = createChainable(["concurrent", "shuffle", "skip", "only", "todo"], function(name, factory) {
     const mode = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
-    return createSuiteCollector(name, factory, mode, this.concurrent);
+    return createSuiteCollector(name, factory, mode, this.concurrent, this.shuffle);
   });
   suite2.each = (cases) => {
     return (name, fn) => {
@@ -4621,71 +4552,6 @@ defaultImplementation.createClock;
 defaultImplementation.install;
 var withGlobal_1 = withGlobal;
 
-const RealDate = Date;
-let now = null;
-class MockDate extends RealDate {
-  constructor(y, m, d, h, M, s, ms) {
-    super();
-    let date;
-    switch (arguments.length) {
-      case 0:
-        if (now !== null)
-          date = new RealDate(now.valueOf());
-        else
-          date = new RealDate();
-        break;
-      case 1:
-        date = new RealDate(y);
-        break;
-      default:
-        d = typeof d === "undefined" ? 1 : d;
-        h = h || 0;
-        M = M || 0;
-        s = s || 0;
-        ms = ms || 0;
-        date = new RealDate(y, m, d, h, M, s, ms);
-        break;
-    }
-    return date;
-  }
-}
-MockDate.UTC = RealDate.UTC;
-MockDate.now = function() {
-  return new MockDate().valueOf();
-};
-MockDate.parse = function(dateString) {
-  return RealDate.parse(dateString);
-};
-MockDate.toString = function() {
-  return RealDate.toString();
-};
-function mockDate(date) {
-  const dateObj = new RealDate(date.valueOf());
-  if (isNaN(dateObj.getTime()))
-    throw new TypeError(`mockdate: The time set is an invalid date: ${date}`);
-  globalThis.Date = MockDate;
-  now = dateObj.valueOf();
-}
-function resetDate() {
-  globalThis.Date = RealDate;
-}
-
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 class FakeTimers {
   constructor({
     global,
@@ -4747,10 +4613,11 @@ class FakeTimers {
     }
     if (!this._fakingTime) {
       const toFake = Object.keys(this._fakeTimers.timers);
-      this._clock = this._fakeTimers.install(__spreadValues({
+      this._clock = this._fakeTimers.install({
         now: Date.now(),
-        toFake
-      }, this._userConfig));
+        toFake,
+        ...this._userConfig
+      });
       this._fakingTime = true;
     }
   }
@@ -4932,4 +4799,4 @@ function isWatchMode() {
   return getRunningMode() === "watch";
 }
 
-export { getState as A, GLOBAL_EXPECT as G, RealDate as R, isFirstRun as a, beforeAll as b, afterAll as c, describe as d, beforeEach as e, afterEach as f, createExpect as g, globalExpect as h, it as i, vi as j, getRunningMode as k, isWatchMode as l, resetRunOnceCounter as m, clearCollectorContext as n, defaultSuite as o, setHooks as p, getHooks as q, runOnce as r, suite as s, test as t, collectorContext as u, vitest as v, withCallback as w, getSnapshotClient as x, setState as y, getFn as z };
+export { getState as A, GLOBAL_EXPECT as G, isFirstRun as a, beforeAll as b, afterAll as c, describe as d, beforeEach as e, afterEach as f, createExpect as g, globalExpect as h, it as i, vi as j, getRunningMode as k, isWatchMode as l, resetRunOnceCounter as m, clearCollectorContext as n, defaultSuite as o, setHooks as p, getHooks as q, runOnce as r, suite as s, test as t, collectorContext as u, vitest as v, withCallback as w, getSnapshotClient as x, setState as y, getFn as z };

package/dist/{chunk-runtime-mocker.110e3634.mjs → chunk-runtime-mocker.79ccc3de.mjs}

@@ -1,43 +1,23 @@
-import { n as normalizeRequestId, i as isNodeBuiltin, b as toFilePath, V as ViteNodeRunner } from './chunk-vite-node-utils.7450fc0c.mjs';
+import { n as normalizeRequestId, i as isNodeBuiltin, b as toFilePath, V as ViteNodeRunner } from './chunk-vite-node-utils.af8ead96.mjs';
 import { normalizePath } from 'vite';
-import { a as getWorkerState, J as isWindows, K as mergeSlashes, d as dirname, m as resolve, l as basename, L as getType, M as getAllProperties, s as slash } from './chunk-utils-global.79a8b1cc.mjs';
+import { a as getWorkerState, M as isWindows, N as mergeSlashes, d as dirname, j as join, o as basename, q as resolve, O as getType, P as getAllProperties, s as slash } from './chunk-utils-global.1b22c4fd.mjs';
 import { existsSync, readdirSync } from 'fs';
-import { d as distDir } from './chunk-constants.7b9cfc82.mjs';
+import { d as distDir } from './chunk-constants.8eb2ed35.mjs';
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 const _VitestMocker = class {
   constructor(options, moduleCache, request) {
     this.options = options;
     this.moduleCache = moduleCache;
-    this.callbacks = {};
-    this.root = this.options.root;
     this.request = request;
   }
-  get mockMap() {
-    return this.options.mockMap;
+  get root() {
+    return this.options.root;
   }
-  on(event, cb) {
-    var _a;
-    (_a = this.callbacks)[event] ?? (_a[event] = []);
-    this.callbacks[event].push(cb);
+  get base() {
+    return this.options.base;
   }
-  emit(event, ...args) {
-    (this.callbacks[event] ?? []).forEach((fn) => fn(...args));
+  get mockMap() {
+    return this.options.mockMap;
   }
   getSuiteFilepath() {
     return getWorkerState().filepath || "global";
@@ -46,7 +26,10 @@ const _VitestMocker = class {
     const suite = this.getSuiteFilepath();
     const suiteMocks = this.mockMap.get(suite);
     const globalMocks = this.mockMap.get("global");
-    return __spreadValues(__spreadValues({}, globalMocks), suiteMocks);
+    return {
+      ...globalMocks,
+      ...suiteMocks
+    };
   }
   async resolvePath(id, importer) {
     const path = await this.options.resolveId(id, importer);
@@ -73,17 +56,14 @@ const _VitestMocker = class {
     if (cached)
       return cached;
     const exports = await mock();
-    this.emit("mocked", cacheName, { exports });
+    this.moduleCache.set(cacheName, { exports });
     return exports;
   }
   getDependencyMock(dep) {
-    return this.getMocks()[this.resolveDependency(dep)];
-  }
-  resolveDependency(dep) {
-    return normalizeRequestId(dep.replace(this.root, "")).replace(/^\/@fs\//, isWindows ? "" : "/");
+    return this.getMocks()[this.normalizePath(dep)];
   }
   normalizePath(path) {
-    return normalizeRequestId(path.replace(this.root, "")).replace(/^\/@fs\//, isWindows ? "" : "/");
+    return normalizeRequestId(path.replace(this.root, ""), this.base).replace(/^\/@fs\//, isWindows ? "" : "/");
   }
   getFsPath(path, external) {
     if (external)
@@ -94,7 +74,7 @@ const _VitestMocker = class {
     const path = normalizeRequestId(external || mockPath);
     if (external || isNodeBuiltin(mockPath) || !existsSync(mockPath)) {
       const mockDirname = dirname(path);
-      const mockFolder = resolve(this.root, "__mocks__", mockDirname);
+      const mockFolder = join(this.root, "__mocks__", mockDirname);
       if (!existsSync(mockFolder))
         return null;
       const files = readdirSync(mockFolder);
@@ -102,14 +82,14 @@ const _VitestMocker = class {
       for (const file of files) {
         const [basename2] = file.split(".");
         if (basename2 === baseFilename)
-          return resolve(mockFolder, file).replace(this.root, "");
+          return resolve(mockFolder, file);
       }
       return null;
     }
     const dir = dirname(path);
     const baseId = basename(path);
     const fullPath = resolve(dir, "__mocks__", baseId);
-    return existsSync(fullPath) ? fullPath.replace(this.root, "") : null;
+    return existsSync(fullPath) ? fullPath : null;
   }
   mockValue(value) {
     if (!_VitestMocker.spyModule) {
@@ -135,17 +115,17 @@ const _VitestMocker = class {
   }
   unmockPath(path) {
     const suitefile = this.getSuiteFilepath();
-    const fsPath = this.normalizePath(path);
+    const id = this.normalizePath(path);
     const mock = this.mockMap.get(suitefile);
-    if (mock == null ? void 0 : mock[fsPath])
-      delete mock[fsPath];
+    if (mock == null ? void 0 : mock[id])
+      delete mock[id];
   }
   mockPath(path, external, factory) {
     const suitefile = this.getSuiteFilepath();
-    const fsPath = this.normalizePath(path);
-    if (!this.mockMap.has(suitefile))
-      this.mockMap.set(suitefile, {});
-    this.mockMap.get(suitefile)[fsPath] = factory || this.resolveMockPath(path, external);
+    const id = this.normalizePath(path);
+    const mocks = this.mockMap.get(suitefile) || {};
+    mocks[id] = factory || this.resolveMockPath(path, external);
+    this.mockMap.set(suitefile, mocks);
   }
   async importActual(id, importer) {
     const { path, external } = await this.resolvePath(id, importer);
@@ -155,17 +135,17 @@ const _VitestMocker = class {
   }
   async importMock(id, importer) {
     const { path, external } = await this.resolvePath(id, importer);
-    let mock = this.getDependencyMock(path);
+    const fsPath = this.getFsPath(path, external);
+    let mock = this.getDependencyMock(fsPath);
     if (mock === void 0)
-      mock = this.resolveMockPath(path, external);
+      mock = this.resolveMockPath(fsPath, external);
     if (mock === null) {
       await this.ensureSpy();
-      const fsPath = this.getFsPath(path, external);
       const mod = await this.request(fsPath);
       return this.mockValue(mod);
     }
     if (typeof mock === "function")
-      return this.callFunctionMock(path, mock);
+      return this.callFunctionMock(fsPath, mock);
     return this.requestWithMock(mock);
   }
   async ensureSpy() {
@@ -175,8 +155,10 @@ const _VitestMocker = class {
   }
   async requestWithMock(dep) {
     var _a;
-    await this.ensureSpy();
-    await this.resolveMocks();
+    await Promise.all([
+      this.ensureSpy(),
+      this.resolveMocks()
+    ]);
     const mock = this.getDependencyMock(dep);
     const callstack = this.request.callstack;
     if (mock === null) {
@@ -187,7 +169,7 @@ const _VitestMocker = class {
       const cacheKey = toFilePath(dep, this.root);
       const mod = ((_a = this.moduleCache.get(cacheKey)) == null ? void 0 : _a.exports) || await this.request(dep);
       const exports = this.mockValue(mod);
-      this.emit("mocked", cacheName, { exports });
+      this.moduleCache.set(cacheName, { exports });
       return exports;
     }
     if (typeof mock === "function" && !callstack.includes(`mock:${dep}`)) {
@@ -207,9 +189,6 @@ const _VitestMocker = class {
   queueUnmock(id, importer) {
     _VitestMocker.pendingIds.push({ type: "unmock", id, importer });
   }
-  withRequest(request) {
-    return new _VitestMocker(this.options, this.moduleCache, request);
-  }
 };
 let VitestMocker = _VitestMocker;
 VitestMocker.pendingIds = [];
@@ -226,16 +205,11 @@ class VitestRunner extends ViteNodeRunner {
   constructor(options) {
     super(options);
     this.options = options;
-    this.entries = /* @__PURE__ */ new Set();
-    this.mocker = new VitestMocker(options, this.moduleCache);
   }
   prepareContext(context) {
     const request = context.__vite_ssr_import__;
     const resolveId = context.__vitest_resolve_id__;
-    const mocker = this.mocker.withRequest(request);
-    mocker.on("mocked", (dep, module) => {
-      this.moduleCache.set(dep, module);
-    });
+    const mocker = new VitestMocker(this.options, this.moduleCache, request);
     const workerState = getWorkerState();
     if (workerState.filepath && normalizePath(workerState.filepath) === normalizePath(context.__filename)) {
       Object.defineProperty(context.__vite_ssr_import_meta__, "vitest", { get: () => globalThis.__vitest_index__ });

package/dist/{chunk-runtime-rpc.5e78af38.mjs → chunk-runtime-rpc.cc6a06a2.mjs}

@@ -1,4 +1,4 @@
-import { a as getWorkerState, w as withSafeTimers } from './chunk-utils-global.79a8b1cc.mjs';
+import { a as getWorkerState, w as withSafeTimers } from './chunk-utils-global.1b22c4fd.mjs';
 
 const rpc = () => {
   const { rpc: rpc2 } = getWorkerState();