vitest 2.0.4 → 2.1.0-beta.1

package/dist/{vendor/rpc.BGx7q_k2.js → chunks/rpc.B7Mfb-Yf.js}

@@ -1,16 +1,15 @@
 import { getSafeTimers } from '@vitest/utils';
 import { c as createBirpc } from './index.BpSiYbpB.js';
-import { g as getWorkerState } from './global.7bFbnyXl.js';
+import { g as getWorkerState } from './utils.Ck2hJTRs.js';
 
 const { get } = Reflect;
 function withSafeTimers(fn) {
-  var _a;
   const { setTimeout, clearTimeout, nextTick, setImmediate, clearImmediate } = getSafeTimers();
   const currentSetTimeout = globalThis.setTimeout;
   const currentClearTimeout = globalThis.clearTimeout;
   const currentSetImmediate = globalThis.setImmediate;
   const currentClearImmediate = globalThis.clearImmediate;
-  const currentNextTick = (_a = globalThis.process) == null ? void 0 : _a.nextTick;
+  const currentNextTick = globalThis.process?.nextTick;
   try {
     globalThis.setTimeout = setTimeout;
     globalThis.clearTimeout = clearTimeout;
@@ -60,13 +59,12 @@ function createRuntimeRpc(options) {
           "onCancel"
         ],
         onTimeoutError(functionName, args) {
-          var _a;
           let message = `[vitest-worker]: Timeout calling "${functionName}"`;
           if (functionName === "fetch" || functionName === "transform" || functionName === "resolveId") {
             message += ` with "${JSON.stringify(args)}"`;
           }
           if (functionName === "onUnhandledError") {
-            message += ` with "${((_a = args[0]) == null ? void 0 : _a.message) || args[0]}"`;
+            message += ` with "${args[0]?.message || args[0]}"`;
           }
           throw new Error(message);
         },

package/dist/{vendor/run-once.Db8Hgq9X.js → chunks/run-once.Sxe67Wng.js}

@@ -1,4 +1,4 @@
-import { g as getWorkerState } from './global.7bFbnyXl.js';
+import { g as getWorkerState } from './utils.Ck2hJTRs.js';
 
 const filesCount = /* @__PURE__ */ new Map();
 const cache = /* @__PURE__ */ new Map();

package/dist/chunks/{runtime-runBaseTests.Dq_sJZq9.js → runBaseTests.BAhL8UH_.js}

@@ -3,37 +3,37 @@ import { startTests, collectTests } from '@vitest/runner';
 import 'pathe';
 import '@vitest/runner/utils';
 import { getSafeTimers } from '@vitest/utils';
-import { g as getWorkerState } from '../vendor/global.7bFbnyXl.js';
-import '../vendor/env.2ltrQNq0.js';
-import { a as globalExpect, r as resetModules, v as vi } from '../vendor/vi.Elqer9-7.js';
-import { a as startCoverageInsideWorker, s as stopCoverageInsideWorker } from '../vendor/coverage.BhYSDdTT.js';
-import { a as resolveSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from '../vendor/index.CVqMv71L.js';
+import { g as getWorkerState } from './utils.Ck2hJTRs.js';
+import './env.CmHVDJnw.js';
+import { a as globalExpect, r as resetModules, v as vi } from './vi.B6QZ938s.js';
+import { a as startCoverageInsideWorker, s as stopCoverageInsideWorker } from './coverage.CqfT4xaf.js';
+import { a as resolveSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './index.CxWPpGJz.js';
 import { createRequire } from 'node:module';
 import util from 'node:util';
 import timers from 'node:timers';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { KNOWN_ASSET_TYPES } from 'vite-node/constants';
-import { V as VitestIndex } from '../vendor/index.DI9daj1Q.js';
-import { s as setupCommonEnv } from '../vendor/setup-common.symvFZPh.js';
-import { c as closeInspector } from '../vendor/inspector.-FCQUzqR.js';
+import { V as VitestIndex } from './index.CNZXZ9PJ.js';
+import { s as setupCommonEnv } from './setup-common.KBrCO5LJ.js';
+import { c as closeInspector } from './inspector.70d6emsh.js';
 import 'std-env';
 import 'chai';
-import '../vendor/_commonjsHelpers.BFTU3MAI.js';
+import './_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/expect';
 import '@vitest/snapshot';
 import '@vitest/utils/error';
-import '../vendor/tasks.DhVtQBtW.js';
+import './tasks.BZnCS9aT.js';
 import '@vitest/utils/source-map';
-import '../vendor/base.DRHPZCCj.js';
-import '../vendor/date.W2xKR2qe.js';
+import './base.BH-FAiX7.js';
+import './date.W2xKR2qe.js';
 import '@vitest/spy';
 import '../path.js';
 import 'node:url';
-import '../vendor/rpc.BGx7q_k2.js';
-import '../vendor/index.BpSiYbpB.js';
-import '../vendor/benchmark.B6pblCp2.js';
-import '../vendor/index.BJmtb_7W.js';
-import '../vendor/run-once.Db8Hgq9X.js';
+import './rpc.B7Mfb-Yf.js';
+import './index.BpSiYbpB.js';
+import './benchmark.C8CRJYG4.js';
+import './index.CxRxs566.js';
+import './run-once.Sxe67Wng.js';
 
 let globalSetup = false;
 async function setupGlobalEnv(config, { environment }, executor) {
@@ -81,7 +81,7 @@ function resolveAsset(mod, url) {
   mod.exports = url;
 }
 async function setupConsoleLogSpy() {
-  const { createCustomConsole } = await import('./runtime-console.C2L2zykk.js');
+  const { createCustomConsole } = await import('./console.DI3gHgtH.js');
   globalThis.console = createCustomConsole();
 }
 async function withEnv({ environment }, options, fn) {
@@ -108,9 +108,8 @@ async function run(method, files, config, environment, executor) {
   }
   const runner = await resolveTestRunner(config, executor);
   workerState.onCancel.then((reason) => {
-    var _a;
     closeInspector(config);
-    (_a = runner.onCancel) == null ? void 0 : _a.call(runner, reason);
+    runner.onCancel?.(reason);
   });
   workerState.durations.prepare = performance.now() - workerState.durations.prepare;
   workerState.durations.environment = performance.now();
@@ -118,11 +117,10 @@ async function run(method, files, config, environment, executor) {
     environment,
     environment.options || config.environmentOptions || {},
     async () => {
-      var _a, _b, _c, _d;
       workerState.durations.environment = performance.now() - workerState.durations.environment;
       for (const file of files) {
-        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);
+        const isIsolatedThreads = config.pool === "threads" && (config.poolOptions?.threads?.isolate ?? true);
+        const isIsolatedForks = config.pool === "forks" && (config.poolOptions?.forks?.isolate ?? true);
         if (isIsolatedThreads || isIsolatedForks) {
           workerState.mockMap.clear();
           resetModules(workerState.moduleCache, true);

package/dist/{vendor/setup-common.symvFZPh.js → chunks/setup-common.KBrCO5LJ.js}

@@ -1,6 +1,6 @@
 import { setSafeTimers } from '@vitest/utils';
 import { addSerializer } from '@vitest/snapshot';
-import { r as resetRunOnceCounter } from './run-once.Db8Hgq9X.js';
+import { r as resetRunOnceCounter } from './run-once.Sxe67Wng.js';
 
 let globalSetup = false;
 async function setupCommonEnv(config) {
@@ -13,7 +13,7 @@ async function setupCommonEnv(config) {
   globalSetup = true;
   setSafeTimers();
   if (config.globals) {
-    (await import('../chunks/integrations-globals.nDMtdOcn.js')).registerApiGlobally();
+    (await import('./globals.DRPLtPOv.js')).registerApiGlobally();
   }
 }
 function setupDefines(defines) {

package/dist/{suite-CRLAhsm0.d.ts → chunks/suite.CcK46U-P.d.ts}

@@ -1,6 +1,6 @@
 import { Custom } from '@vitest/runner';
 import '@vitest/runner/utils';
-import { ah as BenchFunction, ai as BenchmarkAPI } from './reporters-B7ebVMkT.js';
+import { b as BenchFunction, c as BenchmarkAPI } from './benchmark.puBFxyfE.js';
 import { Options } from 'tinybench';
 
 declare function getBenchOptions(key: Custom): Options;

package/dist/{vendor/tasks.DhVtQBtW.js → chunks/tasks.BZnCS9aT.js}

@@ -3,9 +3,8 @@ import '@vitest/utils';
 
 function hasFailedSnapshot(suite) {
   return getTests(suite).some((s) => {
-    var _a, _b;
-    return (_b = (_a = s.result) == null ? void 0 : _a.errors) == null ? void 0 : _b.some(
-      (e) => typeof (e == null ? void 0 : e.message) === "string" && e.message.match(/Snapshot .* mismatched/)
+    return s.result?.errors?.some(
+      (e) => typeof e?.message === "string" && e.message.match(/Snapshot .* mismatched/)
     );
   });
 }

package/dist/{vendor/utils.DkxLWvS1.js → chunks/utils.C3_cBsyn.js}

@@ -1,9 +1,8 @@
 import { parseRegexp } from '@vitest/utils';
 
-var _a, _b;
 const REGEXP_WRAP_PREFIX = "$$vitest:";
-const processSend = (_a = process.send) == null ? void 0 : _a.bind(process);
-const processOn = (_b = process.on) == null ? void 0 : _b.bind(process);
+const processSend = process.send?.bind(process);
+const processOn = process.on?.bind(process);
 function createThreadsRpcOptions({
   port
 }) {
@@ -25,7 +24,7 @@ function createForksRpcOptions(nodeV8) {
     },
     on(fn) {
       processOn("message", (message, ...extras) => {
-        if (message == null ? void 0 : message.__tinypool_worker_message__) {
+        if (message?.__tinypool_worker_message__) {
           return;
         }
         return fn(message, ...extras);

package/dist/{vendor/global.7bFbnyXl.js → chunks/utils.Ck2hJTRs.js}

@@ -17,7 +17,7 @@ function provideWorkerState(context, state) {
 }
 function getCurrentEnvironment() {
   const state = getWorkerState();
-  return state == null ? void 0 : state.environment.name;
+  return state?.environment.name;
 }
 
 export { getCurrentEnvironment as a, getWorkerState as g, provideWorkerState as p };

package/dist/{vendor/utils.BySfPUwy.js → chunks/utils.DO38lwfj.js}

@@ -1,6 +1,6 @@
 import { isAbsolute, relative, dirname, basename } from 'pathe';
 import c from 'tinyrainbow';
-import { a as slash } from './base.DRHPZCCj.js';
+import { a as slash } from './base.BH-FAiX7.js';
 
 const F_RIGHT = "\u2192";
 const F_DOWN = "\u2193";
@@ -43,8 +43,7 @@ const taskFail = c.red(F_CROSS);
 const suiteFail = c.red(F_POINTER);
 const pending = c.gray("\xB7");
 function getCols(delta = 0) {
-  var _a;
-  let length = (_a = process.stdout) == null ? void 0 : _a.columns;
+  let length = process.stdout?.columns;
   if (!length || Number.isNaN(length)) {
     length = 30;
   }
@@ -67,12 +66,11 @@ function divider(text, left, right) {
   return F_LONG_DASH.repeat(cols);
 }
 function formatTestPath(root, path) {
-  var _a;
   if (isAbsolute(path)) {
     path = relative(root, path);
   }
   const dir = dirname(path);
-  const ext = ((_a = path.match(/(\.(spec|test)\.[cm]?[tj]sx?)$/)) == null ? void 0 : _a[0]) || "";
+  const ext = path.match(/(\.(spec|test)\.[cm]?[tj]sx?)$/)?.[0] || "";
   const base = basename(path, ext);
   return slash(c.dim(`${dir}/`) + c.bold(base)) + c.dim(ext);
 }
@@ -124,23 +122,14 @@ function renderSnapshotSummary(rootDir, snapshots) {
   return summary;
 }
 function countTestErrors(tasks) {
-  return tasks.reduce((c2, i) => {
-    var _a, _b;
-    return c2 + (((_b = (_a = i.result) == null ? void 0 : _a.errors) == null ? void 0 : _b.length) || 0);
-  }, 0);
+  return tasks.reduce((c2, i) => c2 + (i.result?.errors?.length || 0), 0);
 }
 function getStateString(tasks, name = "tests", showTotal = true) {
   if (tasks.length === 0) {
     return c.dim(`no ${name}`);
   }
-  const passed = tasks.filter((i) => {
-    var _a;
-    return ((_a = i.result) == null ? void 0 : _a.state) === "pass";
-  });
-  const failed = tasks.filter((i) => {
-    var _a;
-    return ((_a = i.result) == null ? void 0 : _a.state) === "fail";
-  });
+  const passed = tasks.filter((i) => i.result?.state === "pass");
+  const failed = tasks.filter((i) => i.result?.state === "fail");
   const skipped2 = tasks.filter((i) => i.mode === "skip");
   const todo = tasks.filter((i) => i.mode === "todo");
   return [
@@ -151,7 +140,6 @@ function getStateString(tasks, name = "tests", showTotal = true) {
   ].filter(Boolean).join(c.dim(" | ")) + (showTotal ? c.gray(` (${tasks.length})`) : "");
 }
 function getStateSymbol(task) {
-  var _a;
   if (task.mode === "skip" || task.mode === "todo") {
     return skipped;
   }
@@ -170,7 +158,7 @@ function getStateSymbol(task) {
     return c.yellow(spinner());
   }
   if (task.result.state === "pass") {
-    return ((_a = task.meta) == null ? void 0 : _a.benchmark) ? benchmarkPass : testPass;
+    return task.meta?.benchmark ? benchmarkPass : testPass;
   }
   if (task.result.state === "fail") {
     return task.type === "suite" ? suiteFail : taskFail;
@@ -178,8 +166,7 @@ function getStateSymbol(task) {
   return " ";
 }
 function getHookStateSymbol(task, hookName) {
-  var _a, _b;
-  const state = (_b = (_a = task.result) == null ? void 0 : _a.hooks) == null ? void 0 : _b[hookName];
+  const state = task.result?.hooks?.[hookName];
   if (state && state === "run") {
     let spinnerMap2 = hookSpinnerMap.get(task);
     if (!spinnerMap2) {

package/dist/{vendor/vi.Elqer9-7.js → chunks/vi.B6QZ938s.js}

@@ -5,13 +5,13 @@ import { stripSnapshotIndentation, addSerializer, SnapshotClient } from '@vitest
 import { getNames } from '@vitest/runner/utils';
 import '@vitest/utils/error';
 import { getCurrentTest } from '@vitest/runner';
-import { g as getTestName } from './tasks.DhVtQBtW.js';
-import { g as getWorkerState, a as getCurrentEnvironment } from './global.7bFbnyXl.js';
+import { g as getTestName } from './tasks.BZnCS9aT.js';
+import { g as getWorkerState, a as getCurrentEnvironment } from './utils.Ck2hJTRs.js';
 import { getSafeTimers, assertTypes, createSimpleStackTrace } from '@vitest/utils';
 import 'pathe';
-import './env.2ltrQNq0.js';
+import './env.CmHVDJnw.js';
 import { parseSingleStack } from '@vitest/utils/source-map';
-import { i as isChildProcess } from './base.DRHPZCCj.js';
+import { i as isChildProcess } from './base.BH-FAiX7.js';
 import { R as RealDate, r as resetDate, m as mockDate } from './date.W2xKR2qe.js';
 import { spyOn, fn, isMockFunction, mocks } from '@vitest/spy';
 
@@ -256,13 +256,12 @@ const SnapshotPlugin = (chai, utils) => {
     chai.Assertion.prototype,
     "toMatchInlineSnapshot",
     function __INLINE_SNAPSHOT__(properties, inlineSnapshot, message) {
-      var _a;
       const isNot = utils.flag(this, "negate");
       if (isNot) {
         throw new Error('toMatchInlineSnapshot cannot be used with "not"');
       }
       const test = utils.flag(this, "vitest-test");
-      const isInsideEach = test && (test.each || ((_a = test.suite) == null ? void 0 : _a.each));
+      const isInsideEach = test && (test.each || test.suite?.each);
       if (isInsideEach) {
         throw new Error(
           "InlineSnapshot cannot be used inside of test.each or describe.each"
@@ -317,7 +316,6 @@ const SnapshotPlugin = (chai, utils) => {
     chai.Assertion.prototype,
     "toThrowErrorMatchingInlineSnapshot",
     function __INLINE_SNAPSHOT__(inlineSnapshot, message) {
-      var _a;
       const isNot = utils.flag(this, "negate");
       if (isNot) {
         throw new Error(
@@ -325,7 +323,7 @@ const SnapshotPlugin = (chai, utils) => {
         );
       }
       const test = utils.flag(this, "vitest-test");
-      const isInsideEach = test && (test.each || ((_a = test.suite) == null ? void 0 : _a.each));
+      const isInsideEach = test && (test.each || test.suite?.each);
       if (isInsideEach) {
         throw new Error(
           "InlineSnapshot cannot be used inside of test.each or describe.each"
@@ -380,9 +378,8 @@ const unsupported = [
 ];
 function createExpectPoll(expect) {
   return function poll(fn, options = {}) {
-    var _a;
     const state = getWorkerState();
-    const defaults = ((_a = state.config.expect) == null ? void 0 : _a.poll) ?? {};
+    const defaults = state.config.expect?.poll ?? {};
     const {
       interval = defaults.interval ?? 50,
       timeout = defaults.timeout ?? 1e3,
@@ -3247,7 +3244,6 @@ class FakeTimers {
     }
   }
   useFakeTimers() {
-    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.'
@@ -3257,12 +3253,12 @@ 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()) {
+      if (this._userConfig?.toFake?.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(
+      const existingFakedMethods = (this._userConfig?.toFake || toFake).filter(
         (method) => {
           switch (method) {
             case "setImmediate":
@@ -3482,10 +3478,10 @@ function createVitest() {
   }
   const workerState = getWorkerState();
   let _timers;
-  const timers = () => _timers || (_timers = new FakeTimers({
+  const timers = () => _timers ||= new FakeTimers({
     global: globalThis,
     config: workerState.config.fakeTimers
-  }));
+  });
   const _stubsGlobal = /* @__PURE__ */ new Map();
   const _stubsEnv = /* @__PURE__ */ new Map();
   const _envBooleans = ["PROD", "DEV", "SSR"];
@@ -3496,13 +3492,12 @@ function createVitest() {
       return stack2.includes(` at Object.${name}`) || stack2.includes(`${name}@`);
     });
     const stack = parseSingleStack(stackArray[importerStackIndex + 1]);
-    return (stack == null ? void 0 : stack.file) || "";
+    return stack?.file || "";
   };
   const utils = {
     useFakeTimers(config) {
-      var _a, _b, _c, _d;
       if (isChildProcess()) {
-        if (((_a = config == null ? void 0 : config.toFake) == null ? void 0 : _a.includes("nextTick")) || ((_d = (_c = (_b = workerState.config) == null ? void 0 : _b.fakeTimers) == null ? void 0 : _c.toFake) == null ? void 0 : _d.includes("nextTick"))) {
+        if (config?.toFake?.includes("nextTick") || workerState.config?.fakeTimers?.toFake?.includes("nextTick")) {
           throw new Error(
             'vi.useFakeTimers({ toFake: ["nextTick"] }) is not supported in node:child_process. Use --pool=threads if mocking nextTick is required.'
           );

package/dist/{vendor/vm.img-AOox.js → chunks/vm.kl9T_5ai.js}

@@ -1,8 +1,8 @@
 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.C2L2zykk.js';
-import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.jzOWtys_.js';
+import { createCustomConsole } from './console.DI3gHgtH.js';
+import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.DT9BA6zp.js';
 import { distDir } from '../path.js';
 import { dirname as dirname$1 } from 'node:path';
 import fs from 'node:fs';
@@ -11,8 +11,8 @@ import { createRequire, Module } from 'node:module';
 import { CSS_LANGS_RE, KNOWN_ASSET_RE } from 'vite-node/constants';
 import '@vitest/runner/utils';
 import '@vitest/utils';
-import { p as provideWorkerState } from './global.7bFbnyXl.js';
-import './env.2ltrQNq0.js';
+import { p as provideWorkerState } from './utils.Ck2hJTRs.js';
+import './env.CmHVDJnw.js';
 
 const _require = createRequire(import.meta.url);
 const requiresCache = /* @__PURE__ */ new WeakMap();
@@ -84,7 +84,7 @@ class CommonjsExecutor {
       }
       // exposed for external use, Node.js does the opposite
       static _load = (request, parent, _isMain) => {
-        const require = Module$1.createRequire((parent == null ? void 0 : parent.filename) ?? request);
+        const require = Module$1.createRequire(parent?.filename ?? request);
         return require(request);
       };
       static wrap = (script) => {
@@ -240,8 +240,7 @@ function interopCommonJsModule(interopDefault, mod) {
       keys: Array.from(allKeys),
       moduleExports: new Proxy(mod, {
         get(mod2, prop) {
-          var _a;
-          return mod2[prop] ?? ((_a = mod2.default) == null ? void 0 : _a[prop]);
+          return mod2[prop] ?? mod2.default?.[prop];
         }
       }),
       defaultExport: mod
@@ -256,26 +255,16 @@ function interopCommonJsModule(interopDefault, mod) {
 const SyntheticModule$1 = vm.SyntheticModule;
 const SourceTextModule = vm.SourceTextModule;
 
-var __defProp$1 = Object.defineProperty;
-var __typeError$1 = (msg) => {
-  throw TypeError(msg);
-};
-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);
-var __accessCheck$1 = (obj, member, msg) => member.has(obj) || __typeError$1("Cannot " + msg);
-var __privateGet$1 = (obj, member, getter) => (__accessCheck$1(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd$1 = (obj, member, value) => member.has(obj) ? __typeError$1("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;
+  #httpIp = IPnumber("127.0.0.0");
   async evaluateModule(m) {
     if (m.status === "unlinked") {
       this.esmLinkMap.set(
@@ -344,7 +333,7 @@ class EsmExecutor {
   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)) {
+      if (url.hostname !== "localhost" && url.hostname !== "::1" && (IPnumber(url.hostname) & IPmask(8)) !== 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).`
@@ -447,7 +436,6 @@ class EsmExecutor {
     return this.createEsModule(identifier, () => code);
   }
 }
-_httpIp = new WeakMap();
 function IPnumber(address) {
   const ip = address.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/);
   if (ip) {
@@ -484,7 +472,7 @@ class ViteExecutor {
   getPackageName(modulePath) {
     const path = normalize(modulePath);
     let name = path.split("/node_modules/").pop() || "";
-    if (name == null ? void 0 : name.startsWith("@")) {
+    if (name?.startsWith("@")) {
       name = name.split("/").slice(0, 2).join("/");
     } else {
       name = name.split("/")[0];
@@ -530,7 +518,6 @@ class ViteExecutor {
     return module;
   }
   canResolve = (fileUrl) => {
-    var _a;
     const transformMode = this.workerState.environment.transformMode;
     if (transformMode !== "web") {
       return false;
@@ -538,7 +525,7 @@ class ViteExecutor {
     if (fileUrl === CLIENT_FILE) {
       return true;
     }
-    const config = ((_a = this.workerState.config.deps) == null ? void 0 : _a.web) || {};
+    const config = this.workerState.config.deps?.web || {};
     const [modulePath] = fileUrl.split("?");
     if (config.transformCss && CSS_LANGS_RE.test(modulePath)) {
       return true;
@@ -555,42 +542,12 @@ class ViteExecutor {
   };
 }
 
-var __defProp = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-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);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __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"), member.set(obj, value), value);
-var _networkSupported;
 const SyntheticModule = vm.SyntheticModule;
 const { existsSync, statSync } = fs;
 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 await 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, {
@@ -609,6 +566,13 @@ class ExternalModulesExecutor {
     });
     this.resolvers = [this.vite.resolve];
   }
+  cjs;
+  esm;
+  vite;
+  context;
+  fs;
+  resolvers = [];
+  #networkSupported = null;
   async import(identifier) {
     const module = await this.createModule(identifier);
     await this.esm.evaluateModule(module);
@@ -620,6 +584,18 @@ class ExternalModulesExecutor {
   createRequire(identifier) {
     return this.cjs.createRequire(identifier);
   }
+  // 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 await 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);
+  };
   resolve(specifier, parent) {
     for (const resolver of this.resolvers) {
       const id = resolver(specifier, parent);
@@ -630,7 +606,6 @@ class ExternalModulesExecutor {
     return nativeResolve(specifier, parent);
   }
   findNearestPackageData(basedir) {
-    var _a;
     const originalBasedir = basedir;
     const packageCache = this.options.packageCache;
     while (basedir) {
@@ -640,7 +615,7 @@ class ExternalModulesExecutor {
       }
       const pkgPath = join(basedir, "package.json");
       try {
-        if ((_a = statSync(pkgPath, { throwIfNoEntry: false })) == null ? void 0 : _a.isFile()) {
+        if (statSync(pkgPath, { throwIfNoEntry: false })?.isFile()) {
           const pkgData = JSON.parse(this.fs.readFile(pkgPath));
           if (packageCache) {
             setCacheData(packageCache, pkgData, basedir, originalBasedir);
@@ -756,20 +731,18 @@ class ExternalModulesExecutor {
     }
   }
   get isNetworkSupported() {
-    var _a;
-    if (__privateGet(this, _networkSupported) == null) {
+    if (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);
+        this.#networkSupported = true;
+      } else if (process.env.NODE_OPTIONS?.includes("--experimental-network-imports")) {
+        this.#networkSupported = true;
       } else {
-        __privateSet(this, _networkSupported, false);
+        this.#networkSupported = false;
       }
     }
-    return __privateGet(this, _networkSupported);
+    return this.#networkSupported;
   }
 }
-_networkSupported = new WeakMap();
 
 const { promises, readFileSync } = fs;
 class FileMap {
@@ -808,7 +781,6 @@ const entryFile = pathToFileURL(resolve(distDir, "workers/runVmTests.js")).href;
 const fileMap = new FileMap();
 const packageCache = /* @__PURE__ */ new Map();
 async function runVmTests(method, state) {
-  var _a;
   const { environment, ctx, rpc } = state;
   if (!environment.setupVM) {
     const envName = ctx.environment.name;
@@ -862,7 +834,7 @@ async function runVmTests(method, state) {
   try {
     await run(method, ctx.files, ctx.config, executor);
   } finally {
-    await ((_a = vm.teardown) == null ? void 0 : _a.call(vm));
+    await vm.teardown?.();
     state.environmentTeardownRun = true;
   }
 }