vitest 1.5.3 → 1.6.1

package/dist/vendor/{vm.i4FO5N37.js → vm.QEE48c0T.js}

@@ -2,7 +2,7 @@ import vm, { isContext } from 'node:vm';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { dirname, basename, extname, normalize, join, resolve } from 'pathe';
 import { createCustomConsole } from '../chunks/runtime-console.EO5ha7qv.js';
-import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.2_yoIC01.js';
+import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.fL3szUAI.js';
 import { distDir } from '../path.js';
 import { dirname as dirname$1 } from 'node:path';
 import { statSync, existsSync, readFileSync } from 'node:fs';
@@ -244,15 +244,36 @@ function interopCommonJsModule(interopDefault, mod) {
 const SyntheticModule$1 = vm.SyntheticModule;
 const SourceTextModule = vm.SourceTextModule;
 
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+var __accessCheck$1 = (obj, member, msg) => {
+  if (!member.has(obj))
+    throw TypeError("Cannot " + msg);
+};
+var __privateGet$1 = (obj, member, getter) => {
+  __accessCheck$1(obj, member, "read from private field");
+  return getter ? getter.call(obj) : member.get(obj);
+};
+var __privateAdd$1 = (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 _httpIp;
 const dataURIRegex = /^data:(?<mime>text\/javascript|application\/json|application\/wasm)(?:;(?<encoding>charset=utf-8|base64))?,(?<code>.*)$/;
 class EsmExecutor {
   constructor(executor, options) {
     this.executor = executor;
+    __publicField$1(this, "moduleCache", /* @__PURE__ */ new Map());
+    __publicField$1(this, "esmLinkMap", /* @__PURE__ */ new WeakMap());
+    __publicField$1(this, "context");
+    __privateAdd$1(this, _httpIp, IPnumber("127.0.0.0"));
     this.context = options.context;
   }
-  moduleCache = /* @__PURE__ */ new Map();
-  esmLinkMap = /* @__PURE__ */ new WeakMap();
-  context;
   async evaluateModule(m) {
     if (m.status === "unlinked") {
       this.esmLinkMap.set(
@@ -265,10 +286,11 @@ class EsmExecutor {
       await m.evaluate();
     return m;
   }
-  async createEsModule(fileUrl, code) {
+  async createEsModule(fileUrl, getCode) {
     const cached = this.moduleCache.get(fileUrl);
     if (cached)
       return cached;
+    const code = await getCode();
     if (fileUrl.endsWith(".json")) {
       const m2 = new SyntheticModule$1(
         ["default"],
@@ -302,14 +324,26 @@ class EsmExecutor {
     this.moduleCache.set(fileUrl, m);
     return m;
   }
-  async createWebAssemblyModule(fileUrl, code) {
+  async createWebAssemblyModule(fileUrl, getCode) {
     const cached = this.moduleCache.get(fileUrl);
     if (cached)
       return cached;
-    const m = this.loadWebAssemblyModule(code, fileUrl);
+    const m = this.loadWebAssemblyModule(getCode(), fileUrl);
     this.moduleCache.set(fileUrl, m);
     return m;
   }
+  async createNetworkModule(fileUrl) {
+    if (fileUrl.startsWith("http:")) {
+      const url = new URL(fileUrl);
+      if (url.hostname !== "localhost" && url.hostname !== "::1" && (IPnumber(url.hostname) & IPmask(8)) !== __privateGet$1(this, _httpIp)) {
+        throw new Error(
+          // we don't know the importer, so it's undefined (the same happens in --pool=threads)
+          `import of '${fileUrl}' by undefined is not supported: http can only be used to load local resources (use https instead).`
+        );
+      }
+    }
+    return this.createEsModule(fileUrl, () => fetch(fileUrl).then((r) => r.text()));
+  }
   async loadWebAssemblyModule(source, identifier) {
     const cached = this.moduleCache.get(identifier);
     if (cached)
@@ -393,9 +427,19 @@ class EsmExecutor {
       this.moduleCache.set(identifier, module);
       return module;
     }
-    return this.createEsModule(identifier, code);
+    return this.createEsModule(identifier, () => code);
   }
 }
+_httpIp = new WeakMap();
+function IPnumber(address) {
+  const ip = address.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/);
+  if (ip)
+    return (+ip[1] << 24) + (+ip[2] << 16) + (+ip[3] << 8) + +ip[4];
+  throw new Error(`Expected IP address, received ${address}`);
+}
+function IPmask(maskSize) {
+  return -1 << 32 - maskSize;
+}
 
 const CLIENT_ID = "/@vite/client";
 const CLIENT_FILE = pathToFileURL(CLIENT_ID).href;
@@ -433,10 +477,12 @@ class ViteExecutor {
     const cached = this.esm.resolveCachedModule(fileUrl);
     if (cached)
       return cached;
-    const result = await this.options.transform(fileUrl, "web");
-    if (!result.code)
-      throw new Error(`[vitest] Failed to transform ${fileUrl}. Does the file exist?`);
-    return this.esm.createEsModule(fileUrl, result.code);
+    return this.esm.createEsModule(fileUrl, async () => {
+      const result = await this.options.transform(fileUrl, "web");
+      if (!result.code)
+        throw new Error(`[vitest] Failed to transform ${fileUrl}. Does the file exist?`);
+      return result.code;
+    });
   }
   createViteClientModule() {
     const identifier = CLIENT_ID;
@@ -476,11 +522,54 @@ class ViteExecutor {
   };
 }
 
+var __defProp = Object.defineProperty;
+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, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+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 _networkSupported;
 const SyntheticModule = vm.SyntheticModule;
 const nativeResolve = import.meta.resolve;
 class ExternalModulesExecutor {
   constructor(options) {
     this.options = options;
+    __publicField(this, "cjs");
+    __publicField(this, "esm");
+    __publicField(this, "vite");
+    __publicField(this, "context");
+    __publicField(this, "fs");
+    __publicField(this, "resolvers", []);
+    __privateAdd(this, _networkSupported, null);
+    // dynamic import can be used in both ESM and CJS, so we have it in the executor
+    __publicField(this, "importModuleDynamically", async (specifier, referencer) => {
+      const module = await this.resolveModule(specifier, referencer.identifier);
+      return this.esm.evaluateModule(module);
+    });
+    __publicField(this, "resolveModule", async (specifier, referencer) => {
+      let identifier = this.resolve(specifier, referencer);
+      if (identifier instanceof Promise)
+        identifier = await identifier;
+      return await this.createModule(identifier);
+    });
     this.context = options.context;
     this.fs = options.fileMap;
     this.esm = new EsmExecutor(this, {
@@ -499,23 +588,17 @@ class ExternalModulesExecutor {
     });
     this.resolvers = [this.vite.resolve];
   }
-  cjs;
-  esm;
-  vite;
-  context;
-  fs;
-  resolvers = [];
-  // dynamic import can be used in both ESM and CJS, so we have it in the executor
-  importModuleDynamically = async (specifier, referencer) => {
-    const module = await this.resolveModule(specifier, referencer.identifier);
-    return this.esm.evaluateModule(module);
-  };
-  resolveModule = async (specifier, referencer) => {
-    let identifier = this.resolve(specifier, referencer);
-    if (identifier instanceof Promise)
-      identifier = await identifier;
-    return await this.createModule(identifier);
-  };
+  async import(identifier) {
+    const module = await this.createModule(identifier);
+    await this.esm.evaluateModule(module);
+    return module.namespace;
+  }
+  require(identifier) {
+    return this.cjs.require(identifier);
+  }
+  createRequire(identifier) {
+    return this.cjs.createRequire(identifier);
+  }
   resolve(specifier, parent) {
     for (const resolver of this.resolvers) {
       const id = resolver(specifier, parent);
@@ -587,6 +670,8 @@ class ExternalModulesExecutor {
     const extension = extname(identifier);
     if (extension === ".node" || isNodeBuiltin(identifier))
       return { type: "builtin", url: identifier, path: identifier };
+    if (this.isNetworkSupported && (identifier.startsWith("http:") || identifier.startsWith("https:")))
+      return { type: "network", url: identifier, path: identifier };
     const isFileUrl = identifier.startsWith("file://");
     const pathUrl = isFileUrl ? fileURLToPath(identifier.split("?")[0]) : identifier;
     const fileUrl = isFileUrl ? identifier : pathToFileURL(pathUrl).toString();
@@ -622,31 +707,36 @@ class ExternalModulesExecutor {
       case "vite":
         return await this.vite.createViteModule(url);
       case "wasm":
-        return await this.esm.createWebAssemblyModule(url, this.fs.readBuffer(path));
+        return await this.esm.createWebAssemblyModule(url, () => this.fs.readBuffer(path));
       case "module":
-        return await this.esm.createEsModule(url, this.fs.readFile(path));
+        return await this.esm.createEsModule(url, () => this.fs.readFile(path));
       case "commonjs": {
         const exports = this.require(path);
         return this.wrapCommonJsSynteticModule(identifier, exports);
       }
+      case "network": {
+        return this.esm.createNetworkModule(url);
+      }
       default: {
         const _deadend = type;
         return _deadend;
       }
     }
   }
-  async import(identifier) {
-    const module = await this.createModule(identifier);
-    await this.esm.evaluateModule(module);
-    return module.namespace;
-  }
-  require(identifier) {
-    return this.cjs.require(identifier);
-  }
-  createRequire(identifier) {
-    return this.cjs.createRequire(identifier);
+  get isNetworkSupported() {
+    var _a;
+    if (__privateGet(this, _networkSupported) == null) {
+      if (process.execArgv.includes("--experimental-network-imports"))
+        __privateSet(this, _networkSupported, true);
+      else if ((_a = process.env.NODE_OPTIONS) == null ? void 0 : _a.includes("--experimental-network-imports"))
+        __privateSet(this, _networkSupported, true);
+      else
+        __privateSet(this, _networkSupported, false);
+    }
+    return __privateGet(this, _networkSupported);
   }
 }
+_networkSupported = new WeakMap();
 
 class FileMap {
   fsCache = /* @__PURE__ */ new Map();

package/dist/worker.js

@@ -1,9 +1,10 @@
 import { pathToFileURL } from 'node:url';
 import { workerId } from 'tinypool';
 import { ViteNodeRunner, ModuleCacheMap } from 'vite-node/client';
+import { readFileSync } from 'node:fs';
 import { resolve, normalize } from 'pathe';
 import { e as environments } from './vendor/index.GVFv9dZ0.js';
-import { i as isChildProcess, s as setProcessTitle } from './vendor/base.Xt0Omgh7.js';
+import { i as isChildProcess, s as setProcessTitle } from './vendor/base.5NT-gWu5.js';
 import { s as setupInspect } from './vendor/inspector.IgLX3ur5.js';
 import { c as createRuntimeRpc, a as rpcDone } from './vendor/rpc.joBhAkyK.js';
 import 'node:console';
@@ -31,7 +32,12 @@ async function loadEnvironment(ctx, rpc) {
     return environments[name];
   const loader = await createEnvironmentLoader({
     root: ctx.config.root,
-    fetchModule: (id) => rpc.fetch(id, "ssr"),
+    fetchModule: async (id) => {
+      const result = await rpc.fetch(id, "ssr");
+      if (result.id)
+        return { code: readFileSync(result.id, "utf-8") };
+      return result;
+    },
     resolveId: (id, importer) => rpc.resolveId(id, importer, "ssr")
   });
   const root = loader.root;

package/dist/workers/forks.js

@@ -1,18 +1,18 @@
 import v8 from 'node:v8';
 import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../vendor/utils.0uYuCbzo.js';
-import { r as runBaseTests } from '../vendor/base.oIzAvGLe.js';
+import { r as runBaseTests } from '../vendor/base.Ybri3C14.js';
 import '@vitest/utils';
 import 'vite-node/client';
 import '../vendor/global.CkGT_TMy.js';
-import '../vendor/execute.2_yoIC01.js';
+import '../vendor/execute.fL3szUAI.js';
 import 'node:vm';
 import 'node:url';
+import 'node:fs';
 import 'vite-node/utils';
 import 'pathe';
 import '@vitest/utils/error';
 import '../path.js';
-import 'node:fs';
-import '../vendor/base.Xt0Omgh7.js';
+import '../vendor/base.5NT-gWu5.js';
 
 class ForksBaseWorker {
   getRpcOptions() {

package/dist/workers/runVmTests.js

@@ -6,14 +6,13 @@ import { performance } from 'node:perf_hooks';
 import { startTests } from '@vitest/runner';
 import { setupColors, createColors } from '@vitest/utils';
 import { installSourcemapsSupport } from 'vite-node/source-map';
-import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from '../vendor/index.Fm6OikHU.js';
+import { s as setupChaiConfig, r as resolveTestRunner, a as resolveSnapshotEnvironment } from '../vendor/index.DpVgvm2P.js';
 import { a as startCoverageInsideWorker, s as stopCoverageInsideWorker } from '../vendor/coverage.E7sG1b3r.js';
 import { g as getWorkerState } from '../vendor/global.CkGT_TMy.js';
-import { V as VitestIndex } from '../vendor/index.QVcwRDVW.js';
-import { s as setupCommonEnv } from '../vendor/setup-common.5nUd4r76.js';
+import { V as VitestIndex } from '../vendor/index.dI9lHwVn.js';
+import { s as setupCommonEnv } from '../vendor/setup-common.8nJLd4ay.js';
 import { c as closeInspector } from '../vendor/inspector.IgLX3ur5.js';
 import 'chai';
-import '@vitest/snapshot/environment';
 import 'pathe';
 import '../path.js';
 import 'node:url';
@@ -25,14 +24,14 @@ import '../vendor/index.SMVOaj7F.js';
 import '../vendor/env.AtSIuHFg.js';
 import 'std-env';
 import '../vendor/run-once.Olz_Zkd8.js';
-import '../vendor/vi.Y_w82WR8.js';
+import '../vendor/vi.YFlodzP_.js';
 import '../vendor/_commonjsHelpers.jjO7Zipk.js';
 import '@vitest/expect';
 import '@vitest/snapshot';
 import '@vitest/utils/error';
 import '../vendor/tasks.IknbGB2n.js';
 import '@vitest/utils/source-map';
-import '../vendor/base.Xt0Omgh7.js';
+import '../vendor/base.5NT-gWu5.js';
 import '../vendor/date.Ns1pGd_X.js';
 import '@vitest/spy';
 
@@ -43,7 +42,6 @@ async function run(files, config, executor) {
     value: VitestIndex,
     enumerable: false
   });
-  config.snapshotOptions.snapshotEnvironment = new VitestSnapshotEnvironment(workerState.rpc);
   setupColors(createColors(isatty(1)));
   if (workerState.environment.transformMode === "web") {
     const _require = createRequire(import.meta.url);
@@ -62,7 +60,11 @@ async function run(files, config, executor) {
   await startCoverageInsideWorker(config.coverage, executor);
   if (config.chaiConfig)
     setupChaiConfig(config.chaiConfig);
-  const runner = await resolveTestRunner(config, executor);
+  const [runner, snapshotEnvironment] = await Promise.all([
+    resolveTestRunner(config, executor),
+    resolveSnapshotEnvironment(config, executor)
+  ]);
+  config.snapshotOptions.snapshotEnvironment = snapshotEnvironment;
   workerState.onCancel.then((reason) => {
     var _a;
     closeInspector(config);

package/dist/workers/threads.js

@@ -1,17 +1,17 @@
-import { r as runBaseTests } from '../vendor/base.oIzAvGLe.js';
+import { r as runBaseTests } from '../vendor/base.Ybri3C14.js';
 import { a as createThreadsRpcOptions } from '../vendor/utils.0uYuCbzo.js';
 import 'vite-node/client';
 import '../vendor/global.CkGT_TMy.js';
-import '../vendor/execute.2_yoIC01.js';
+import '../vendor/execute.fL3szUAI.js';
 import 'node:vm';
 import 'node:url';
+import 'node:fs';
 import 'vite-node/utils';
 import 'pathe';
 import '@vitest/utils/error';
 import '../path.js';
-import 'node:fs';
 import '@vitest/utils';
-import '../vendor/base.Xt0Omgh7.js';
+import '../vendor/base.5NT-gWu5.js';
 
 class ThreadsBaseWorker {
   getRpcOptions(ctx) {

package/dist/workers/vmForks.js

@@ -1,6 +1,6 @@
 import v8 from 'node:v8';
 import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../vendor/utils.0uYuCbzo.js';
-import { r as runVmTests } from '../vendor/vm.i4FO5N37.js';
+import { r as runVmTests } from '../vendor/vm.QEE48c0T.js';
 import '@vitest/utils';
 import 'node:vm';
 import 'node:url';
@@ -14,13 +14,13 @@ import '@vitest/runner/utils';
 import '../vendor/global.CkGT_TMy.js';
 import '../vendor/env.AtSIuHFg.js';
 import 'std-env';
-import '../vendor/execute.2_yoIC01.js';
+import '../vendor/execute.fL3szUAI.js';
+import 'node:fs';
 import 'vite-node/client';
 import 'vite-node/utils';
 import '@vitest/utils/error';
 import '../path.js';
-import 'node:fs';
-import '../vendor/base.Xt0Omgh7.js';
+import '../vendor/base.5NT-gWu5.js';
 import 'node:module';
 import 'vite-node/constants';
 

package/dist/workers/vmThreads.js

@@ -1,5 +1,5 @@
 import { a as createThreadsRpcOptions } from '../vendor/utils.0uYuCbzo.js';
-import { r as runVmTests } from '../vendor/vm.i4FO5N37.js';
+import { r as runVmTests } from '../vendor/vm.QEE48c0T.js';
 import '@vitest/utils';
 import 'node:vm';
 import 'node:url';
@@ -13,13 +13,13 @@ import '@vitest/runner/utils';
 import '../vendor/global.CkGT_TMy.js';
 import '../vendor/env.AtSIuHFg.js';
 import 'std-env';
-import '../vendor/execute.2_yoIC01.js';
+import '../vendor/execute.fL3szUAI.js';
+import 'node:fs';
 import 'vite-node/client';
 import 'vite-node/utils';
 import '@vitest/utils/error';
 import '../path.js';
-import 'node:fs';
-import '../vendor/base.Xt0Omgh7.js';
+import '../vendor/base.5NT-gWu5.js';
 import 'node:module';
 import 'vite-node/constants';
 

package/dist/workers.d.ts

@@ -1,5 +1,5 @@
 import * as v8 from 'v8';
-import { d as BirpcOptions, e as RuntimeRPC, f as ContextRPC, W as WorkerGlobalState, g as WorkerContext, R as ResolvedConfig } from './reporters-BXNXFKfg.js';
+import { d as BirpcOptions, e as RuntimeRPC, f as ContextRPC, W as WorkerGlobalState, g as WorkerContext, R as ResolvedConfig } from './reporters-w_64AS5f.js';
 import { Awaitable } from '@vitest/utils';
 import 'vite';
 import '@vitest/runner';

package/dist/workers.js

@@ -1,16 +1,17 @@
 export { c as createForksRpcOptions, a as createThreadsRpcOptions, u as unwrapSerializableConfig } from './vendor/utils.0uYuCbzo.js';
 export { p as provideWorkerState } from './vendor/global.CkGT_TMy.js';
 export { run as runVitestWorker } from './worker.js';
-export { r as runVmTests } from './vendor/vm.i4FO5N37.js';
-export { r as runBaseTests } from './vendor/base.oIzAvGLe.js';
+export { r as runVmTests } from './vendor/vm.QEE48c0T.js';
+export { r as runBaseTests } from './vendor/base.Ybri3C14.js';
 import '@vitest/utils';
 import 'node:url';
 import 'tinypool';
 import 'vite-node/client';
+import 'node:fs';
 import 'pathe';
 import './vendor/index.GVFv9dZ0.js';
 import 'node:console';
-import './vendor/base.Xt0Omgh7.js';
+import './vendor/base.5NT-gWu5.js';
 import './vendor/inspector.IgLX3ur5.js';
 import 'node:module';
 import './vendor/rpc.joBhAkyK.js';
@@ -23,9 +24,8 @@ import './vendor/date.Ns1pGd_X.js';
 import '@vitest/runner/utils';
 import './vendor/env.AtSIuHFg.js';
 import 'std-env';
-import './vendor/execute.2_yoIC01.js';
+import './vendor/execute.fL3szUAI.js';
 import 'vite-node/utils';
 import '@vitest/utils/error';
 import './path.js';
-import 'node:fs';
 import 'vite-node/constants';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "Next generation testing framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -91,6 +91,10 @@
     "./reporters": {
       "types": "./dist/reporters.d.ts",
       "default": "./dist/reporters.js"
+    },
+    "./snapshot": {
+      "types": "./dist/snapshot.d.ts",
+      "default": "./dist/snapshot.js"
     }
   },
   "main": "./dist/index.js",
@@ -115,8 +119,8 @@
     "@types/node": "^18.0.0 || >=20.0.0",
     "happy-dom": "*",
     "jsdom": "*",
-    "@vitest/browser": "1.5.3",
-    "@vitest/ui": "1.5.3"
+    "@vitest/ui": "1.6.1",
+    "@vitest/browser": "1.6.1"
   },
   "peerDependenciesMeta": {
     "@edge-runtime/vm": {
@@ -153,12 +157,12 @@
     "tinypool": "^0.8.3",
     "vite": "^5.0.0",
     "why-is-node-running": "^2.2.2",
-    "@vitest/expect": "1.5.3",
-    "@vitest/snapshot": "1.5.3",
-    "vite-node": "1.5.3",
-    "@vitest/runner": "1.5.3",
-    "@vitest/spy": "1.5.3",
-    "@vitest/utils": "1.5.3"
+    "@vitest/runner": "1.6.1",
+    "@vitest/expect": "1.6.1",
+    "@vitest/spy": "1.6.1",
+    "@vitest/utils": "1.6.1",
+    "vite-node": "1.6.1",
+    "@vitest/snapshot": "1.6.1"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",

package/snapshot.d.ts

@@ -0,0 +1 @@
+export * from './dist/snapshot.js'