@vitest/browser 5.0.0-rc.1 → 5.0.0-rc.2

package/context.d.ts

@@ -447,6 +447,9 @@ export interface LocatorOptions {
    * regular expression. Note that exact match still trims whitespace.
    */
   exact?: boolean
+}
+
+export interface LocatorFilterOptions {
   hasText?: string | RegExp
   hasNotText?: string | RegExp
   has?: Locator
@@ -766,7 +769,7 @@ export interface Locator extends LocatorSelectors {
    * Narrows existing locator according to the options.
    * @see {@link https://vitest.dev/api/browser/locators#filter}
    */
-  filter(options: LocatorOptions): Locator
+  filter(options: LocatorFilterOptions): Locator
   /**
    * This method returns an element matching the locator.
    * Unlike [`.element()`](https://vitest.dev/api/browser/locators#element),

package/dist/client/.vite/manifest.json

@@ -19,7 +19,7 @@
     ]
   },
   "tester/tester.html": {
-    "file": "__vitest_browser__/tester-Ck66x6M6.js",
+    "file": "__vitest_browser__/tester-DDRabqAJ.js",
     "name": "tester",
     "src": "tester/tester.html",
     "isEntry": true,

package/dist/client/__vitest_browser__/{tester-Ck66x6M6.js → tester-DDRabqAJ.js}

@@ -720,6 +720,9 @@ var VitestBrowserSnapshotEnvironment = class {
 	readSnapshotFile(filepath) {
 		return rpc$1().readSnapshotFile(filepath);
 	}
+	readSnapshotFileData(filepath) {
+		return rpc$1().readSnapshotFileData(filepath);
+	}
 	saveSnapshotFile(filepath, snapshot) {
 		return rpc$1().saveSnapshotFile(filepath, snapshot);
 	}

package/dist/client/tester/locators.d.ts

@@ -1,4 +1,4 @@
-import type { LocatorByRoleOptions, LocatorOptions, LocatorScreenshotOptions, MarkOptions, SelectorOptions, UserEventClearOptions, UserEventClickOptions, UserEventDragAndDropOptions, UserEventFillOptions, UserEventHoverOptions, UserEventSelectOptions, UserEventUploadOptions, UserEventWheelOptions } from "vitest/browser";
+import type { LocatorByRoleOptions, LocatorFilterOptions, LocatorOptions, LocatorScreenshotOptions, MarkOptions, SelectorOptions, UserEventClearOptions, UserEventClickOptions, UserEventDragAndDropOptions, UserEventFillOptions, UserEventHoverOptions, UserEventSelectOptions, UserEventUploadOptions, UserEventWheelOptions } from "vitest/browser";
 import { Ivya } from "ivya";
 export { ensureAwaited } from "../utils.js";
 export { convertElementToCssSelector, getIframeScale, processTimeoutOptions } from "./tester-utils.js";
@@ -40,7 +40,7 @@ export declare abstract class Locator {
 	getByTestId(testId: string | RegExp): Locator;
 	getByText(text: string | RegExp, options?: LocatorOptions): Locator;
 	getByTitle(title: string | RegExp, options?: LocatorOptions): Locator;
-	filter(filter: LocatorOptions): Locator;
+	filter(filter: LocatorFilterOptions): Locator;
 	and(locator: Locator): Locator;
 	or(locator: Locator): Locator;
 	query(): HTMLElement | SVGElement | null;

package/dist/client/tester/tester.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="{__VITEST_FAVICON__}" type="image/svg+xml">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vitest Browser Tester</title>
-    <script type="module" crossorigin src="/__vitest_browser__/tester-Ck66x6M6.js"></script>
+    <script type="module" crossorigin src="/__vitest_browser__/tester-DDRabqAJ.js"></script>
     <link rel="modulepreload" crossorigin href="/__vitest_browser__/defineProperty-BOtRrjRA.js">
   </head>
   <body>

package/dist/index.js

@@ -6,7 +6,7 @@ import { distClientRoot } from '@vitest/ui';
 import { slash as slash$1, deepMerge, cleanUrl as cleanUrl$1, toArray } from '@vitest/utils/helpers';
 import sirv from 'sirv';
 import c from 'tinyrainbow';
-import { isFileLoadingAllowed, createDebugger, isValidApiRequest, isCSSRequest, distDir, rolldownVersion, isFileServingAllowed } from 'vitest/node';
+import { isFileLoadingAllowed, createDebugger, isValidApiRequest, BrowserConnectionError, isCSSRequest, distDir, rolldownVersion, isFileServingAllowed } from 'vitest/node';
 import { fileURLToPath } from 'node:url';
 import crypto from 'node:crypto';
 import MagicString from 'magic-string';
@@ -209,7 +209,7 @@ const basename = function(p, extension) {
   return extension && lastSegment.endsWith(extension) ? lastSegment.slice(0, -extension.length) : lastSegment;
 };
 
-var version = "5.0.0-rc.1";
+var version = "5.0.0-rc.2";
 
 const pkgRoot = resolve(fileURLToPath(import.meta.url), "../..");
 const distRoot = resolve(pkgRoot, "dist");
@@ -2496,6 +2496,348 @@ class ParentBrowserProject {
 	}
 }
 
+function _mergeNamespaces$1(n, m) {
+	m.forEach(function(e) {
+		e && typeof e !== "string" && !Array.isArray(e) && Object.keys(e).forEach(function(k) {
+			if (k !== "default" && !(k in n)) {
+				var d = Object.getOwnPropertyDescriptor(e, k);
+				Object.defineProperty(n, k, d.get ? d : {
+					enumerable: true,
+					get: function() {
+						return e[k];
+					}
+				});
+			}
+		});
+	});
+	return Object.freeze(n);
+}
+function getDefaultExportFromCjs(x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
+}
+var reactIs$1 = { exports: {} };
+var reactIs_production = {};
+/**
+* @license React
+* react-is.production.js
+*
+* Copyright (c) Meta Platforms, Inc. and affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+var hasRequiredReactIs_production;
+function requireReactIs_production() {
+	if (hasRequiredReactIs_production) return reactIs_production;
+	hasRequiredReactIs_production = 1;
+	var REACT_ELEMENT_TYPE = Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = Symbol.for("react.memo"), REACT_LAZY_TYPE = Symbol.for("react.lazy"), REACT_VIEW_TRANSITION_TYPE = Symbol.for("react.view_transition"), REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
+	function typeOf(object) {
+		if ("object" === typeof object && null !== object) {
+			var $$typeof = object.$$typeof;
+			switch ($$typeof) {
+				case REACT_ELEMENT_TYPE: switch (object = object.type, object) {
+					case REACT_FRAGMENT_TYPE:
+					case REACT_PROFILER_TYPE:
+					case REACT_STRICT_MODE_TYPE:
+					case REACT_SUSPENSE_TYPE:
+					case REACT_SUSPENSE_LIST_TYPE:
+					case REACT_VIEW_TRANSITION_TYPE: return object;
+					default: switch (object = object && object.$$typeof, object) {
+						case REACT_CONTEXT_TYPE:
+						case REACT_FORWARD_REF_TYPE:
+						case REACT_LAZY_TYPE:
+						case REACT_MEMO_TYPE: return object;
+						case REACT_CONSUMER_TYPE: return object;
+						default: return $$typeof;
+					}
+				}
+				case REACT_PORTAL_TYPE: return $$typeof;
+			}
+		}
+	}
+	reactIs_production.ContextConsumer = REACT_CONSUMER_TYPE;
+	reactIs_production.ContextProvider = REACT_CONTEXT_TYPE;
+	reactIs_production.Element = REACT_ELEMENT_TYPE;
+	reactIs_production.ForwardRef = REACT_FORWARD_REF_TYPE;
+	reactIs_production.Fragment = REACT_FRAGMENT_TYPE;
+	reactIs_production.Lazy = REACT_LAZY_TYPE;
+	reactIs_production.Memo = REACT_MEMO_TYPE;
+	reactIs_production.Portal = REACT_PORTAL_TYPE;
+	reactIs_production.Profiler = REACT_PROFILER_TYPE;
+	reactIs_production.StrictMode = REACT_STRICT_MODE_TYPE;
+	reactIs_production.Suspense = REACT_SUSPENSE_TYPE;
+	reactIs_production.SuspenseList = REACT_SUSPENSE_LIST_TYPE;
+	reactIs_production.isContextConsumer = function(object) {
+		return typeOf(object) === REACT_CONSUMER_TYPE;
+	};
+	reactIs_production.isContextProvider = function(object) {
+		return typeOf(object) === REACT_CONTEXT_TYPE;
+	};
+	reactIs_production.isElement = function(object) {
+		return "object" === typeof object && null !== object && object.$$typeof === REACT_ELEMENT_TYPE;
+	};
+	reactIs_production.isForwardRef = function(object) {
+		return typeOf(object) === REACT_FORWARD_REF_TYPE;
+	};
+	reactIs_production.isFragment = function(object) {
+		return typeOf(object) === REACT_FRAGMENT_TYPE;
+	};
+	reactIs_production.isLazy = function(object) {
+		return typeOf(object) === REACT_LAZY_TYPE;
+	};
+	reactIs_production.isMemo = function(object) {
+		return typeOf(object) === REACT_MEMO_TYPE;
+	};
+	reactIs_production.isPortal = function(object) {
+		return typeOf(object) === REACT_PORTAL_TYPE;
+	};
+	reactIs_production.isProfiler = function(object) {
+		return typeOf(object) === REACT_PROFILER_TYPE;
+	};
+	reactIs_production.isStrictMode = function(object) {
+		return typeOf(object) === REACT_STRICT_MODE_TYPE;
+	};
+	reactIs_production.isSuspense = function(object) {
+		return typeOf(object) === REACT_SUSPENSE_TYPE;
+	};
+	reactIs_production.isSuspenseList = function(object) {
+		return typeOf(object) === REACT_SUSPENSE_LIST_TYPE;
+	};
+	reactIs_production.isValidElementType = function(type) {
+		return "string" === typeof type || "function" === typeof type || type === REACT_FRAGMENT_TYPE || type === REACT_PROFILER_TYPE || type === REACT_STRICT_MODE_TYPE || type === REACT_SUSPENSE_TYPE || type === REACT_SUSPENSE_LIST_TYPE || "object" === typeof type && null !== type && (type.$$typeof === REACT_LAZY_TYPE || type.$$typeof === REACT_MEMO_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || type.$$typeof === REACT_CONSUMER_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE || type.$$typeof === REACT_CLIENT_REFERENCE || void 0 !== type.getModuleId) ? true : false;
+	};
+	reactIs_production.typeOf = typeOf;
+	return reactIs_production;
+}
+var hasRequiredReactIs$1;
+function requireReactIs$1() {
+	if (hasRequiredReactIs$1) return reactIs$1.exports;
+	hasRequiredReactIs$1 = 1;
+	{
+		reactIs$1.exports = requireReactIs_production();
+	}
+	return reactIs$1.exports;
+}
+var reactIsExports$1 = requireReactIs$1();
+var index$1 = /*@__PURE__*/ getDefaultExportFromCjs(reactIsExports$1);
+var ReactIs19 = /*#__PURE__*/ _mergeNamespaces$1({
+	__proto__: null,
+	default: index$1
+}, [reactIsExports$1]);
+var reactIs = { exports: {} };
+var reactIs_production_min = {};
+/**
+* @license React
+* react-is.production.min.js
+*
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+var hasRequiredReactIs_production_min;
+function requireReactIs_production_min() {
+	if (hasRequiredReactIs_production_min) return reactIs_production_min;
+	hasRequiredReactIs_production_min = 1;
+	var b = Symbol.for("react.element"), c = Symbol.for("react.portal"), d = Symbol.for("react.fragment"), e = Symbol.for("react.strict_mode"), f = Symbol.for("react.profiler"), g = Symbol.for("react.provider"), h = Symbol.for("react.context"), k = Symbol.for("react.server_context"), l = Symbol.for("react.forward_ref"), m = Symbol.for("react.suspense"), n = Symbol.for("react.suspense_list"), p = Symbol.for("react.memo"), q = Symbol.for("react.lazy"), t = Symbol.for("react.offscreen"), u;
+	u = Symbol.for("react.module.reference");
+	function v(a) {
+		if ("object" === typeof a && null !== a) {
+			var r = a.$$typeof;
+			switch (r) {
+				case b: switch (a = a.type, a) {
+					case d:
+					case f:
+					case e:
+					case m:
+					case n: return a;
+					default: switch (a = a && a.$$typeof, a) {
+						case k:
+						case h:
+						case l:
+						case q:
+						case p:
+						case g: return a;
+						default: return r;
+					}
+				}
+				case c: return r;
+			}
+		}
+	}
+	reactIs_production_min.ContextConsumer = h;
+	reactIs_production_min.ContextProvider = g;
+	reactIs_production_min.Element = b;
+	reactIs_production_min.ForwardRef = l;
+	reactIs_production_min.Fragment = d;
+	reactIs_production_min.Lazy = q;
+	reactIs_production_min.Memo = p;
+	reactIs_production_min.Portal = c;
+	reactIs_production_min.Profiler = f;
+	reactIs_production_min.StrictMode = e;
+	reactIs_production_min.Suspense = m;
+	reactIs_production_min.SuspenseList = n;
+	reactIs_production_min.isAsyncMode = function() {
+		return false;
+	};
+	reactIs_production_min.isConcurrentMode = function() {
+		return false;
+	};
+	reactIs_production_min.isContextConsumer = function(a) {
+		return v(a) === h;
+	};
+	reactIs_production_min.isContextProvider = function(a) {
+		return v(a) === g;
+	};
+	reactIs_production_min.isElement = function(a) {
+		return "object" === typeof a && null !== a && a.$$typeof === b;
+	};
+	reactIs_production_min.isForwardRef = function(a) {
+		return v(a) === l;
+	};
+	reactIs_production_min.isFragment = function(a) {
+		return v(a) === d;
+	};
+	reactIs_production_min.isLazy = function(a) {
+		return v(a) === q;
+	};
+	reactIs_production_min.isMemo = function(a) {
+		return v(a) === p;
+	};
+	reactIs_production_min.isPortal = function(a) {
+		return v(a) === c;
+	};
+	reactIs_production_min.isProfiler = function(a) {
+		return v(a) === f;
+	};
+	reactIs_production_min.isStrictMode = function(a) {
+		return v(a) === e;
+	};
+	reactIs_production_min.isSuspense = function(a) {
+		return v(a) === m;
+	};
+	reactIs_production_min.isSuspenseList = function(a) {
+		return v(a) === n;
+	};
+	reactIs_production_min.isValidElementType = function(a) {
+		return "string" === typeof a || "function" === typeof a || a === d || a === f || a === e || a === m || a === n || a === t || "object" === typeof a && null !== a && (a.$$typeof === q || a.$$typeof === p || a.$$typeof === g || a.$$typeof === h || a.$$typeof === l || a.$$typeof === u || void 0 !== a.getModuleId) ? true : false;
+	};
+	reactIs_production_min.typeOf = v;
+	return reactIs_production_min;
+}
+var hasRequiredReactIs;
+function requireReactIs() {
+	if (hasRequiredReactIs) return reactIs.exports;
+	hasRequiredReactIs = 1;
+	{
+		reactIs.exports = requireReactIs_production_min();
+	}
+	return reactIs.exports;
+}
+var reactIsExports = requireReactIs();
+var index = /*@__PURE__*/ getDefaultExportFromCjs(reactIsExports);
+var ReactIs18 = /*#__PURE__*/ _mergeNamespaces$1({
+	__proto__: null,
+	default: index
+}, [reactIsExports]);
+const reactIsMethods = [
+	"isAsyncMode",
+	"isConcurrentMode",
+	"isContextConsumer",
+	"isContextProvider",
+	"isElement",
+	"isForwardRef",
+	"isFragment",
+	"isLazy",
+	"isMemo",
+	"isPortal",
+	"isProfiler",
+	"isStrictMode",
+	"isSuspense",
+	"isSuspenseList",
+	"isValidElementType"
+];
+Object.fromEntries(reactIsMethods.map((m) => [m, (v) => ReactIs18[m](v) || ReactIs19[m](v)]));
+
+var naturalCompare = {exports: {}};
+
+var hasRequiredNaturalCompare;
+
+function requireNaturalCompare () {
+	if (hasRequiredNaturalCompare) return naturalCompare.exports;
+	hasRequiredNaturalCompare = 1;
+	/*
+	 * @version    1.4.0
+	 * @date       2015-10-26
+	 * @stability  3 - Stable
+	 * @author     Lauri Rooden (https://github.com/litejs/natural-compare-lite)
+	 * @license    MIT License
+	 */
+
+
+	var naturalCompare$1 = function(a, b) {
+		var i, codeA
+		, codeB = 1
+		, posA = 0
+		, posB = 0
+		, alphabet = String.alphabet;
+
+		function getCode(str, pos, code) {
+			if (code) {
+				for (i = pos; code = getCode(str, i), code < 76 && code > 65;) ++i;
+				return +str.slice(pos - 1, i)
+			}
+			code = alphabet && alphabet.indexOf(str.charAt(pos));
+			return code > -1 ? code + 76 : ((code = str.charCodeAt(pos) || 0), code < 45 || code > 127) ? code
+				: code < 46 ? 65               // -
+				: code < 48 ? code - 1
+				: code < 58 ? code + 18        // 0-9
+				: code < 65 ? code - 11
+				: code < 91 ? code + 11        // A-Z
+				: code < 97 ? code - 37
+				: code < 123 ? code + 5        // a-z
+				: code - 63
+		}
+
+
+		if ((a+="") != (b+="")) for (;codeB;) {
+			codeA = getCode(a, posA++);
+			codeB = getCode(b, posB++);
+
+			if (codeA < 76 && codeB < 76 && codeA > 66 && codeB > 66) {
+				codeA = getCode(a, posA, posA);
+				codeB = getCode(b, posB, posA = i);
+				posB = i;
+			}
+
+			if (codeA != codeB) return (codeA < codeB) ? -1 : 1
+		}
+		return 0
+	};
+
+	try {
+		naturalCompare.exports = naturalCompare$1;
+	} catch (e) {
+		String.naturalCompare = naturalCompare$1;
+	}
+	return naturalCompare.exports;
+}
+
+requireNaturalCompare();
+
+// Evaluate a snapshot file's content into its snapshot key/value pairs.
+function evaluateSnapshotFile(filepath, content) {
+	const data = Object.create(null);
+	try {
+		// eslint-disable-next-line no-new-func
+		const populate = new Function("exports", content);
+		populate(data);
+	} catch (cause) {
+		throw new Error(`Invalid snapshot file, please manually fix or delete it: ${filepath}`, { cause });
+	}
+	return data;
+}
+
 //#region src/utils.ts
 function createPromiseWithResolvers() {
 	let resolve;
@@ -2697,6 +3039,24 @@ function createBirpc($functions, options) {
 
 const debug = createDebugger("vitest:browser:api");
 const BROWSER_API_PATH = "/__vitest_browser_api__";
+const DEFAULT_HEARTBEAT_INTERVAL = 15e3;
+const HEARTBEAT_MAX_MISSED = 2;
+let warnedInvalidHeartbeatInterval = false;
+function resolveHeartbeatInterval(vitest) {
+	const rawInterval = process.env.VITEST_BROWSER_HEARTBEAT_INTERVAL;
+	if (!rawInterval) {
+		return DEFAULT_HEARTBEAT_INTERVAL;
+	}
+	const interval = Number(rawInterval);
+	if (Number.isNaN(interval)) {
+		if (!warnedInvalidHeartbeatInterval) {
+			warnedInvalidHeartbeatInterval = true;
+			vitest.logger.warn(`VITEST_BROWSER_HEARTBEAT_INTERVAL is expected to be a number, received "${rawInterval}". Using the default interval of ${DEFAULT_HEARTBEAT_INTERVAL}ms instead.`);
+		}
+		return DEFAULT_HEARTBEAT_INTERVAL;
+	}
+	return interval;
+}
 function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 	const vite = globalServer.vite;
 	const vitest = globalServer.vitest;
@@ -2745,8 +3105,31 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 			const clients = type === "tester" ? state.testers : state.orchestrators;
 			clients.set(rpcId, rpc);
 			debug?.("[%s] Browser API connected to %s", rpcId, type);
+			// if the browser stops answering pings, terminate the socket so the
+			// "close" handler below rejects pending calls (like `createTesters`)
+			// instead of the run hanging forever; timeouts that live in the browser
+			// (`testTimeout`, iframe ack) cannot fire once its process is frozen
+			const heartbeatInterval = resolveHeartbeatInterval(vitest);
+			let missedPongs = 0;
+			ws.on("pong", () => {
+				missedPongs = 0;
+			});
+			const heartbeat = heartbeatInterval > 0 ? setInterval(() => {
+				if (ws.readyState !== ws.OPEN) {
+					return;
+				}
+				if (missedPongs >= HEARTBEAT_MAX_MISSED) {
+					debug?.("[%s] %s did not respond to %s heartbeat pings, terminating the connection", rpcId, type, missedPongs);
+					rpc.$close(new Error(`[vitest] The browser ${type} did not respond to a heartbeat ping for ${missedPongs * heartbeatInterval}ms. The browser process might be frozen or killed. Closing the connection.`));
+					ws.terminate();
+					return;
+				}
+				missedPongs++;
+				ws.ping();
+			}, heartbeatInterval).unref() : undefined;
 			ws.on("close", () => {
 				debug?.("[%s] Browser API disconnected from %s", rpcId, type);
+				clearInterval(heartbeat);
 				offCancel();
 				clients.delete(rpcId);
 				globalServer.removeCDPHandler(rpcId);
@@ -2754,7 +3137,7 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 					sessions.destroySession(sessionId);
 				}
 				// this will reject any hanging methods if there are any
-				rpc.$close(new Error(`[vitest] Browser connection was closed while running tests. Was the page closed unexpectedly?`));
+				rpc.$close(new BrowserConnectionError(`[vitest] Browser connection was closed while running tests. Was the page closed unexpectedly?`));
 			});
 		});
 	});
@@ -2771,8 +3154,11 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 	function canWrite(project) {
 		return project.config.api.allowWrite && project.vitest.config.api.allowWrite;
 	}
+	function canExec(project) {
+		return project.config.api.allowExec && project.vitest.config.api.allowExec;
+	}
 	function isCdpAllowed(project) {
-		return project.config.api.allowExec && project.vitest.config.api.allowExec && project.config.api.allowWrite && project.vitest.config.api.allowWrite;
+		return canExec(project) && canWrite(project);
 	}
 	function assertCdpAllowed(project) {
 		if (!isCdpAllowed(project)) {
@@ -2881,6 +3267,17 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 				}
 				return promises.readFile(snapshotPath, "utf-8");
 			},
+			async readSnapshotFileData(snapshotPath) {
+				checkFileAccess(snapshotPath);
+				if (!existsSync(snapshotPath)) {
+					return null;
+				}
+				if (!canExec(project)) {
+					throw new Error(`Cannot read snapshot file because browser API exec operations are disabled. See https://vitest.dev/config/api.`);
+				}
+				const content = await promises.readFile(snapshotPath, "utf-8");
+				return evaluateSnapshotFile(snapshotPath, content);
+			},
 			async saveSnapshotFile(id, content) {
 				checkFileAccess(id);
 				if (!canWrite(project)) {
@@ -2987,6 +3384,7 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 						if (module.type === "redirect") {
 							const redirectUrl = new URL(module.redirect);
 							module.redirect = join(vite.config.root, redirectUrl.pathname);
+							checkFileAccess(module.redirect);
 						}
 						defaultMockerRegistry.register(module);
 					}
@@ -3339,7 +3737,10 @@ body {
 	};
 	contribution.plugins = [
 		...BrowserPlugin(contribution),
-		interceptorPlugin({ registry: mockerRegistry }),
+		interceptorPlugin({
+			registry: mockerRegistry,
+			registerWebSocketEvents: false
+		}),
 		{
 			name: "vitest:browser:framework-sourcemaps",
 			enforce: "post",
@@ -3420,6 +3821,7 @@ function resolveBrowserOptimizeDeps(projectConfigs, testFiles, harness) {
 		"@vitest/browser/utils",
 		"@vitest/browser/context",
 		"@vitest/browser/locators",
+		"@vitest/browser/client",
 		"msw",
 		"msw/browser"
 	];
@@ -3446,12 +3848,12 @@ function resolveBrowserOptimizeDeps(projectConfigs, testFiles, harness) {
 	}
 	// Pre-bundle the vitest runtime so the browser fetches a few optimized
 	// chunks instead of ~20 separately-served dist chunks (faster startup).
-	// `vitest`, `vitest/internal/browser` and `@vitest/browser/client` are
-	// optimized together in a single pass, so esbuild dedupes their shared
-	// stateful chunks (the test collector, the runner, the RPC client) to a
-	// single instance — preserving module identity between the test files'
-	// `import 'vitest'` and the tester. Their transitive deps (@vitest/utils,
-	// @vitest/spy, pathe, tinyrainbow, …) are inlined into these bundles.
+	// `vitest` and `vitest/internal/browser` are optimized together in a single
+	// pass, so esbuild dedupes their shared stateful chunks (the test collector,
+	// the runner) to a single instance, preserving module identity between the
+	// test files' `import 'vitest'` and the tester. Their transitive deps
+	// (@vitest/utils, @vitest/spy, pathe, tinyrainbow, …) are inlined into
+	// these bundles.
 	const include = [
 		"vitest > expect-type",
 		"vitest > magic-string",
@@ -3459,8 +3861,7 @@ function resolveBrowserOptimizeDeps(projectConfigs, testFiles, harness) {
 		"vitest > vite/module-runner",
 		"vitest",
 		"vitest/internal/browser",
-		"vitest/internal/traces",
-		"@vitest/browser/client"
+		"vitest/internal/traces"
 	];
 	const provider = testConfig.browser?.provider;
 	if (provider?.name === "preview") {

package/dist/locators.d.ts

@@ -1,4 +1,4 @@
-import { UserEventClickOptions, UserEventWheelOptions, UserEventClearOptions, UserEventHoverOptions, UserEventFillOptions, UserEventUploadOptions, UserEventDragAndDropOptions, UserEventSelectOptions, LocatorScreenshotOptions, MarkOptions, LocatorByRoleOptions, LocatorOptions, SelectorOptions } from 'vitest/browser';
+import { UserEventClickOptions, UserEventWheelOptions, UserEventClearOptions, UserEventHoverOptions, UserEventFillOptions, UserEventUploadOptions, UserEventDragAndDropOptions, UserEventSelectOptions, LocatorScreenshotOptions, MarkOptions, LocatorByRoleOptions, LocatorOptions, LocatorFilterOptions, SelectorOptions } from 'vitest/browser';
 
 //#region src/cssParser.d.ts
 type ClauseCombinator = '' | '>' | '+' | '~' | '>=';
@@ -270,7 +270,7 @@ declare abstract class Locator {
 	getByTestId(testId: string | RegExp): Locator;
 	getByText(text: string | RegExp, options?: LocatorOptions): Locator;
 	getByTitle(title: string | RegExp, options?: LocatorOptions): Locator;
-	filter(filter: LocatorOptions): Locator;
+	filter(filter: LocatorFilterOptions): Locator;
 	and(locator: Locator): Locator;
 	or(locator: Locator): Locator;
 	query(): HTMLElement | SVGElement | null;

package/dist/types.d.ts

@@ -18,6 +18,7 @@ export interface WebSocketBrowserHandlers {
 	cancelCurrentRun: (reason: CancelReason) => void;
 	getCountOfFailedTests: () => number;
 	readSnapshotFile: (id: string) => Promise<string | null>;
+	readSnapshotFileData: (id: string) => Promise<Record<string, string> | null>;
 	saveSnapshotFile: (id: string, content: string) => Promise<void>;
 	removeSnapshotFile: (id: string) => Promise<void>;
 	sendLog: (method: TestExecutionMethod, log: UserConsoleLog) => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -63,22 +63,22 @@
     "providers"
   ],
   "peerDependencies": {
-    "vitest": "5.0.0-rc.1"
+    "vitest": "5.0.0-rc.2"
   },
   "dependencies": {
     "@blazediff/core": "1.10.0",
-    "magic-string": "^1.1.0",
+    "magic-string": "^1.2.0",
     "pngjs": "^7.0.0",
     "sirv": "^3.0.2",
     "tinyrainbow": "^3.1.1",
     "ws": "^8.21.3",
-    "@vitest/mocker": "5.0.0-rc.1",
-    "@vitest/utils": "5.0.0-rc.1",
-    "@vitest/ui": "5.0.0-rc.1"
+    "@vitest/mocker": "5.0.0-rc.2",
+    "@vitest/ui": "5.0.0-rc.2",
+    "@vitest/utils": "5.0.0-rc.2"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@testing-library/user-event": "^14.6.3",
+    "@testing-library/user-event": "^14.6.4",
     "@types/node": "24.13.3",
     "@types/pngjs": "^6.0.5",
     "@types/ws": "^8.18.1",
@@ -88,7 +88,8 @@
     "mime": "^4.1.0",
     "pathe": "^2.0.3",
     "rrweb-snapshot": "2.1.1",
-    "vitest": "5.0.0-rc.1"
+    "vitest": "5.0.0-rc.2",
+    "@vitest/snapshot": "5.0.0-rc.2"
   },
   "scripts": {
     "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",