vitest 0.31.4 → 0.32.1

package/dist/{vendor-execute.132a3e09.js → vendor-execute.001ae440.js}

@@ -2,12 +2,12 @@ import { pathToFileURL } from 'node:url';
 import { ModuleCacheMap, ViteNodeRunner } from 'vite-node/client';
 import { isNodeBuiltin, isInternalRequest, isPrimitive } from 'vite-node/utils';
 import { isAbsolute, dirname, join, basename, extname, resolve, normalize, relative } from 'pathe';
-import { processError } from '@vitest/runner/utils';
+import { processError } from '@vitest/utils/error';
 import { g as getWorkerState, a as getCurrentEnvironment } from './vendor-global.6795f91f.js';
 import { d as distDir } from './vendor-paths.84fc7a99.js';
 import { existsSync, readdirSync } from 'node:fs';
 import { getColors, getType } from '@vitest/utils';
-import { e as getAllMockableProperties } from './vendor-index.5037f2c0.js';
+import { e as getAllMockableProperties } from './vendor-index.87ab04c3.js';
 import { spyOn } from '@vitest/spy';
 import { r as rpc } from './vendor-rpc.4d3d7a54.js';
 
@@ -71,7 +71,19 @@ const _VitestMocker = class {
     };
   }
   async resolvePath(rawId, importer) {
-    const [id, fsPath] = await this.executor.resolveUrl(rawId, importer);
+    let id;
+    let fsPath;
+    try {
+      [id, fsPath] = await this.executor.originalResolveUrl(rawId, importer);
+    } catch (error) {
+      if (error.code === "ERR_MODULE_NOT_FOUND") {
+        const { id: unresolvedId } = error[Symbol.for("vitest.error.not_found.data")];
+        id = unresolvedId;
+        fsPath = unresolvedId;
+      } else {
+        throw error;
+      }
+    }
     const external = !isAbsolute(fsPath) || this.isAModuleDirectory(fsPath) ? rawId : null;
     return {
       id,
@@ -80,6 +92,8 @@ const _VitestMocker = class {
     };
   }
   async resolveMocks() {
+    if (!_VitestMocker.pendingIds.length)
+      return;
     await Promise.all(_VitestMocker.pendingIds.map(async (mock) => {
       const { fsPath, external } = await this.resolvePath(mock.id, mock.importer);
       if (mock.type === "unmock")
@@ -214,7 +228,7 @@ ${c.green(`vi.mock("${mockpath}", async () => {
           const mock = spyOn(newContainer, property).mockImplementation(() => void 0);
           mock.mockRestore = () => {
             mock.mockReset();
-            mock.mockImplementation(void 0);
+            mock.mockImplementation(() => void 0);
             return mock;
           };
           Object.defineProperty(newContainer[property], "length", { value: 0 });
@@ -268,8 +282,6 @@ ${c.green(`vi.mock("${mockpath}", async () => {
     return this.executor.dependencyRequest(mock, mock, [importee]);
   }
   async requestWithMock(url, callstack) {
-    if (_VitestMocker.pendingIds.length)
-      await this.resolveMocks();
     const id = this.normalizePath(url);
     const mock = this.getDependencyMock(id);
     const mockPath = this.getMockPath(id);
@@ -365,15 +377,31 @@ class VitestExecutor extends ViteNodeRunner {
     });
   }
   shouldResolveId(id, _importee) {
-    if (isInternalRequest(id))
+    if (isInternalRequest(id) || id.startsWith("data:"))
       return false;
     const environment = getCurrentEnvironment();
     return environment === "node" ? !isNodeBuiltin(id) : !id.startsWith("node:");
   }
+  async originalResolveUrl(id, importer) {
+    return super.resolveUrl(id, importer);
+  }
   async resolveUrl(id, importer) {
+    if (VitestMocker.pendingIds.length)
+      await this.mocker.resolveMocks();
     if (importer && importer.startsWith("mock:"))
       importer = importer.slice(5);
-    return super.resolveUrl(id, importer);
+    try {
+      return await super.resolveUrl(id, importer);
+    } catch (error) {
+      if (error.code === "ERR_MODULE_NOT_FOUND") {
+        const { id: id2 } = error[Symbol.for("vitest.error.not_found.data")];
+        const path = this.mocker.normalizePath(id2);
+        const mock = this.mocker.getDependencyMock(path);
+        if (mock !== void 0)
+          return [id2, id2];
+      }
+      throw error;
+    }
   }
   async dependencyRequest(id, fsPath, callstack) {
     const mocked = await this.mocker.requestWithMock(fsPath, callstack);

package/dist/{vendor-index.f81f6285.js → vendor-index.0f133dbe.js}

@@ -1,5 +1,5 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
-import { e as bench, c as createExpect, d as globalExpect, s as setupChaiConfig, v as vi, f as vitest } from './vendor-vi.23b98fa1.js';
+import { e as bench, c as createExpect, d as globalExpect, s as setupChaiConfig, v as vi, f as vitest } from './vendor-vi.74cf3ef7.js';
 import { i as isFirstRun, a as runOnce } from './vendor-run-once.69ce7172.js';
 import * as chai from 'chai';
 import { assert, should } from 'chai';

package/dist/{vendor-index.5037f2c0.js → vendor-index.87ab04c3.js}

@@ -82,8 +82,8 @@ function stdout() {
   return console._stdout || process.stdout;
 }
 function getEnvironmentTransformMode(config, environment) {
-  var _a, _b;
-  if (!((_b = (_a = config.deps) == null ? void 0 : _a.experimentalOptimizer) == null ? void 0 : _b.enabled))
+  var _a, _b, _c, _d, _e, _f;
+  if (!((_c = (_b = (_a = config.deps) == null ? void 0 : _a.experimentalOptimizer) == null ? void 0 : _b.ssr) == null ? void 0 : _c.enabled) && !((_f = (_e = (_d = config.deps) == null ? void 0 : _d.experimentalOptimizer) == null ? void 0 : _e.web) == null ? void 0 : _f.enabled))
     return void 0;
   return environment === "happy-dom" || environment === "jsdom" ? "web" : "ssr";
 }

package/dist/{vendor-setup.common.823a1300.js → vendor-setup.common.f1cf2231.js}

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

package/dist/{vendor-vi.23b98fa1.js → vendor-vi.74cf3ef7.js}

@@ -4,8 +4,9 @@ import { getSafeTimers, noop, assertTypes, createSimpleStackTrace, parseSingleSt
 import { d as isRunningInBenchmark, c as resetModules } from './vendor-index.fad2598b.js';
 import * as chai$1 from 'chai';
 import { c as commonjsGlobal } from './vendor-_commonjsHelpers.76cdd49e.js';
-import { equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, JestAsymmetricMatchers, GLOBAL_EXPECT, getState, setState } from '@vitest/expect';
+import { equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, JestAsymmetricMatchers, GLOBAL_EXPECT as GLOBAL_EXPECT$1, getState, setState } from '@vitest/expect';
 import { SnapshotClient, stripSnapshotIndentation, addSerializer } from '@vitest/snapshot';
+import '@vitest/utils/error';
 import { g as getWorkerState, a as getCurrentEnvironment } from './vendor-global.6795f91f.js';
 import { g as getFullName } from './vendor-tasks.f9d75aed.js';
 import require$$0 from 'util';
@@ -151,6 +152,25 @@ var chaiSubset = {exports: {}};
 
 var Subset = chaiSubset.exports;
 
+const MATCHERS_OBJECT = Symbol.for("matchers-object");
+const JEST_MATCHERS_OBJECT = Symbol.for("$$jest-matchers-object");
+const GLOBAL_EXPECT = Symbol.for("expect-global");
+
+if (!Object.prototype.hasOwnProperty.call(globalThis, MATCHERS_OBJECT)) {
+  const globalState = /* @__PURE__ */ new WeakMap();
+  const matchers = /* @__PURE__ */ Object.create(null);
+  Object.defineProperty(globalThis, MATCHERS_OBJECT, {
+    get: () => globalState
+  });
+  Object.defineProperty(globalThis, JEST_MATCHERS_OBJECT, {
+    configurable: true,
+    get: () => ({
+      state: globalState.get(globalThis[GLOBAL_EXPECT]),
+      matchers
+    })
+  });
+}
+
 function recordAsyncExpect(test, promise) {
   if (test && promise instanceof Promise) {
     promise = promise.finally(() => {
@@ -336,7 +356,7 @@ function createExpect(test) {
   var _a;
   const expect = (value, message) => {
     const { assertionCalls } = getState(expect);
-    setState({ assertionCalls: assertionCalls + 1 }, expect);
+    setState({ assertionCalls: assertionCalls + 1, soft: false }, expect);
     const assert2 = chai$1.expect(value, message);
     const _test = test || getCurrentTest();
     if (_test)
@@ -347,7 +367,7 @@ function createExpect(test) {
   Object.assign(expect, chai$1.expect);
   expect.getState = () => getState(expect);
   expect.setState = (state) => setState(state, expect);
-  const globalState = getState(globalThis[GLOBAL_EXPECT]) || {};
+  const globalState = getState(globalThis[GLOBAL_EXPECT$1]) || {};
   setState({
     // this should also add "snapshotState" that is added conditionally
     ...globalState,
@@ -361,6 +381,16 @@ function createExpect(test) {
     currentTestName: test ? getFullName(test) : globalState.currentTestName
   }, expect);
   expect.extend = (matchers) => chai$1.expect.extend(expect, matchers);
+  expect.soft = (...args) => {
+    const assert2 = expect(...args);
+    expect.setState({
+      soft: true
+    });
+    return assert2;
+  };
+  expect.unreachable = (message) => {
+    chai$1.assert.fail(`expected${message ? ` "${message}" ` : " "}not to be reached`);
+  };
   function assertions(expected) {
     const errorGen = () => new Error(`expected number of assertions to be ${expected}, but got ${expect.getState().assertionCalls}`);
     if (Error.captureStackTrace)
@@ -384,7 +414,7 @@ function createExpect(test) {
   return expect;
 }
 const globalExpect = createExpect();
-Object.defineProperty(globalThis, GLOBAL_EXPECT, {
+Object.defineProperty(globalThis, GLOBAL_EXPECT$1, {
   value: globalExpect,
   writable: true,
   configurable: true

package/dist/worker.js

@@ -1,8 +1,8 @@
 import { performance } from 'node:perf_hooks';
-import { c as createBirpc } from './vendor-index.5037f2c0.js';
+import { c as createBirpc } from './vendor-index.87ab04c3.js';
 import { workerId } from 'tinypool';
 import { g as getWorkerState } from './vendor-global.6795f91f.js';
-import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.132a3e09.js';
+import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.001ae440.js';
 import { s as setupInspect } from './vendor-inspector.47fc8cbb.js';
 import { a as rpcDone } from './vendor-rpc.4d3d7a54.js';
 import '@vitest/utils';
@@ -10,7 +10,7 @@ import 'node:url';
 import 'vite-node/client';
 import 'vite-node/utils';
 import 'pathe';
-import '@vitest/runner/utils';
+import '@vitest/utils/error';
 import './vendor-paths.84fc7a99.js';
 import 'node:fs';
 import '@vitest/spy';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "0.31.4",
+  "version": "0.32.1",
   "description": "A blazing fast unit test framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -148,17 +148,17 @@
     "tinypool": "^0.5.0",
     "vite": "^3.0.0 || ^4.0.0",
     "why-is-node-running": "^2.2.2",
-    "@vitest/runner": "0.31.4",
-    "@vitest/expect": "0.31.4",
-    "@vitest/snapshot": "0.31.4",
-    "@vitest/spy": "0.31.4",
-    "vite-node": "0.31.4",
-    "@vitest/utils": "0.31.4"
+    "@vitest/expect": "0.32.1",
+    "@vitest/snapshot": "0.32.1",
+    "@vitest/runner": "0.32.1",
+    "vite-node": "0.32.1",
+    "@vitest/spy": "0.32.1",
+    "@vitest/utils": "0.32.1"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",
     "@antfu/install-pkg": "^0.1.1",
-    "@edge-runtime/vm": "2.1.2",
+    "@edge-runtime/vm": "3.0.1",
     "@jridgewell/trace-mapping": "^0.3.18",
     "@sinonjs/fake-timers": "^10.0.2",
     "@types/diff": "^5.0.3",
@@ -180,7 +180,7 @@
     "flatted": "^3.2.7",
     "get-tsconfig": "^4.5.0",
     "happy-dom": "^9.10.7",
-    "jsdom": "^21.1.2",
+    "jsdom": "^22.1.0",
     "log-update": "^5.0.1",
     "micromatch": "^4.0.5",
     "mlly": "^1.2.0",