vitest 0.0.68 → 0.0.72

package/dist/{runtime/worker.js → worker.js}

@@ -1,27 +1,12 @@
-import {
-  slash
-} from "../chunk-5TNYWP3O.js";
-import {
-  distDir
-} from "../chunk-XUIDSY4V.js";
-import {
-  nanoid
-} from "../chunk-APGELTDH.js";
-import {
-  init_esm_shims
-} from "../chunk-R2SMNEBL.js";
+import { resolve, dirname } from 'path';
+import { n as nanoid } from './index-6427e0f2.js';
+import { b as distDir } from './constants-d4c70610.js';
+import { builtinModules, createRequire } from 'module';
+import { pathToFileURL, fileURLToPath } from 'url';
+import vm from 'vm';
+import { s as slash } from './utils-9dcc4050.js';
 
-// src/runtime/worker.ts
-init_esm_shims();
-import { resolve as resolve2 } from "path";
-
-// src/node/execute.ts
-init_esm_shims();
-import { builtinModules, createRequire } from "module";
-import { fileURLToPath, pathToFileURL } from "url";
-import { dirname, resolve } from "path";
-import vm from "vm";
-var defaultInline = [
+const defaultInline = [
   "vitest/dist",
   "@vue",
   "@vueuse",
@@ -32,11 +17,11 @@ var defaultInline = [
   /\/esm\/.*\.js$/,
   /\.(es|esm|esm-browser|esm-bundler|es6).js$/
 ];
-var depsExternal = [
+const depsExternal = [
   /\.cjs.js$/
 ];
-var isWindows = process.platform === "win32";
-var stubRequests = {
+const isWindows = process.platform === "win32";
+const stubRequests = {
   "/@vite/client": {
     injectQuery: (id) => id,
     createHotContext() {
@@ -68,8 +53,20 @@ async function interpretedImport(path, interpretDefault) {
   }
   return mod;
 }
+let SOURCEMAPPING_URL = "sourceMa";
+SOURCEMAPPING_URL += "ppingURL";
+async function withInlineSourcemap(result) {
+  const { code, map } = result;
+  if (code.includes(`${SOURCEMAPPING_URL}=`))
+    return result;
+  if (map)
+    result.code = `${code}
+
+//# ${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}`;
+  return result;
+}
 async function executeInViteNode(options) {
-  const { moduleCache: moduleCache2, root, files, fetch } = options;
+  const { moduleCache, root, files, fetch } = options;
   const externaled = new Set(builtinModules);
   const result = [];
   for (const file of files)
@@ -81,11 +78,11 @@ async function executeInViteNode(options) {
       var _a;
       if (callstack.includes(dep)) {
         const cacheKey = toFilePath(dep, root);
-        if (!((_a = moduleCache2.get(cacheKey)) == null ? void 0 : _a.exports))
+        if (!((_a = moduleCache.get(cacheKey)) == null ? void 0 : _a.exports))
           throw new Error(`Circular dependency detected
 Stack:
 ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
-        return moduleCache2.get(cacheKey).exports;
+        return moduleCache.get(cacheKey).exports;
       }
       return cachedRequest(dep, callstack);
     };
@@ -94,14 +91,16 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
     const result2 = await fetch(id);
     if (!result2)
       throw new Error(`failed to load ${id}`);
+    if (process.env.NODE_V8_COVERAGE)
+      withInlineSourcemap(result2);
     const url = pathToFileURL(fsPath).href;
     const exports = {};
     setCache(fsPath, { transformResult: result2, exports });
-    const __filename2 = fileURLToPath(url);
+    const __filename = fileURLToPath(url);
     const context = {
       require: createRequire(url),
-      __filename: __filename2,
-      __dirname: dirname(__filename2),
+      __filename,
+      __dirname: dirname(__filename),
       __vite_ssr_import__: request,
       __vite_ssr_dynamic_import__: request,
       __vite_ssr_exports__: exports,
@@ -117,10 +116,10 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
     return exports;
   }
   function setCache(id, mod) {
-    if (!moduleCache2.has(id))
-      moduleCache2.set(id, mod);
+    if (!moduleCache.has(id))
+      moduleCache.set(id, mod);
     else
-      Object.assign(moduleCache2.get(id), mod);
+      Object.assign(moduleCache.get(id), mod);
   }
   async function cachedRequest(rawId, callstack) {
     var _a, _b;
@@ -133,8 +132,8 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
       externaled.add(importPath);
       return interpretedImport(importPath, options.interpretDefault);
     }
-    if ((_a = moduleCache2.get(fsPath)) == null ? void 0 : _a.promise)
-      return (_b = moduleCache2.get(fsPath)) == null ? void 0 : _b.promise;
+    if ((_a = moduleCache.get(fsPath)) == null ? void 0 : _a.promise)
+      return (_b = moduleCache.get(fsPath)) == null ? void 0 : _b.promise;
     const promise = directRequest(id, fsPath, callstack);
     setCache(fsPath, { promise });
     return await promise;
@@ -204,9 +203,8 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
-// src/runtime/worker.ts
-var _run;
-var moduleCache = /* @__PURE__ */ new Map();
+let _run;
+const moduleCache = new Map();
 async function init(ctx) {
   if (_run)
     return _run;
@@ -214,7 +212,7 @@ async function init(ctx) {
   _run = (await executeInViteNode({
     root: config.root,
     files: [
-      resolve2(distDir, "runtime/entry.js")
+      resolve(distDir, "entry.js")
     ],
     fetch(id) {
       return process.__vitest_worker__.rpc("fetch", id);
@@ -229,13 +227,13 @@ async function init(ctx) {
 async function run(ctx) {
   process.stdout.write("\0");
   const { config, port } = ctx;
-  const rpcPromiseMap = /* @__PURE__ */ new Map();
+  const rpcPromiseMap = new Map();
   process.__vitest_worker__ = {
     config,
     rpc: (method, ...args) => {
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve2, reject) => {
         const id = nanoid();
-        rpcPromiseMap.set(id, { resolve: resolve3, reject });
+        rpcPromiseMap.set(id, { resolve: resolve2, reject });
         port.postMessage({ method, args, id });
       });
     },
@@ -258,7 +256,5 @@ async function run(ctx) {
   ctx.files.forEach((i) => moduleCache.delete(i));
   return run2(ctx.files, ctx.config);
 }
-export {
-  run as default,
-  init
-};
+
+export { run as default, init };

package/global.d.ts

@@ -3,7 +3,6 @@ declare global {
   const test: typeof import('vitest')['test']
   const describe: typeof import('vitest')['describe']
   const it: typeof import('vitest')['it']
-  const chai: typeof import('vitest')['chai']
   const expect: typeof import('vitest')['expect']
   const assert: typeof import('vitest')['assert']
   const sinon: typeof import('vitest')['sinon']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.68",
+  "version": "0.0.72",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",
@@ -39,14 +39,13 @@
     "*.d.ts"
   ],
   "scripts": {
-    "build": "tsup --dts",
+    "build": "rimraf dist && rollup -c",
     "coverage": "node bin/vitest.mjs -r test/core --coverage",
-    "dev": "tsup --watch src",
+    "dev": "rollup -c -w src",
     "docs": "npm -C docs run dev",
     "docs:build": "npm -C docs run build",
     "docs:serve": "npm -C docs run serve",
     "lint": "eslint \"{src,test}/**/*.ts\"",
-    "prepare": "esmo scripts/generate-types.ts",
     "prepublishOnly": "nr build",
     "release": "bumpp --commit --push --tag && esmo scripts/publish.ts",
     "test": "node bin/vitest.mjs -r test/core",
@@ -56,13 +55,14 @@
   },
   "dependencies": {
     "@types/chai": "^4.3.0",
+    "@types/chai-subset": "^1.3.3",
+    "@types/sinon": "^10.0.6",
     "@types/sinon-chai": "^3.2.6",
     "chai": "^4.3.4",
     "chai-subset": "^1.6.0",
     "fast-glob": "^3.2.7",
-    "log-update": "^5.0.0",
+    "local-pkg": "^0.4.0",
     "micromatch": "^4.0.4",
-    "picocolors": "^1.0.0",
     "piscina": "^3.2.0",
     "sinon": "^12.0.1",
     "sinon-chai": "^3.7.0",
@@ -71,14 +71,16 @@
   "devDependencies": {
     "@antfu/eslint-config": "^0.13.1",
     "@antfu/ni": "^0.12.0",
-    "@types/chai-subset": "^1.3.3",
+    "@rollup/plugin-alias": "^3.1.8",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.0.6",
     "@types/diff": "^5.0.1",
     "@types/jsdom": "^16.2.13",
     "@types/micromatch": "^4.0.2",
     "@types/natural-compare": "^1.4.1",
     "@types/node": "^16.11.12",
     "@types/sade": "^1.7.3",
-    "@types/sinon": "^10.0.6",
     "bumpp": "^7.1.1",
     "c8": "^7.10.0",
     "cac": "^6.7.12",
@@ -90,11 +92,15 @@
     "find-up": "^6.2.0",
     "happy-dom": "^2.24.5",
     "jsdom": "^19.0.0",
+    "log-update": "^5.0.0",
     "nanoid": "^3.1.30",
     "natural-compare": "^1.4.0",
     "npm-run-all": "^4.1.5",
+    "picocolors": "^1.0.0",
     "pretty-format": "^27.4.2",
     "rimraf": "^3.0.2",
+    "rollup-plugin-dts": "^4.0.1",
+    "rollup-plugin-esbuild": "^4.7.2",
     "strip-ansi": "^7.0.1",
     "tsup": "^5.11.1",
     "typescript": "^4.5.3",

package/dist/chunk-APGELTDH.js

@@ -1,19 +0,0 @@
-import {
-  init_esm_shims
-} from "./chunk-R2SMNEBL.js";
-
-// node_modules/.pnpm/nanoid@3.1.30/node_modules/nanoid/non-secure/index.js
-init_esm_shims();
-var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-var nanoid = (size = 21) => {
-  let id = "";
-  let i = size;
-  while (i--) {
-    id += urlAlphabet[Math.random() * 64 | 0];
-  }
-  return id;
-};
-
-export {
-  nanoid
-};

package/dist/chunk-R2SMNEBL.js

@@ -1,95 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-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;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[Object.keys(fn)[0]])(fn = 0)), res;
-};
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __export = (target, all) => {
-  __markAsModule(target);
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __reExport = (target, module, desc) => {
-  if (module && typeof module === "object" || typeof module === "function") {
-    for (let key of __getOwnPropNames(module))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module[key], enumerable: !(desc = __getOwnPropDesc(module, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toModule = (module) => {
-  return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? { get: () => module.default, enumerable: true } : { value: module, enumerable: true })), module);
-};
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw 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");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
-};
-var __privateWrapper = (obj, member, setter, getter) => {
-  return {
-    set _(value) {
-      __privateSet(obj, member, value, setter);
-    },
-    get _() {
-      return __privateGet(obj, member, getter);
-    }
-  };
-};
-
-// node_modules/.pnpm/tsup@5.11.1_typescript@4.5.3/node_modules/tsup/assets/esm_shims.js
-import { fileURLToPath } from "url";
-import path from "path";
-var init_esm_shims = __esm({
-  "node_modules/.pnpm/tsup@5.11.1_typescript@4.5.3/node_modules/tsup/assets/esm_shims.js"() {
-  }
-});
-
-export {
-  __spreadValues,
-  __spreadProps,
-  __commonJS,
-  __export,
-  __toModule,
-  __privateGet,
-  __privateAdd,
-  __privateSet,
-  __privateWrapper,
-  init_esm_shims
-};

package/dist/chunk-VLGIKNLC.js

@@ -1,78 +0,0 @@
-import {
-  init_esm_shims
-} from "./chunk-R2SMNEBL.js";
-
-// src/integrations/snapshot/port/jest-test-result-helper.ts
-init_esm_shims();
-var emptySummary = (options) => {
-  const summary = {
-    added: 0,
-    failure: false,
-    filesAdded: 0,
-    filesRemoved: 0,
-    filesRemovedList: [],
-    filesUnmatched: 0,
-    filesUpdated: 0,
-    matched: 0,
-    total: 0,
-    unchecked: 0,
-    uncheckedKeysByFile: [],
-    unmatched: 0,
-    updated: 0,
-    didUpdate: options.updateSnapshot === "all"
-  };
-  return summary;
-};
-var packSnapshotState = (filepath, state) => {
-  const snapshot = {
-    filepath,
-    added: 0,
-    fileDeleted: false,
-    matched: 0,
-    unchecked: 0,
-    uncheckedKeys: [],
-    unmatched: 0,
-    updated: 0
-  };
-  const uncheckedCount = state.getUncheckedCount();
-  const uncheckedKeys = state.getUncheckedKeys();
-  if (uncheckedCount)
-    state.removeUncheckedKeys();
-  const status = state.save();
-  snapshot.fileDeleted = status.deleted;
-  snapshot.added = state.added;
-  snapshot.matched = state.matched;
-  snapshot.unmatched = state.unmatched;
-  snapshot.updated = state.updated;
-  snapshot.unchecked = !status.deleted ? uncheckedCount : 0;
-  snapshot.uncheckedKeys = Array.from(uncheckedKeys);
-  return snapshot;
-};
-var addSnapshotResult = (summary, result) => {
-  if (result.added)
-    summary.filesAdded++;
-  if (result.fileDeleted)
-    summary.filesRemoved++;
-  if (result.unmatched)
-    summary.filesUnmatched++;
-  if (result.updated)
-    summary.filesUpdated++;
-  summary.added += result.added;
-  summary.matched += result.matched;
-  summary.unchecked += result.unchecked;
-  if (result.uncheckedKeys && result.uncheckedKeys.length > 0) {
-    summary.uncheckedKeysByFile.push({
-      filePath: result.filepath,
-      keys: result.uncheckedKeys
-    });
-  }
-  summary.unmatched += result.unmatched;
-  summary.updated += result.updated;
-  summary.total += result.added + result.matched + result.unmatched + result.updated;
-};
-
-export {
-  emptySummary,
-  packSnapshotState,
-  addSnapshotResult
-};

package/dist/chunk-XUIDSY4V.js

@@ -1,35 +0,0 @@
-import {
-  init_esm_shims
-} from "./chunk-R2SMNEBL.js";
-
-// src/constants.ts
-init_esm_shims();
-import { resolve } from "path";
-import { fileURLToPath } from "url";
-var distDir = resolve(fileURLToPath(import.meta.url), "../../dist");
-var defaultIncludes = ["**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"];
-var defaultExcludes = ["**/node_modules/**", "**/dist/**"];
-var globalApis = [
-  "suite",
-  "test",
-  "describe",
-  "it",
-  "chai",
-  "expect",
-  "assert",
-  "sinon",
-  "spy",
-  "mock",
-  "stub",
-  "beforeAll",
-  "afterAll",
-  "beforeEach",
-  "afterEach"
-];
-
-export {
-  distDir,
-  defaultIncludes,
-  defaultExcludes,
-  globalApis
-};

package/dist/chunk-YPKHVZRP.js

@@ -1,86 +0,0 @@
-import {
-  afterAll,
-  afterEach,
-  beforeAll,
-  beforeEach,
-  clearContext,
-  createSuiteHooks,
-  defaultSuite,
-  describe,
-  it,
-  suite,
-  test
-} from "./chunk-ANPMHBIF.js";
-import {
-  __export,
-  init_esm_shims
-} from "./chunk-R2SMNEBL.js";
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  afterAll: () => afterAll,
-  afterEach: () => afterEach,
-  assert: () => assert,
-  beforeAll: () => beforeAll,
-  beforeEach: () => beforeEach,
-  chai: () => chai,
-  clearContext: () => clearContext,
-  createSuiteHooks: () => createSuiteHooks,
-  defaultSuite: () => defaultSuite,
-  describe: () => describe,
-  expect: () => expect,
-  it: () => it,
-  mock: () => mock,
-  should: () => should,
-  sinon: () => sinon,
-  spy: () => spy,
-  stub: () => stub,
-  suite: () => suite,
-  test: () => test
-});
-init_esm_shims();
-
-// src/types/index.ts
-init_esm_shims();
-
-// src/types/options.ts
-init_esm_shims();
-
-// src/types/tasks.ts
-init_esm_shims();
-
-// src/types/reporter.ts
-init_esm_shims();
-
-// src/types/snapshot.ts
-init_esm_shims();
-
-// src/types/worker.ts
-init_esm_shims();
-
-// src/types/general.ts
-init_esm_shims();
-
-// src/integrations/chai/index.ts
-init_esm_shims();
-import chai from "chai";
-import { assert, should, expect } from "chai";
-
-// src/integrations/sinon.ts
-init_esm_shims();
-import sinon from "sinon";
-var { mock, spy, stub } = sinon;
-sinon.fn = sinon.spy;
-
-export {
-  chai,
-  assert,
-  should,
-  expect,
-  sinon,
-  mock,
-  spy,
-  stub,
-  src_exports
-};

package/dist/global-PRFYLY7P.js

@@ -1,22 +0,0 @@
-import {
-  src_exports
-} from "./chunk-YPKHVZRP.js";
-import {
-  globalApis
-} from "./chunk-XUIDSY4V.js";
-import "./chunk-ANPMHBIF.js";
-import "./chunk-APGELTDH.js";
-import {
-  init_esm_shims
-} from "./chunk-R2SMNEBL.js";
-
-// src/integrations/global.ts
-init_esm_shims();
-function registerApiGlobally() {
-  globalApis.forEach((api) => {
-    globalThis[api] = src_exports[api];
-  });
-}
-export {
-  registerApiGlobally
-};

package/dist/node/cli.d.ts

@@ -1 +0,0 @@
-