@vitest/browser 5.0.0-beta.2 → 5.0.0-beta.4

package/dist/state.js

@@ -3,7 +3,12 @@
 
 	let SOURCEMAPPING_URL = "sourceMa";
 	SOURCEMAPPING_URL += "ppingURL";
+	//#endregion
+	//#region src/shared/utils.ts
 	const isWindows = typeof process < "u" && process.platform === "win32";
+	/**
+	* Undo {@link wrapId}'s `/@id/` and null byte replacements.
+	*/
 	function unwrapId(id) {
 		return id.startsWith("/@id/") ? id.slice(5).replace("__x00__", "\0") : id;
 	}
@@ -15,11 +20,13 @@
 	function cleanUrl(url) {
 		return url.replace(postfixRE, "");
 	}
+	//#endregion
+	//#region ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/shared/pathe.M-eThtNZ.mjs
 	const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 	function normalizeWindowsPath(input = "") {
 		return input && input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
 	}
-	const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+	const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/, _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
 	function cwd() {
 		return typeof process < "u" && typeof process.cwd == "function" ? process.cwd().replace(/\\/g, "/") : "/";
 	}
@@ -59,25 +66,35 @@
 	}
 	const isAbsolute = function(p) {
 		return _IS_ABSOLUTE_RE.test(p);
-	}, decodeBase64 = typeof atob < "u" ? atob : (str) => Buffer.from(str, "base64").toString("utf-8");
-	const posixResolve = resolve;
-	const intToChar = new Uint8Array(64), charToInt = new Uint8Array(128);
-	for (let i = 0; i < 64; i++) {
-		let c = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charCodeAt(i);
+	}, dirname = function(p) {
+		let segments = normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1);
+		return segments.length === 1 && _DRIVE_LETTER_RE.test(segments[0]) && (segments[0] += "/"), segments.join("/") || (isAbsolute(p) ? "/" : ".");
+	}, textDecoder = new TextDecoder(), decodeBase64 = typeof Buffer == "function" && typeof Buffer.from == "function" ? (base64) => Buffer.from(base64, "base64").toString("utf-8") : (base64) => textDecoder.decode(Uint8Array.from(atob(base64), (c) => c.charCodeAt(0)));
+	const posixDirname = dirname, posixResolve = resolve;
+	//#endregion
+	//#region ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.5/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
+	var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", intToChar = new Uint8Array(64), charToInt = new Uint8Array(128);
+	for (let i = 0; i < chars.length; i++) {
+		let c = chars.charCodeAt(i);
 		intToChar[i] = c, charToInt[c] = i;
 	}
+	//#endregion
+	//#region src/module-runner/sourcemap/decoder.ts
 	var DecodedMap = class {
 		_encoded;
 		_decoded;
 		_decodedMemo;
 		url;
+		file;
 		version;
 		names = [];
 		resolvedSources;
 		constructor(map, from) {
 			this.map = map;
 			let { mappings, names, sources } = map;
-			this.version = map.version, this.names = names || [], this._encoded = mappings || "", this._decodedMemo = memoizedState(), this.url = from, this.resolvedSources = (sources || []).map((s) => posixResolve(s || "", from));
+			this.version = map.version, this.names = names || [], this._encoded = mappings || "", this._decodedMemo = memoizedState(), this.url = from, this.file = from;
+			let originDir = posixDirname(from);
+			this.resolvedSources = (sources || []).map((s) => posixResolve(originDir, s || ""));
 		}
 	};
 	function memoizedState() {
@@ -87,7 +104,9 @@
 			lastIndex: -1
 		};
 	}
-	const MODULE_RUNNER_SOURCEMAPPING_REGEXP = /* @__PURE__ */ RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json;base64,(.+)`);
+	//#endregion
+	//#region src/module-runner/evaluatedModules.ts
+	const MODULE_RUNNER_SOURCEMAPPING_REGEXP = RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json;base64,(.+)`);
 	var EvaluatedModuleNode = class {
 		importers = /* @__PURE__ */ new Set();
 		imports = /* @__PURE__ */ new Set();
@@ -104,19 +123,44 @@
 		idToModuleMap = /* @__PURE__ */ new Map();
 		fileToModulesMap = /* @__PURE__ */ new Map();
 		urlToIdModuleMap = /* @__PURE__ */ new Map();
+		/**
+		* Returns the module node by the resolved module ID. Usually, module ID is
+		* the file system path with query and/or hash. It can also be a virtual module.
+		*
+		* Module runner graph will have 1 to 1 mapping with the server module graph.
+		* @param id Resolved module ID
+		*/
 		getModuleById(id) {
 			return this.idToModuleMap.get(id);
 		}
+		/**
+		* Returns all modules related to the file system path. Different modules
+		* might have different query parameters or hash, so it's possible to have
+		* multiple modules for the same file.
+		* @param file The file system path of the module
+		*/
 		getModulesByFile(file) {
 			return this.fileToModulesMap.get(file);
 		}
+		/**
+		* Returns the module node by the URL that was used in the import statement.
+		* Unlike module graph on the server, the URL is not resolved and is used as is.
+		* @param url Server URL that was used in the import statement
+		*/
 		getModuleByUrl(url) {
 			return this.urlToIdModuleMap.get(unwrapId(url));
 		}
+		/**
+		* Ensure that module is in the graph. If the module is already in the graph,
+		* it will return the existing module node. Otherwise, it will create a new
+		* module node and add it to the graph.
+		* @param id Resolved module ID
+		* @param url URL that was used in the import statement
+		*/
 		ensureModule(id, url) {
 			if (id = normalizeModuleId(id), this.idToModuleMap.has(id)) {
-				let moduleNode$1 = this.idToModuleMap.get(id);
-				return this.urlToIdModuleMap.set(url, moduleNode$1), moduleNode$1;
+				let moduleNode = this.idToModuleMap.get(id);
+				return this.urlToIdModuleMap.set(url, moduleNode), moduleNode;
 			}
 			let moduleNode = new EvaluatedModuleNode(id, url);
 			this.idToModuleMap.set(id, moduleNode), this.urlToIdModuleMap.set(url, moduleNode);
@@ -126,6 +170,11 @@
 		invalidateModule(node) {
 			node.evaluated = false, node.meta = void 0, node.map = void 0, node.promise = void 0, node.exports = void 0, node.imports.clear();
 		}
+		/**
+		* Extracts the inlined source map from the module code and returns the decoded
+		* source map. If the source map is not inlined, it will return null.
+		* @param id Resolved module ID
+		*/
 		getModuleSourceMapById(id) {
 			let mod = this.getModuleById(id);
 			if (!mod) return null;
@@ -147,10 +196,10 @@
 		"node:test/reporters"
 	]);
 	function normalizeModuleId(file) {
-		if (prefixedBuiltins.has(file)) return file;
-		let unixFile = slash(file).replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
-		return unixFile.replace(/^file:\/+/, isWindows ? "" : "/");
+		return prefixedBuiltins.has(file) ? file : slash(file).replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/").replace(/^file:\/+/, isWindows ? "" : "/");
 	}
+	//#endregion
+	//#region src/module-runner/importMetaResolver.ts
 	const customizationHookNamespace = "vite-module-runner:import-meta-resolve/v1/"; `
 
 export async function resolve(specifier, context, nextResolve) {
@@ -160,11 +209,12 @@ export async function resolve(specifier, context, nextResolve) {
     specifier = parsedSpecifier
     context.parentURL = parsedImporter
   }
-
   return nextResolve(specifier, context)
 }
 
 `;
+	//#endregion
+	//#region src/module-runner/createImportMeta.ts
 	new Proxy({}, { get(_, p) {
 		throw Error(`[module runner] Dynamic access of "import.meta.env" is not supported. Please, use "import.meta.env.${String(p)}" instead.`);
 	} });

package/dist/types.d.ts

@@ -1,7 +1,8 @@
 import type { MockedModuleSerialized, ServerIdResolution, ServerMockResolution } from "@vitest/mocker";
-import type { TaskEventPack, TaskResultPack, TestArtifact } from "@vitest/runner";
+import type { BaselineData, TaskEventPack, TaskResultPack, TestArtifact } from "@vitest/runner";
 import type { BirpcReturn } from "birpc";
-import type { AfterSuiteRunMeta, BrowserTesterOptions, CancelReason, RunnerTestFile, SerializedTestSpecification, SnapshotResult, TestExecutionMethod, UserConsoleLog } from "vitest";
+import type { AfterSuiteRunMeta, BrowserTesterOptions, CancelReason, RunnerTestFile, SerializedTestSpecification, SnapshotResult, TestBenchmark, TestExecutionMethod, UserConsoleLog } from "vitest";
+import type { MarkOptions } from "vitest/browser";
 export interface WebSocketBrowserHandlers {
 	resolveSnapshotPath: (testPath: string) => string;
 	resolveSnapshotRawPath: (testPath: string, rawPath: string) => string;
@@ -10,6 +11,9 @@ export interface WebSocketBrowserHandlers {
 	onCollected: (method: TestExecutionMethod, files: RunnerTestFile[]) => Promise<void>;
 	onTaskArtifactRecord: <Artifact extends TestArtifact>(testId: string, artifact: Artifact) => Promise<Artifact>;
 	onTaskUpdate: (method: TestExecutionMethod, packs: TaskResultPack[], events: TaskEventPack[]) => void;
+	onTestBenchmark: (testId: string, benchmark: TestBenchmark) => void;
+	readBenchmarkResult: (relativePath: string) => Promise<BaselineData | null>;
+	writeBenchmarkResult: (relativePath: string, data: BaselineData) => Promise<void>;
 	onAfterSuiteRun: (meta: AfterSuiteRunMeta) => void;
 	cancelCurrentRun: (reason: CancelReason) => void;
 	getCountOfFailedTests: () => number;
@@ -49,6 +53,7 @@ export interface WebSocketBrowserEvents {
 	createTesters: (options: BrowserTesterOptions) => Promise<void>;
 	cleanupTesters: () => Promise<void>;
 	cdpEvent: (event: string, payload: unknown) => void;
+	pageMark: (name: string, options?: MarkOptions) => Promise<void>;
 	resolveManualMock: (url: string) => Promise<{
 		url: string;
 		keys: string[];

package/jest-dom.d.ts

@@ -377,6 +377,25 @@ export interface TestingLibraryMatchers<E, R> {
    * @see https://vitest.dev/api/browser/assertions#tohavestyle
    */
   toHaveStyle(css: string | Partial<CSSStyleDeclaration>): R
+  /**
+   * @description
+   * Validate that the given element's text content matches the provided string exactly.
+   *
+   * Supports elements, but also text nodes and fragments.
+   *
+   * If you wish to perform a partial check or use a RegExp, use `toMatchTextContent` instead.
+   * @example
+   * <span data-testid="text-content">Text Content</span>
+   *
+   * const element = page.getByTestId('text-content')
+   * await expect.element(element).toHaveTextContent('Text Content')
+   * await expect.element(element).not.toHaveTextContent('Content')
+   * @see https://vitest.dev/api/browser/assertions#tohavetextcontent
+   */
+  toHaveTextContent(
+    text: string | number,
+    options?: {normalizeWhitespace: boolean},
+  ): R
   /**
    * @description
    * Check whether the given element has a text content or not.
@@ -391,15 +410,15 @@ export interface TestingLibraryMatchers<E, R> {
    * <span data-testid="text-content">Text Content</span>
    *
    * const element = page.getByTestId('text-content')
-   * await expect.element(element).toHaveTextContent('Content')
+   * await expect.element(element).toMatchTextContent('Content')
    * // to match the whole content
-   * await expect.element(element).toHaveTextContent(/^Text Content$/)
+   * await expect.element(element).toMatchTextContent(/^Text Content$/)
    * // to use case-insensitive match
-   * await expect.element(element).toHaveTextContent(/content$/i)
-   * await expect.element(element).not.toHaveTextContent('content')
-   * @see https://vitest.dev/api/browser/assertions#tohavetextcontent
+   * await expect.element(element).toMatchTextContent(/content$/i)
+   * await expect.element(element).not.toMatchTextContent('content')
+   * @see https://vitest.dev/api/browser/assertions#tomatchtextcontent
    */
-  toHaveTextContent(
+  toMatchTextContent(
     text: string | number | RegExp,
     options?: {normalizeWhitespace: boolean},
   ): R
@@ -692,6 +711,7 @@ export interface TestingLibraryMatchers<E, R> {
    *
    * // basic usage, auto-generates screenshot name
    * await expect.element(getByTestId('button')).toMatchScreenshot()
+   * await expect(page).toMatchScreenshot()
    *
    * // with custom name
    * await expect.element(getByTestId('button')).toMatchScreenshot('fancy-button')

package/matchers.d.ts

@@ -18,7 +18,8 @@ declare module 'vitest' {
 
   interface ExpectStatic {
     /**
-     * `expect.element(locator)` is a shorthand for `expect.poll(() => locator.element())`.
+     * `expect.element(locator)` retries locator resolution and DOM assertions
+     * using the `expect.poll` timeout options.
      * You can set default timeout via `expect.poll.timeout` option in the config.
      * @see {@link https://vitest.dev/api/expect#poll}
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.4",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -63,7 +63,7 @@
     "providers"
   ],
   "peerDependencies": {
-    "vitest": "5.0.0-beta.2"
+    "vitest": "5.0.0-beta.4"
   },
   "dependencies": {
     "@blazediff/core": "1.9.1",
@@ -72,8 +72,8 @@
     "sirv": "^3.0.2",
     "tinyrainbow": "^3.1.0",
     "ws": "^8.19.0",
-    "@vitest/mocker": "5.0.0-beta.2",
-    "@vitest/utils": "5.0.0-beta.2"
+    "@vitest/mocker": "5.0.0-beta.4",
+    "@vitest/utils": "5.0.0-beta.4"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
@@ -83,12 +83,12 @@
     "@types/ws": "^8.18.1",
     "birpc": "^4.0.0",
     "flatted": "^3.4.2",
-    "ivya": "^1.8.1",
+    "ivya": "^1.8.2",
     "mime": "^4.1.0",
     "pathe": "^2.0.3",
     "rrweb-snapshot": "2.0.0-alpha.20",
-    "@vitest/runner": "5.0.0-beta.2",
-    "vitest": "5.0.0-beta.2"
+    "@vitest/runner": "5.0.0-beta.4",
+    "vitest": "5.0.0-beta.4"
   },
   "scripts": {
     "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",