@vitest/browser 2.0.0-beta.10 → 2.0.0-beta.11

package/dist/client/__vitest_browser__/{orchestrator-BCpOi5ot.js → orchestrator-DQ4hbmZ_.js}

@@ -1,10 +1,12 @@
-import { c as client, a as channel, g as getBrowserState, b as getConfig, r as relative, d as rpcDone } from "./rpc-CImfI7bO.js";
-import { http } from "/__virtual_vitest__:msw/core/http";
-import { setupWorker } from "/__virtual_vitest__:msw/browser";
+import { c as channel, g as getBrowserState, a as client, b as getConfig, r as relative, d as rpcDone } from "./rpc-D6HtJ5Rb.js";
+import { http } from "/__virtual_vitest__?id=msw%2Fcore%2Fhttp";
+import { setupWorker } from "/__virtual_vitest__?id=msw%2Fbrowser";
+import "/__virtual_vitest__?id=vitest%2Futils";
 function generateHash(str) {
   let hash = 0;
-  if (str.length === 0)
+  if (str.length === 0) {
     return `${hash}`;
+  }
   for (let i = 0; i < str.length; i++) {
     const char = str.charCodeAt(i);
     hash = (hash << 5) - hash + char;
@@ -20,15 +22,17 @@ function createModuleMocker() {
   const worker = setupWorker(
     http.get(/.+/, async ({ request }) => {
       const path = removeTimestamp(request.url.slice(location.origin.length));
-      if (!mocks.has(path))
+      if (!mocks.has(path)) {
         return passthrough();
+      }
       const mock = mocks.get(path);
       if (mock === void 0) {
         const exports = await getFactoryExports(path);
         const module = `const module = __vitest_mocker__.get('${path}');`;
         const keys = exports.map((name) => {
-          if (name === "default")
+          if (name === "default") {
             return `export default module['default'];`;
+          }
           return `export const ${name} = module['${name}'];`;
         }).join("\n");
         const text = `${module}
@@ -39,26 +43,24 @@ ${keys}`;
           }
         });
       }
-      if (typeof mock === "string")
+      if (typeof mock === "string") {
         return Response.redirect(mock);
-      const content = await client.rpc.automock(path);
-      return new Response(content, {
-        headers: {
-          "Content-Type": "application/javascript"
-        }
-      });
+      }
+      return Response.redirect(injectQuery(path, "mock=auto"));
     })
   );
   let started = false;
   let startPromise;
   async function init() {
-    if (started)
+    if (started) {
       return;
-    if (startPromise)
+    }
+    if (startPromise) {
       return startPromise;
+    }
     startPromise = worker.start({
       serviceWorker: {
-        url: "/__virtual_vitest__:mocker-worker.js"
+        url: "/__vitest_msw__"
       },
       quiet: true
     }).finally(() => {
@@ -89,16 +91,19 @@ function getFactoryExports(id) {
     id
   });
   return new Promise((resolve, reject) => {
-    channel.addEventListener("message", function onMessage(e) {
-      if (e.data.type === "mock-factory:response") {
-        resolve(e.data.exports);
-        channel.removeEventListener("message", onMessage);
-      }
-      if (e.data.type === "mock-factory:error") {
-        reject(e.data.error);
-        channel.removeEventListener("message", onMessage);
+    channel.addEventListener(
+      "message",
+      function onMessage(e) {
+        if (e.data.type === "mock-factory:response") {
+          resolve(e.data.exports);
+          channel.removeEventListener("message", onMessage);
+        }
+        if (e.data.type === "mock-factory:error") {
+          reject(e.data.error);
+          channel.removeEventListener("message", onMessage);
+        }
       }
-    });
+    );
   });
 }
 const timestampRegexp = /(\?|&)t=\d{13}/;
@@ -114,6 +119,20 @@ function passthrough() {
     }
   });
 }
+const postfixRE = /[?#].*$/;
+function cleanUrl(url2) {
+  return url2.replace(postfixRE, "");
+}
+const replacePercentageRE = /%/g;
+function injectQuery(url2, queryToInject) {
+  const resolvedUrl = new URL(
+    url2.replace(replacePercentageRE, "%25"),
+    location.href
+  );
+  const { search, hash } = resolvedUrl;
+  const pathname = cleanUrl(url2);
+  return `${pathname}?${queryToInject}${search ? `&${search.slice(1)}` : ""}${hash ?? ""}`;
+}
 const url = new URL(location.href);
 const ID_ALL = "__vitest_all__";
 const iframes = /* @__PURE__ */ new Map();
@@ -127,8 +146,9 @@ getBrowserState().createTesters = async (files) => {
 };
 function debug(...args) {
   const debug2 = getConfig().env.VITEST_BROWSER_DEBUG;
-  if (debug2 && debug2 !== "false")
+  if (debug2 && debug2 !== "false") {
     client.rpc.debug(...args.map(String));
+  }
 }
 function createIframe(container, file) {
   if (iframes.has(file)) {
@@ -137,7 +157,10 @@ function createIframe(container, file) {
   }
   const iframe = document.createElement("iframe");
   iframe.setAttribute("loading", "eager");
-  iframe.setAttribute("src", `${url.pathname}__vitest_test__/__test__/${getBrowserState().contextId}/${encodeURIComponent(file)}`);
+  iframe.setAttribute(
+    "src",
+    `${url.pathname}__vitest_test__/__test__/${getBrowserState().contextId}/${encodeURIComponent(file)}`
+  );
   iframe.setAttribute("data-vitest", "true");
   iframe.style.display = "block";
   iframe.style.border = "none";
@@ -145,6 +168,7 @@ function createIframe(container, file) {
   iframe.style.position = "relative";
   iframe.setAttribute("allowfullscreen", "true");
   iframe.setAttribute("allow", "clipboard-write;");
+  iframe.setAttribute("name", "vitest-iframe");
   iframes.set(file, iframe);
   container.appendChild(iframe);
   return iframe;
@@ -174,79 +198,95 @@ client.ws.addEventListener("open", async () => {
   runningFiles.clear();
   testFiles.forEach((file) => runningFiles.add(file));
   const mocker = createModuleMocker();
-  channel.addEventListener("message", async (e) => {
-    var _a;
-    debug("channel event", JSON.stringify(e.data));
-    switch (e.data.type) {
-      case "viewport": {
-        const { width, height, id } = e.data;
-        const iframe = iframes.get(id);
-        if (!iframe) {
-          const error = new Error(`Cannot find iframe with id ${id}`);
-          channel.postMessage({ type: "viewport:fail", id, error: error.message });
-          await client.rpc.onUnhandledError({
-            name: "Teardown Error",
-            message: error.message
-          }, "Teardown Error");
-          return;
+  channel.addEventListener(
+    "message",
+    async (e) => {
+      var _a;
+      debug("channel event", JSON.stringify(e.data));
+      switch (e.data.type) {
+        case "viewport": {
+          const { width, height, id } = e.data;
+          const iframe = iframes.get(id);
+          if (!iframe) {
+            const error = new Error(`Cannot find iframe with id ${id}`);
+            channel.postMessage({
+              type: "viewport:fail",
+              id,
+              error: error.message
+            });
+            await client.rpc.onUnhandledError(
+              {
+                name: "Teardown Error",
+                message: error.message
+              },
+              "Teardown Error"
+            );
+            return;
+          }
+          await setIframeViewport(iframe, width, height);
+          channel.postMessage({ type: "viewport:done", id });
+          break;
         }
-        await setIframeViewport(iframe, width, height);
-        channel.postMessage({ type: "viewport:done", id });
-        break;
-      }
-      case "done": {
-        const filenames = e.data.filenames;
-        filenames.forEach((filename) => runningFiles.delete(filename));
-        if (!runningFiles.size) {
-          const ui = getUiAPI();
-          if (ui && filenames.length > 1) {
-            const id = generateFileId(filenames[filenames.length - 1]);
-            ui.setCurrentFileId(id);
+        case "done": {
+          const filenames = e.data.filenames;
+          filenames.forEach((filename) => runningFiles.delete(filename));
+          if (!runningFiles.size) {
+            const ui = getUiAPI();
+            if (ui && filenames.length > 1) {
+              const id = generateFileId(filenames[filenames.length - 1]);
+              ui.setCurrentFileId(id);
+            }
+            await done();
+          } else {
+            const iframeId = e.data.id;
+            (_a = iframes.get(iframeId)) == null ? void 0 : _a.remove();
+            iframes.delete(iframeId);
           }
-          await done();
-        } else {
+          break;
+        }
+        case "error": {
           const iframeId = e.data.id;
-          (_a = iframes.get(iframeId)) == null ? void 0 : _a.remove();
           iframes.delete(iframeId);
+          await client.rpc.onUnhandledError(e.data.error, e.data.errorType);
+          if (iframeId === ID_ALL) {
+            runningFiles.clear();
+          } else {
+            runningFiles.delete(iframeId);
+          }
+          if (!runningFiles.size) {
+            await done();
+          }
+          break;
         }
-        break;
-      }
-      case "error": {
-        const iframeId = e.data.id;
-        iframes.delete(iframeId);
-        await client.rpc.onUnhandledError(e.data.error, e.data.errorType);
-        if (iframeId === ID_ALL)
-          runningFiles.clear();
-        else
-          runningFiles.delete(iframeId);
-        if (!runningFiles.size)
+        case "mock:invalidate":
+          mocker.invalidate();
+          break;
+        case "unmock":
+          await mocker.unmock(e.data);
+          break;
+        case "mock":
+          await mocker.mock(e.data);
+          break;
+        case "mock-factory:error":
+        case "mock-factory:response":
+          break;
+        default: {
+          e.data;
+          await client.rpc.onUnhandledError(
+            {
+              name: "Unexpected Event",
+              message: `Unexpected event: ${e.data.type}`
+            },
+            "Unexpected Event"
+          );
           await done();
-        break;
-      }
-      case "mock:invalidate":
-        mocker.invalidate();
-        break;
-      case "unmock":
-        await mocker.unmock(e.data);
-        break;
-      case "mock":
-        await mocker.mock(e.data);
-        break;
-      case "mock-factory:error":
-      case "mock-factory:response":
-        break;
-      default: {
-        e.data;
-        await client.rpc.onUnhandledError({
-          name: "Unexpected Event",
-          message: `Unexpected event: ${e.data.type}`
-        }, "Unexpected Event");
-        await done();
+        }
       }
     }
-  });
-  if (testFiles.length)
+  );
+  if (testFiles.length) {
     await createTesters(testFiles);
+  }
 });
 async function createTesters(testFiles) {
   runningFiles.clear();
@@ -261,25 +301,22 @@ async function createTesters(testFiles) {
   iframes.forEach((iframe) => iframe.remove());
   iframes.clear();
   if (config.isolate === false) {
-    const iframe = createIframe(
-      container,
-      ID_ALL
-    );
+    const iframe = createIframe(container, ID_ALL);
     await setIframeViewport(iframe, width, height);
   } else {
     for (const file of testFiles) {
-      const iframe = createIframe(
-        container,
-        file
-      );
+      const iframe = createIframe(container, file);
       await setIframeViewport(iframe, width, height);
       await new Promise((resolve) => {
-        channel.addEventListener("message", function handler(e) {
-          if (e.data.type === "done" || e.data.type === "error") {
-            channel.removeEventListener("message", handler);
-            resolve();
+        channel.addEventListener(
+          "message",
+          function handler(e) {
+            if (e.data.type === "done" || e.data.type === "error") {
+              channel.removeEventListener("message", handler);
+              resolve();
+            }
           }
-        });
+        );
       });
     }
   }

package/dist/client/__vitest_browser__/{rpc-CImfI7bO.js → rpc-D6HtJ5Rb.js}

@@ -4,6 +4,7 @@ function __vite__mapDeps(indexes) {
   }
   return indexes.map((i) => __vite__mapDeps.viteFileDeps[i])
 }
+import { getSafeTimers } from "/__virtual_vitest__?id=vitest%2Futils";
 (function polyfill() {
   const relList = document.createElement("link").relList;
   if (relList && relList.supports && relList.supports("modulepreload")) {
@@ -438,28 +439,44 @@ const __vitePreload = function preload(baseModule, deps, importerUrl) {
 };
 async function importId(id) {
   const name = `/@id/${id}`;
-  return getBrowserState().wrapModule(() => __vitePreload(() => import(name), true ? __vite__mapDeps([]) : void 0));
+  return (/* @__PURE__ */ getBrowserState()).wrapModule(() => __vitePreload(() => import(name), true ? __vite__mapDeps([]) : void 0));
 }
 function getConfig() {
-  return getBrowserState().config;
+  return (/* @__PURE__ */ getBrowserState()).config;
 }
+// @__NO_SIDE_EFFECTS__
 function getBrowserState() {
   return window.__vitest_browser_runner__;
 }
-const channel = new BroadcastChannel(`vitest:${getBrowserState().contextId}`);
+// @__NO_SIDE_EFFECTS__
+function getWorkerState() {
+  const state = window.__vitest_worker__;
+  if (!state) {
+    throw new Error("Worker state is not found. This is an issue with Vitest. Please, open an issue.");
+  }
+  return state;
+}
+const channel = new BroadcastChannel(
+  `vitest:${(/* @__PURE__ */ getBrowserState()).contextId}`
+);
 function waitForChannel(event) {
   return new Promise((resolve2) => {
-    channel.addEventListener("message", (e) => {
-      var _a;
-      if (((_a = e.data) == null ? void 0 : _a.type) === event)
-        resolve2();
-    }, { once: true });
+    channel.addEventListener(
+      "message",
+      (e) => {
+        var _a;
+        if (((_a = e.data) == null ? void 0 : _a.type) === event) {
+          resolve2();
+        }
+      },
+      { once: true }
+    );
   });
 }
-const PAGE_TYPE = getBrowserState().type;
+const PAGE_TYPE = (/* @__PURE__ */ getBrowserState()).type;
 const PORT = location.port;
 const HOST = [location.hostname, PORT].filter(Boolean).join(":");
-const SESSION_ID = PAGE_TYPE === "orchestrator" ? getBrowserState().contextId : crypto.randomUUID();
+const SESSION_ID = PAGE_TYPE === "orchestrator" ? (/* @__PURE__ */ getBrowserState()).contextId : crypto.randomUUID();
 const ENTRY_URL = `${location.protocol === "https:" ? "wss:" : "ws:"}//${HOST}/__vitest_browser_api__?type=${PAGE_TYPE}&sessionId=${SESSION_ID}`;
 let setCancel = (_) => {
 };
@@ -476,43 +493,41 @@ function createClient() {
     waitForConnection
   };
   let onMessage;
-  ctx.rpc = createBirpc({
-    onCancel: setCancel,
-    async startMocking(id) {
-      if (typeof __vitest_mocker__ === "undefined")
-        throw new Error(`Cannot mock modules in the orchestrator process`);
-      const mocker = __vitest_mocker__;
-      const exports = await mocker.resolve(id);
-      return Object.keys(exports);
+  ctx.rpc = createBirpc(
+    {
+      onCancel: setCancel,
+      async createTesters(files) {
+        var _a, _b;
+        if (PAGE_TYPE !== "orchestrator") {
+          return;
+        }
+        (_b = (_a = /* @__PURE__ */ getBrowserState()).createTesters) == null ? void 0 : _b.call(_a, files);
+      }
     },
-    async createTesters(files) {
-      var _a, _b;
-      if (PAGE_TYPE !== "orchestrator")
-        return;
-      (_b = (_a = getBrowserState()).createTesters) == null ? void 0 : _b.call(_a, files);
-    }
-  }, {
-    post: (msg) => ctx.ws.send(msg),
-    on: (fn) => onMessage = fn,
-    serialize: (e) => stringify(e, (_, v) => {
-      if (v instanceof Error) {
-        return {
-          name: v.name,
-          message: v.message,
-          stack: v.stack
-        };
+    {
+      post: (msg) => ctx.ws.send(msg),
+      on: (fn) => onMessage = fn,
+      serialize: (e) => stringify(e, (_, v) => {
+        if (v instanceof Error) {
+          return {
+            name: v.name,
+            message: v.message,
+            stack: v.stack
+          };
+        }
+        return v;
+      }),
+      deserialize: parse,
+      onTimeoutError(functionName) {
+        throw new Error(`[vitest-browser]: Timeout calling "${functionName}"`);
       }
-      return v;
-    }),
-    deserialize: parse,
-    onTimeoutError(functionName) {
-      throw new Error(`[vitest-browser]: Timeout calling "${functionName}"`);
     }
-  });
+  );
   let openPromise;
   function reconnect(reset = false) {
-    if (reset)
+    if (reset) {
       tries = reconnectTries;
+    }
     ctx.ws = new WebSocket(ENTRY_URL);
     registerWS();
   }
@@ -520,10 +535,15 @@ function createClient() {
     openPromise = new Promise((resolve2, reject) => {
       var _a, _b;
       const timeout = (_b = (_a = setTimeout(() => {
-        reject(new Error(`Cannot connect to the server in ${connectTimeout / 1e3} seconds`));
+        reject(
+          new Error(
+            `Cannot connect to the server in ${connectTimeout / 1e3} seconds`
+          )
+        );
       }, connectTimeout)) == null ? void 0 : _a.unref) == null ? void 0 : _b.call(_a);
-      if (ctx.ws.OPEN === ctx.ws.readyState)
+      if (ctx.ws.OPEN === ctx.ws.readyState) {
         resolve2();
+      }
       ctx.ws.addEventListener("open", () => {
         tries = reconnectTries;
         resolve2();
@@ -535,8 +555,9 @@ function createClient() {
     });
     ctx.ws.addEventListener("close", () => {
       tries -= 1;
-      if (tries > 0)
+      if (tries > 0) {
         setTimeout(reconnect, reconnectInterval);
+      }
     });
   }
   registerWS();
@@ -569,18 +590,20 @@ function withSafeTimers(getTimers, fn) {
 }
 const promises = /* @__PURE__ */ new Set();
 async function rpcDone() {
-  if (!promises.size)
+  if (!promises.size) {
     return;
+  }
   const awaitable = Array.from(promises);
   return Promise.all(awaitable);
 }
-function createSafeRpc(client2, getTimers) {
+function createSafeRpc(client2) {
   return new Proxy(client2.rpc, {
     get(target, p, handler) {
-      if (p === "then")
+      if (p === "then") {
         return;
+      }
       const sendCall = get(target, p, handler);
-      const safeSendCall = (...args) => withSafeTimers(getTimers, async () => {
+      const safeSendCall = (...args) => withSafeTimers(getSafeTimers, async () => {
         const result = sendCall(...args);
         promises.add(result);
         try {
@@ -594,25 +617,22 @@ function createSafeRpc(client2, getTimers) {
     }
   });
 }
-async function loadSafeRpc(client2) {
-  const { getSafeTimers } = await importId("vitest/utils");
-  return createSafeRpc(client2, getSafeTimers);
-}
 function rpc() {
   return globalThis.__vitest_worker__.rpc;
 }
 export {
   __vitePreload as _,
-  channel as a,
+  client as a,
   getConfig as b,
-  client as c,
+  channel as c,
   rpcDone as d,
   rpc as e,
   extname as f,
   getBrowserState as g,
+  createSafeRpc as h,
   importId as i,
   join as j,
-  loadSafeRpc as l,
+  getWorkerState as k,
   onCancel as o,
   relative as r,
   waitForChannel as w