@vitest/browser 2.1.3 → 2.1.4

package/dist/client/__vitest_browser__/utils-CUwLt_eT.js

@@ -0,0 +1,81 @@
+(function polyfill() {
+  const relList = document.createElement("link").relList;
+  if (relList && relList.supports && relList.supports("modulepreload")) {
+    return;
+  }
+  for (const link of document.querySelectorAll('link[rel="modulepreload"]')) {
+    processPreload(link);
+  }
+  new MutationObserver((mutations) => {
+    for (const mutation of mutations) {
+      if (mutation.type !== "childList") {
+        continue;
+      }
+      for (const node of mutation.addedNodes) {
+        if (node.tagName === "LINK" && node.rel === "modulepreload")
+          processPreload(node);
+      }
+    }
+  }).observe(document, { childList: true, subtree: true });
+  function getFetchOpts(link) {
+    const fetchOpts = {};
+    if (link.integrity) fetchOpts.integrity = link.integrity;
+    if (link.referrerPolicy) fetchOpts.referrerPolicy = link.referrerPolicy;
+    if (link.crossOrigin === "use-credentials")
+      fetchOpts.credentials = "include";
+    else if (link.crossOrigin === "anonymous") fetchOpts.credentials = "omit";
+    else fetchOpts.credentials = "same-origin";
+    return fetchOpts;
+  }
+  function processPreload(link) {
+    if (link.ep)
+      return;
+    link.ep = true;
+    const fetchOpts = getFetchOpts(link);
+    fetch(link.href, fetchOpts);
+  }
+})();
+async function importId(id) {
+  const name = `/@id/${id}`.replace(/\\/g, "/");
+  return (/* @__PURE__ */ getBrowserState()).wrapModule(() => import(
+    /* @vite-ignore */
+    name
+  ));
+}
+async function importFs(id) {
+  const name = `/@fs/${id}`.replace(/\\/g, "/");
+  return (/* @__PURE__ */ getBrowserState()).wrapModule(() => import(
+    /* @vite-ignore */
+    name
+  ));
+}
+const executor = {
+  isBrowser: true,
+  executeId: (id) => {
+    if (id[0] === "/" || id[1] === ":") {
+      return importFs(id);
+    }
+    return importId(id);
+  }
+};
+function getConfig() {
+  return (/* @__PURE__ */ getBrowserState()).config;
+}
+// @__NO_SIDE_EFFECTS__
+function getBrowserState() {
+  return window.__vitest_browser_runner__;
+}
+// @__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;
+}
+export {
+  getConfig as a,
+  getWorkerState as b,
+  executor as e,
+  getBrowserState as g
+};

package/dist/client/error-catcher.js

@@ -56,7 +56,9 @@ async function reportUnexpectedError(
   error,
 ) {
   const processedError = serializeError(error)
-  await client.rpc.onUnhandledError(processedError, type)
+  await client.waitForConnection().then(() => {
+    return client.rpc.onUnhandledError(processedError, type)
+  }).catch(console.error)
   const state = __vitest_browser_runner__
 
   if (state.type === 'orchestrator') {

package/dist/client/esm-client-injector.js

@@ -1,50 +1,52 @@
-const moduleCache = new Map();
-
-function wrapModule(module) {
-  if (typeof module === "function") {
-    const promise = new Promise((resolve, reject) => {
-      if (typeof __vitest_mocker__ === "undefined")
-        return module().then(resolve, reject);
-      __vitest_mocker__.prepare().finally(() => {
-        module().then(resolve, reject);
+(() => {
+  const moduleCache = new Map();
+
+  function wrapModule(module) {
+    if (typeof module === "function") {
+      const promise = new Promise((resolve, reject) => {
+        if (typeof __vitest_mocker__ === "undefined")
+          return module().then(resolve, reject);
+        __vitest_mocker__.prepare().finally(() => {
+          module().then(resolve, reject);
+        });
       });
-    });
-    moduleCache.set(promise, { promise, evaluated: false });
-    return promise.finally(() => moduleCache.delete(promise));
+      moduleCache.set(promise, { promise, evaluated: false });
+      return promise.finally(() => moduleCache.delete(promise));
+    }
+    return module;
   }
-  return module;
-}
-
-window.__vitest_browser_runner__ = {
-  wrapModule,
-  wrapDynamicImport: wrapModule,
-  moduleCache,
-  config: { __VITEST_CONFIG__ },
-  viteConfig: { __VITEST_VITE_CONFIG__ },
-  files: { __VITEST_FILES__ },
-  type: { __VITEST_TYPE__ },
-  contextId: { __VITEST_CONTEXT_ID__ },
-  testerId: { __VITEST_TESTER_ID__ },
-  provider: { __VITEST_PROVIDER__ },
-  providedContext: { __VITEST_PROVIDED_CONTEXT__ },
-};
-
-const config = __vitest_browser_runner__.config;
-
-if (config.testNamePattern)
-  config.testNamePattern = parseRegexp(config.testNamePattern);
-
-function parseRegexp(input) {
-  // Parse input
-  const m = input.match(/(\/?)(.+)\1([a-z]*)/i);
-
-  // match nothing
-  if (!m) return /$^/;
-
-  // Invalid flags
-  if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3]))
-    return RegExp(input);
-
-  // Create the regular expression
-  return new RegExp(m[2], m[3]);
-}
+
+  window.__vitest_browser_runner__ = {
+    wrapModule,
+    wrapDynamicImport: wrapModule,
+    moduleCache,
+    config: { __VITEST_CONFIG__ },
+    viteConfig: { __VITEST_VITE_CONFIG__ },
+    files: { __VITEST_FILES__ },
+    type: { __VITEST_TYPE__ },
+    contextId: { __VITEST_CONTEXT_ID__ },
+    testerId: { __VITEST_TESTER_ID__ },
+    provider: { __VITEST_PROVIDER__ },
+    providedContext: { __VITEST_PROVIDED_CONTEXT__ },
+  };
+
+  const config = __vitest_browser_runner__.config;
+
+  if (config.testNamePattern)
+    config.testNamePattern = parseRegexp(config.testNamePattern);
+
+  function parseRegexp(input) {
+    // Parse input
+    const m = input.match(/(\/?)(.+)\1([a-z]*)/i);
+
+    // match nothing
+    if (!m) return /$^/;
+
+    // Invalid flags
+    if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3]))
+      return RegExp(input);
+
+    // Create the regular expression
+    return new RegExp(m[2], m[3]);
+  }
+})();

package/dist/client/orchestrator.html

@@ -26,8 +26,8 @@
     {__VITEST_INJECTOR__}
     {__VITEST_ERROR_CATCHER__}
     {__VITEST_SCRIPTS__}
-    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-BCPid0xo.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/preload-helper-D-WYp1PK.js">
+    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-NReaboR_.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-CUwLt_eT.js">
   </head>
   <body>
     <div id="vitest-tester"></div>

package/dist/client/tester/tester.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="{__VITEST_FAVICON__}" type="image/svg+xml">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>{__VITEST_TITLE__}</title>
+    <title>Vitest Browser Tester</title>
     <style>
       html {
         padding: 0;
@@ -16,14 +16,9 @@
         min-height: 100vh;
       }
     </style>
-    {__VITEST_INJECTOR__}
-    <script>{__VITEST_STATE__}</script>
-    {__VITEST_INTERNAL_SCRIPTS__}
-    {__VITEST_SCRIPTS__}
-    <script type="module" crossorigin src="/__vitest_browser__/tester-DZCtFstH.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/preload-helper-D-WYp1PK.js">
+    <script type="module" crossorigin src="/__vitest_browser__/tester-CAAquV6P.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-CUwLt_eT.js">
   </head>
   <body>
-    {__VITEST_APPEND__}
   </body>
 </html>

package/dist/client.js

@@ -9,18 +9,24 @@ function createBirpc(functions, options) {
   const {
     post,
     on,
+    off = () => {
+    },
     eventNames = [],
     serialize = defaultSerialize,
     deserialize = defaultDeserialize,
     resolver,
+    bind = "rpc",
     timeout = DEFAULT_TIMEOUT
   } = options;
   const rpcPromiseMap = /* @__PURE__ */ new Map();
   let _promise;
+  let closed = false;
   const rpc = new Proxy({}, {
     get(_, method) {
       if (method === "$functions")
         return functions;
+      if (method === "$close")
+        return close;
       if (method === "then" && !eventNames.includes("then") && !("then" in functions))
         return void 0;
       const sendEvent = (...args) => {
@@ -31,7 +37,15 @@ function createBirpc(functions, options) {
         return sendEvent;
       }
       const sendCall = async (...args) => {
-        await _promise;
+        if (closed)
+          throw new Error(`[birpc] rpc is closed, cannot call "${method}"`);
+        if (_promise) {
+          try {
+            await _promise;
+          } finally {
+            _promise = void 0;
+          }
+        }
         return new Promise((resolve, reject) => {
           const id = nanoid();
           let timeoutId;
@@ -48,7 +62,7 @@ function createBirpc(functions, options) {
             if (typeof timeoutId === "object")
               timeoutId = timeoutId.unref?.();
           }
-          rpcPromiseMap.set(id, { resolve, reject, timeoutId });
+          rpcPromiseMap.set(id, { resolve, reject, timeoutId, method });
           post(serialize({ m: method, a: args, i: id, t: "q" }));
         });
       };
@@ -56,7 +70,15 @@ function createBirpc(functions, options) {
       return sendCall;
     }
   });
-  _promise = on(async (data, ...extra) => {
+  function close() {
+    closed = true;
+    rpcPromiseMap.forEach(({ reject, method }) => {
+      reject(new Error(`[birpc] rpc is closed, cannot call "${method}"`));
+    });
+    rpcPromiseMap.clear();
+    off(onMessage);
+  }
+  async function onMessage(data, ...extra) {
     const msg = deserialize(data);
     if (msg.t === "q") {
       const { m: method, a: args } = msg;
@@ -66,7 +88,7 @@ function createBirpc(functions, options) {
         error = new Error(`[birpc] function "${method}" not found`);
       } else {
         try {
-          result = await fn.apply(rpc, args);
+          result = await fn.apply(bind === "rpc" ? rpc : functions, args);
         } catch (e) {
           error = e;
         }
@@ -88,7 +110,8 @@ function createBirpc(functions, options) {
       }
       rpcPromiseMap.delete(ack);
     }
-  });
+  }
+  _promise = on(onMessage);
   return rpc;
 }
 const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";

package/dist/context.js

@@ -90,22 +90,31 @@ const channel = new BroadcastChannel(`vitest:${contextId}`);
 function triggerCommand(command, ...args) {
   return rpc().triggerCommand(contextId, command, filepath(), args);
 }
-function createUserEvent(__tl_user_event__) {
+function createUserEvent(__tl_user_event_base__, options) {
+  let __tl_user_event__ = __tl_user_event_base__?.setup(options ?? {});
   const keyboard = {
     unreleased: []
   };
   return {
-    setup(options) {
-      return createUserEvent(__tl_user_event__?.setup(options));
+    setup(options2) {
+      return createUserEvent(__tl_user_event_base__, options2);
     },
-    click(element, options = {}) {
-      return convertToLocator(element).click(processClickOptions(options));
+    async cleanup() {
+      if (typeof __tl_user_event_base__ !== "undefined") {
+        __tl_user_event__ = __tl_user_event_base__?.setup(options ?? {});
+        return;
+      }
+      await triggerCommand("__vitest_cleanup", keyboard);
+      keyboard.unreleased = [];
+    },
+    click(element, options2 = {}) {
+      return convertToLocator(element).click(processClickOptions(options2));
     },
-    dblClick(element, options = {}) {
-      return convertToLocator(element).dblClick(processClickOptions(options));
+    dblClick(element, options2 = {}) {
+      return convertToLocator(element).dblClick(processClickOptions(options2));
     },
-    tripleClick(element, options = {}) {
-      return convertToLocator(element).tripleClick(processClickOptions(options));
+    tripleClick(element, options2 = {}) {
+      return convertToLocator(element).tripleClick(processClickOptions(options2));
     },
     selectOptions(element, value) {
       return convertToLocator(element).selectOptions(value);
@@ -113,31 +122,31 @@ function createUserEvent(__tl_user_event__) {
     clear(element) {
       return convertToLocator(element).clear();
     },
-    hover(element, options = {}) {
-      return convertToLocator(element).hover(processHoverOptions(options));
+    hover(element, options2 = {}) {
+      return convertToLocator(element).hover(processHoverOptions(options2));
     },
-    unhover(element, options = {}) {
-      return convertToLocator(element).unhover(options);
+    unhover(element, options2 = {}) {
+      return convertToLocator(element).unhover(options2);
     },
     upload(element, files) {
       return convertToLocator(element).upload(files);
     },
     // non userEvent events, but still useful
-    fill(element, text, options) {
-      return convertToLocator(element).fill(text, options);
+    fill(element, text, options2) {
+      return convertToLocator(element).fill(text, options2);
     },
-    dragAndDrop(source, target, options = {}) {
+    dragAndDrop(source, target, options2 = {}) {
       const sourceLocator = convertToLocator(source);
       const targetLocator = convertToLocator(target);
-      return sourceLocator.dropTo(targetLocator, processDragAndDropOptions(options));
+      return sourceLocator.dropTo(targetLocator, processDragAndDropOptions(options2));
     },
     // testing-library user-event
-    async type(element, text, options = {}) {
+    async type(element, text, options2 = {}) {
       if (typeof __tl_user_event__ !== "undefined") {
         return __tl_user_event__.type(
           element instanceof Element ? element : element.element(),
           text,
-          options
+          options2
         );
       }
       const selector = convertToSelector(element);
@@ -145,15 +154,15 @@ function createUserEvent(__tl_user_event__) {
         "__vitest_type",
         selector,
         text,
-        { ...options, unreleased: keyboard.unreleased }
+        { ...options2, unreleased: keyboard.unreleased }
       );
       keyboard.unreleased = unreleased;
     },
-    tab(options = {}) {
+    tab(options2 = {}) {
       if (typeof __tl_user_event__ !== "undefined") {
-        return __tl_user_event__.tab(options);
+        return __tl_user_event__.tab(options2);
       }
-      return triggerCommand("__vitest_tab", options);
+      return triggerCommand("__vitest_tab", options2);
     },
     async keyboard(text) {
       if (typeof __tl_user_event__ !== "undefined") {

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { CDPSession, BrowserServerState as BrowserServerState$1, BrowserServerStateContext, BrowserServer as BrowserServer$1, WorkspaceProject, Vite, BrowserProvider, BrowserScript, Vitest, ProcessPool } from 'vitest/node';
 import { Plugin } from 'vitest/config';
+import { CDPSession, BrowserServerState as BrowserServerState$1, BrowserServerStateContext, BrowserServer as BrowserServer$1, WorkspaceProject, Vite, BrowserProvider, BrowserScript, Vitest, ProcessPool } from 'vitest/node';
 import * as vitest from 'vitest';
-import { RunnerTestFile, TaskResultPack, AfterSuiteRunMeta, CancelReason, UserConsoleLog, SnapshotResult, SerializedConfig } from 'vitest';
-import { ErrorWithDiff } from '@vitest/utils';
+import { RunnerTestFile, TaskResultPack, AfterSuiteRunMeta, CancelReason, UserConsoleLog, SnapshotResult, SerializedConfig, ErrorWithDiff } from 'vitest';
+import { HtmlTagDescriptor } from 'vite';
 import { StackTraceParserOptions } from '@vitest/utils/source-map';
 import { ServerIdResolution, ServerMockResolution } from '@vitest/mocker/node';
 
@@ -19,6 +19,7 @@ type BirpcReturn<RemoteFunctions, LocalFunctions = Record<string, never>> = {
     [K in keyof RemoteFunctions]: BirpcFn<RemoteFunctions[K]>;
 } & {
     $functions: LocalFunctions;
+    $close: () => void;
 };
 
 interface WebSocketBrowserHandlers {
@@ -94,9 +95,10 @@ declare class BrowserServer implements BrowserServer$1 {
     faviconUrl: string;
     prefixTesterUrl: string;
     orchestratorScripts: string | undefined;
-    testerScripts: string | undefined;
+    testerScripts: HtmlTagDescriptor[] | undefined;
     manifest: Promise<Vite.Manifest> | Vite.Manifest;
     testerHtml: Promise<string> | string;
+    testerFilepath: string;
     orchestratorHtml: Promise<string> | string;
     injectorJs: Promise<string> | string;
     errorCatcherUrl: string;
@@ -113,7 +115,7 @@ declare class BrowserServer implements BrowserServer$1 {
         contextId: string;
         testFile: string;
     };
-    formatScripts(scripts: BrowserScript[] | undefined): Promise<string>;
+    formatScripts(scripts: BrowserScript[] | undefined): Promise<HtmlTagDescriptor[]>;
     initBrowserProvider(): Promise<void>;
     parseErrorStacktrace(e: ErrorWithDiff, options?: StackTraceParserOptions): vitest.ParsedStack[];
     parseStacktrace(trace: string, options?: StackTraceParserOptions): vitest.ParsedStack[];
@@ -122,8 +124,10 @@ declare class BrowserServer implements BrowserServer$1 {
     close(): Promise<void>;
 }
 
+declare const distRoot: string;
+
 declare function createBrowserPool(ctx: Vitest): ProcessPool;
 
 declare function createBrowserServer(project: WorkspaceProject, configFile: string | undefined, prePlugins?: Plugin[], postPlugins?: Plugin[]): Promise<BrowserServer>;
 
-export { BrowserServer, createBrowserPool, createBrowserServer };
+export { BrowserServer, createBrowserPool, createBrowserServer, distRoot };