@vitest/browser 4.0.6 → 4.0.8

package/dist/index.js

@@ -18,7 +18,7 @@ import { PNG } from 'pngjs';
 import pm from 'pixelmatch';
 import { WebSocketServer } from 'ws';
 
-var version = "4.0.6";
+var version = "4.0.8";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -950,6 +950,12 @@ var BrowserPlugin = (parentServer, base = "/") => {
 						single: true,
 						dev: true,
 						setHeaders: (res) => {
+							const csp = res.getHeader("Content-Security-Policy");
+							if (typeof csp === "string") {
+								// add frame-ancestors to allow the iframe to be loaded by Vitest,
+								// but keep the rest of the CSP
+								res.setHeader("Content-Security-Policy", csp.replace(/frame-ancestors [^;]+/, "frame-ancestors *"));
+							}
 							res.setHeader("Cache-Control", "public,max-age=0,must-revalidate");
 						}
 					}));
@@ -2681,7 +2687,7 @@ function createBirpc(functions, options) {
     timeout = DEFAULT_TIMEOUT
   } = options;
   const rpcPromiseMap = /* @__PURE__ */ new Map();
-  let _promise;
+  let _promiseInit;
   let closed = false;
   const rpc = new Proxy({}, {
     get(_, method) {
@@ -2696,8 +2702,8 @@ function createBirpc(functions, options) {
         return closed;
       if (method === "then" && !eventNames.includes("then") && !("then" in functions))
         return void 0;
-      const sendEvent = (...args) => {
-        post(serialize({ m: method, a: args, t: TYPE_REQUEST }));
+      const sendEvent = async (...args) => {
+        await post(serialize({ m: method, a: args, t: TYPE_REQUEST }));
       };
       if (eventNames.includes(method)) {
         sendEvent.asEvent = sendEvent;
@@ -2706,16 +2712,18 @@ function createBirpc(functions, options) {
       const sendCall = async (...args) => {
         if (closed)
           throw new Error(`[birpc] rpc is closed, cannot call "${method}"`);
-        if (_promise) {
+        if (_promiseInit) {
           try {
-            await _promise;
+            await _promiseInit;
           } finally {
-            _promise = void 0;
+            _promiseInit = void 0;
           }
         }
-        return new Promise((resolve, reject) => {
-          const id = nanoid();
-          let timeoutId;
+        let { promise, resolve, reject } = createPromiseWithResolvers();
+        const id = nanoid();
+        let timeoutId;
+        const _req = { m: method, a: args, i: id, t: TYPE_REQUEST };
+        async function handler(req = _req) {
           if (timeout >= 0) {
             timeoutId = setTimeout$1(() => {
               try {
@@ -2731,8 +2739,22 @@ function createBirpc(functions, options) {
               timeoutId = timeoutId.unref?.();
           }
           rpcPromiseMap.set(id, { resolve, reject, timeoutId, method });
-          post(serialize({ m: method, a: args, i: id, t: "q" }));
-        });
+          await post(serialize(req));
+          return promise;
+        }
+        try {
+          if (options.onRequest)
+            await options.onRequest(_req, handler, resolve);
+          else
+            await handler();
+        } catch (e) {
+          clearTimeout(timeoutId);
+          rpcPromiseMap.delete(id);
+          if (options.onGeneralError?.(e) !== true)
+            throw e;
+          return;
+        }
+        return promise;
       };
       sendCall.asEvent = sendEvent;
       return sendCall;
@@ -2774,7 +2796,7 @@ function createBirpc(functions, options) {
     if (msg.t === TYPE_REQUEST) {
       const { m: method, a: args } = msg;
       let result, error;
-      const fn = resolver ? resolver(method, functions[method]) : functions[method];
+      const fn = await (resolver ? resolver(method, functions[method]) : functions[method]);
       if (!fn) {
         error = new Error(`[birpc] function "${method}" not found`);
       } else {
@@ -2793,7 +2815,7 @@ function createBirpc(functions, options) {
         }
         if (!error) {
           try {
-            post(serialize({ t: TYPE_RESPONSE, i: msg.i, r: result }), ...extra);
+            await post(serialize({ t: TYPE_RESPONSE, i: msg.i, r: result }), ...extra);
             return;
           } catch (e) {
             error = e;
@@ -2802,7 +2824,7 @@ function createBirpc(functions, options) {
           }
         }
         try {
-          post(serialize({ t: TYPE_RESPONSE, i: msg.i, e: error }), ...extra);
+          await post(serialize({ t: TYPE_RESPONSE, i: msg.i, e: error }), ...extra);
         } catch (e) {
           if (options.onGeneralError?.(e, method, args) !== true)
             throw e;
@@ -2821,9 +2843,18 @@ function createBirpc(functions, options) {
       rpcPromiseMap.delete(ack);
     }
   }
-  _promise = on(onMessage);
+  _promiseInit = on(onMessage);
   return rpc;
 }
+function createPromiseWithResolvers() {
+  let resolve;
+  let reject;
+  const promise = new Promise((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
 const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 function nanoid(size = 21) {
   let id = "";

package/dist/locators.js

@@ -1 +1 @@
-export{L as Locator,o as convertElementToCssSelector,r as getByAltTextSelector,t as getByLabelSelector,u as getByPlaceholderSelector,v as getByRoleSelector,w as getByTestIdSelector,x as getByTextSelector,y as getByTitleSelector,q as getIframeScale,p as processTimeoutOptions,s as selectorEngine}from"./index-BnLTaCRv.js";import"vitest/browser";import"vitest/internal/browser";
+export{L as Locator,o as convertElementToCssSelector,r as getByAltTextSelector,t as getByLabelSelector,u as getByPlaceholderSelector,v as getByRoleSelector,w as getByTestIdSelector,x as getByTextSelector,y as getByTitleSelector,q as getIframeScale,p as processTimeoutOptions,s as selectorEngine}from"./index-hFpxawnd.js";import"vitest/browser";import"vitest/internal/browser";

package/dist/state.js

@@ -179,6 +179,7 @@ export async function resolve(specifier, context, nextResolve) {
 	const sessionId = getBrowserState().sessionId;
 	const state = {
 		ctx: {
+			rpc: null,
 			pool: "browser",
 			workerId: 1,
 			config,

package/jest-dom.d.ts

@@ -1,7 +1,7 @@
 // Disable automatic exports.
 
 import { ARIARole } from './aria-role.ts'
-import { ScreenshotComparatorRegistry, ScreenshotMatcherOptions } from './context.js'
+import { Locator, ScreenshotComparatorRegistry, ScreenshotMatcherOptions } from './context.js'
 
 export interface TestingLibraryMatchers<E, R> {
   /**
@@ -12,7 +12,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * await expect.element(page.getByTestId('svg-element')).toBeInTheDocument()
    * await expect.element(page.getByTestId('does-not-exist')).not.toBeInTheDocument()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobeinthedocument
+   * @see https://vitest.dev/api/browser/assertions#tobeinthedocument
    */
   toBeInTheDocument(): R
   /**
@@ -58,7 +58,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * // Check if element is completely visible
    * await expect.element(page.getByTestId('visible-element')).toBeInViewport({ ratio: 1 })
-   * @see https://vitest.dev/guide/browser/assertion-api#tobeinviewport
+   * @see https://vitest.dev/api/browser/assertions#tobeinviewport
    */
   toBeInViewport(options?: { ratio?: number }): R
   /**
@@ -84,7 +84,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * await expect.element(page.getByTestId('zero-opacity')).not.toBeVisible()
    * await expect.element(page.getByTestId('visible')).toBeVisible()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobevisible
+   * @see https://vitest.dev/api/browser/assertions#tobevisible
    */
   toBeVisible(): R
   /**
@@ -97,7 +97,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * await expect.element(page.getByTestId('empty')).toBeEmptyDOMElement()
    * await expect.element(page.getByTestId('not-empty')).not.toBeEmptyDOMElement()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobeemptydomelement
+   * @see https://vitest.dev/api/browser/assertions#tobeemptydomelement
    */
   toBeEmptyDOMElement(): R
   /**
@@ -116,7 +116,7 @@ export interface TestingLibraryMatchers<E, R> {
    * </button>
    *
    * await expect.element(page.getByTestId('button')).toBeDisabled()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobedisabled
+   * @see https://vitest.dev/api/browser/assertions#tobedisabled
    */
   toBeDisabled(): R
   /**
@@ -135,7 +135,7 @@ export interface TestingLibraryMatchers<E, R> {
    * </button>
    *
    * await expect.element(page.getByTestId('button')).toBeEnabled()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobeenabled
+   * @see https://vitest.dev/api/browser/assertions#tobeenabled
    */
   toBeEnabled(): R
   /**
@@ -153,7 +153,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * await expect(page.getByTestId('no-aria-invalid')).not.toBeInvalid()
    * await expect(page.getByTestId('invalid-form')).toBeInvalid()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobeinvalid
+   * @see https://vitest.dev/api/browser/assertions#tobeinvalid
    */
   toBeInvalid(): R
   /**
@@ -170,7 +170,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * await expect.element(page.getByTestId('required-input')).toBeRequired()
    * await expect.element(page.getByTestId('supported-role')).not.toBeRequired()
-   * @see https://vitest.dev/guide/browser/assertion-api#toberequired
+   * @see https://vitest.dev/api/browser/assertions#toberequired
    */
   toBeRequired(): R
   /**
@@ -188,7 +188,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * await expect.element(page.getByTestId('no-aria-invalid')).not.toBeValid()
    * await expect.element(page.getByTestId('invalid-form')).toBeInvalid()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobevalid
+   * @see https://vitest.dev/api/browser/assertions#tobevalid
    */
   toBeValid(): R
   /**
@@ -205,9 +205,9 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(ancestor).toContainElement(descendant)
    * await expect.element(descendant).not.toContainElement(ancestor)
    * await expect.element(ancestor).not.toContainElement(nonExistentElement)
-   * @see https://vitest.dev/guide/browser/assertion-api#tocontainelement
+   * @see https://vitest.dev/api/browser/assertions#tocontainelement
    */
-  toContainElement(element: HTMLElement | SVGElement | null): R
+  toContainElement(element: HTMLElement | SVGElement | Locator | null): R
   /**
    * @description
    * Assert whether a string representing a HTML element is contained in another element.
@@ -216,7 +216,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * const parent = page.getByTestId('parent')
    * await expect.element(parent).toContainHTML('<span data-testid="child"></span>')
-   * @see https://vitest.dev/guide/browser/assertion-api#tocontainhtml
+   * @see https://vitest.dev/api/browser/assertions#tocontainhtml
    */
   toContainHTML(htmlText: string): R
   /**
@@ -238,7 +238,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(button).toHaveAttribute('disabled')
    * await expect.element(button).toHaveAttribute('type', 'submit')
    * await expect.element(button).not.toHaveAttribute('type', 'button')
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaveattribute
+   * @see https://vitest.dev/api/browser/assertions#tohaveattribute
    */
   toHaveAttribute(attr: string, value?: unknown): R
   /**
@@ -264,7 +264,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(deleteButton).toHaveClass('btn xs btn-danger', {exact: true})
    * await expect.element(deleteButton).not.toHaveClass('btn xs btn-danger', {exact: true})
    * await expect.element(noClasses).not.toHaveClass()
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaveclass
+   * @see https://vitest.dev/api/browser/assertions#tohaveclass
    */
   toHaveClass(...classNames:
    | (string | RegExp)[]
@@ -316,7 +316,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(selectSingle).toHaveDisplayValue('Select a fruit...')
    * await expect.element(selectMultiple).toHaveDisplayValue(['Banana', 'Avocado'])
    *
-   * @see https://vitest.dev/guide/browser/assertion-api#tohavedisplayvalue
+   * @see https://vitest.dev/api/browser/assertions#tohavedisplayvalue
    */
   toHaveDisplayValue(value: string | number | RegExp | Array<string | RegExp | number>): R
   /**
@@ -332,7 +332,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(input).toHaveFocus()
    * input.element().blur()
    * await expect.element(input).not.toHaveFocus()
-   * @see https://vitest.dev/guide/browser/assertion-api#tohavefocus
+   * @see https://vitest.dev/api/browser/assertions#tohavefocus
    */
   toHaveFocus(): R
   /**
@@ -352,7 +352,7 @@ export interface TestingLibraryMatchers<E, R> {
    *   username: 'jane.doe',
    *   rememberMe: true,
    * })
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaveformvalues
+   * @see https://vitest.dev/api/browser/assertions#tohaveformvalues
    */
   toHaveFormValues(expectedValues: Record<string, unknown>): R
   /**
@@ -374,7 +374,7 @@ export interface TestingLibraryMatchers<E, R> {
    *   'background-color': 'green',
    *   display: 'none'
    * })
-   * @see https://vitest.dev/guide/browser/assertion-api#tohavestyle
+   * @see https://vitest.dev/api/browser/assertions#tohavestyle
    */
   toHaveStyle(css: string | Partial<CSSStyleDeclaration>): R
   /**
@@ -397,7 +397,7 @@ export interface TestingLibraryMatchers<E, R> {
    * // to use case-insensitive match
    * await expect.element(element).toHaveTextContent(/content$/i)
    * await expect.element(element).not.toHaveTextContent('content')
-   * @see https://vitest.dev/guide/browser/assertion-api#tohavetextcontent
+   * @see https://vitest.dev/api/browser/assertions#tohavetextcontent
    */
   toHaveTextContent(
     text: string | number | RegExp,
@@ -409,8 +409,8 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * Accepts `<input>`, `<select>`, and `<textarea>` elements with the exception of `<input type="checkbox">` and
    * `<input type="radiobox">`, which can be matched only using
-   * [toBeChecked](https://vitest.dev/guide/browser/assertion-api#tobechecked) or
-   * [toHaveFormValues](https://vitest.dev/guide/browser/assertion-api#tohaveformvalues).
+   * [toBeChecked](https://vitest.dev/api/browser/assertions#tobechecked) or
+   * [toHaveFormValues](https://vitest.dev/api/browser/assertions#tohaveformvalues).
    * @example
    * <input
    *   type="number"
@@ -419,7 +419,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * const numberInput = page.getByTestId('input-number')
    * await expect.element(numberInput).toHaveValue(5)
-   * @see https://vitest.dev/guide/browser/assertion-api#tohavevalue
+   * @see https://vitest.dev/api/browser/assertions#tohavevalue
    */
   toHaveValue(value?: string | string[] | number | null): R
   /**
@@ -442,7 +442,7 @@ export interface TestingLibraryMatchers<E, R> {
    * const inputRadio = page.getByTestId('input-radio')
    * await expect.element(inputCheckbox).toBeChecked()
    * await expect.element(inputRadio).not.toBeChecked()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobechecked
+   * @see https://vitest.dev/api/browser/assertions#tobechecked
    */
   toBeChecked(): R
   /**
@@ -467,7 +467,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(page.getByTestId('avatar')).not.toHaveAccessibleDescription()
    * await expect.element(page.getByTestId('logo')).not.toHaveAccessibleDescription('Company logo')
    * await expect.element(page.getByTestId('logo')).toHaveAccessibleDescription('The logo of Our Company')
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaveaccessibledescription
+   * @see https://vitest.dev/api/browser/assertions#tohaveaccessibledescription
    */
   toHaveAccessibleDescription(text?: string | RegExp | E): R
 
@@ -506,7 +506,7 @@ export interface TestingLibraryMatchers<E, R> {
    *   page.getByRole('textbox', {name: 'Not Invalid'}),
    * ).not.toHaveAccessibleErrorMessage()
    *
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaveaccessibleerrormessage
+   * @see https://vitest.dev/api/browser/assertions#tohaveaccessibleerrormessage
    */
   toHaveAccessibleErrorMessage(text?: string | RegExp | E): R
 
@@ -537,7 +537,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(page.getByTestId('svg-button')).toHaveAccessibleName()
    * await expect.element(page.getByTestId('svg-without-title')).not.toHaveAccessibleName()
    * await expect.element(page.getByTestId('input-title')).toHaveAccessibleName()
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaveaccessiblename
+   * @see https://vitest.dev/api/browser/assertions#tohaveaccessiblename
    */
   toHaveAccessibleName(text?: string | RegExp | E): R
   /**
@@ -573,7 +573,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(page.getByTestId('link-invalid')).not.toHaveRole('link')
    * await expect.element(page.getByTestId('link-invalid')).toHaveRole('generic')
    *
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaverole
+   * @see https://vitest.dev/api/browser/assertions#tohaverole
    */
   toHaveRole(
     // Get autocomplete for ARIARole union types, while still supporting another string
@@ -614,7 +614,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * inputCheckboxIndeterminate.indeterminate = true
    * await expect.element(inputCheckboxIndeterminate).toBePartiallyChecked()
-   * @see https://vitest.dev/guide/browser/assertion-api#tobepartiallychecked
+   * @see https://vitest.dev/api/browser/assertions#tobepartiallychecked
    */
   toBePartiallyChecked(): R
   /**
@@ -671,7 +671,7 @@ export interface TestingLibraryMatchers<E, R> {
    * await expect.element(page.queryByTestId('prev')).not.toHaveSelection()
    * await expect.element(page.queryByTestId('next')).toHaveSelection('ne')
    *
-   * @see https://vitest.dev/guide/browser/assertion-api#tohaveselection
+   * @see https://vitest.dev/api/browser/assertions#tohaveselection
    */
   toHaveSelection(selection?: string): R
 
@@ -712,7 +712,7 @@ export interface TestingLibraryMatchers<E, R> {
    *   },
    * })
    *
-   * @see https://vitest.dev/guide/browser/assertion-api#tomatchscreenshot
+   * @see https://vitest.dev/api/browser/assertions#tomatchscreenshot
    */
   toMatchScreenshot<ComparatorName extends keyof ScreenshotComparatorRegistry>(
     options?: ScreenshotMatcherOptions<ComparatorName>,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -51,29 +51,29 @@
     "providers"
   ],
   "peerDependencies": {
-    "vitest": "4.0.6"
+    "vitest": "4.0.8"
   },
   "dependencies": {
-    "magic-string": "^0.30.19",
+    "magic-string": "^0.30.21",
     "pixelmatch": "7.1.0",
     "pngjs": "^7.0.0",
     "sirv": "^3.0.2",
     "tinyrainbow": "^3.0.3",
     "ws": "^8.18.3",
-    "@vitest/mocker": "4.0.6",
-    "@vitest/utils": "4.0.6"
+    "@vitest/mocker": "4.0.8",
+    "@vitest/utils": "4.0.8"
   },
   "devDependencies": {
     "@testing-library/user-event": "^14.6.1",
     "@types/pngjs": "^6.0.5",
     "@types/ws": "^8.18.1",
-    "birpc": "^2.5.0",
+    "birpc": "^2.7.0",
     "flatted": "^3.3.3",
     "ivya": "^1.7.0",
     "mime": "^4.1.0",
     "pathe": "^2.0.3",
-    "@vitest/runner": "4.0.6",
-    "vitest": "4.0.6"
+    "@vitest/runner": "4.0.8",
+    "vitest": "4.0.8"
   },
   "scripts": {
     "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",