@vitest/browser 5.0.0-beta.3 → 5.0.0-beta.5

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

@@ -5,26 +5,26 @@
     "src": "../../../../node_modules/.pnpm/rrweb-snapshot@2.0.0-alpha.20_patch_hash=d11ec9bd9b66247ba493ab5fd117fbf0b4cb6e5d0a6a7c600d1d844bfa3d3044/node_modules/rrweb-snapshot/dist/rrweb-snapshot.js",
     "isDynamicEntry": true
   },
-  "_defineProperty-C3k2g8Sk.js": {
-    "file": "__vitest_browser__/defineProperty-C3k2g8Sk.js",
+  "_defineProperty-WHpdAQXR.js": {
+    "file": "__vitest_browser__/defineProperty-WHpdAQXR.js",
     "name": "defineProperty"
   },
   "orchestrator.html": {
-    "file": "__vitest_browser__/orchestrator-B44yH1M4.js",
+    "file": "__vitest_browser__/orchestrator-bDJB3Bid.js",
     "name": "orchestrator",
     "src": "orchestrator.html",
     "isEntry": true,
     "imports": [
-      "_defineProperty-C3k2g8Sk.js"
+      "_defineProperty-WHpdAQXR.js"
     ]
   },
   "tester/tester.html": {
-    "file": "__vitest_browser__/tester-Byk-s_d6.js",
+    "file": "__vitest_browser__/tester-C1kIlbPd.js",
     "name": "tester",
     "src": "tester/tester.html",
     "isEntry": true,
     "imports": [
-      "_defineProperty-C3k2g8Sk.js"
+      "_defineProperty-WHpdAQXR.js"
     ],
     "dynamicImports": [
       "../../../../node_modules/.pnpm/rrweb-snapshot@2.0.0-alpha.20_patch_hash=d11ec9bd9b66247ba493ab5fd117fbf0b4cb6e5d0a6a7c600d1d844bfa3d3044/node_modules/rrweb-snapshot/dist/rrweb-snapshot.js"

package/dist/client/__vitest_browser__/{defineProperty-C3k2g8Sk.js → defineProperty-WHpdAQXR.js}

@@ -122,6 +122,49 @@ var relative = function(from, to) {
 	return [..._from.map(() => ".."), ..._to].join("/");
 };
 
+//#endregion
+//#region ../vitest/src/utils/tasks.ts
+/* @__NO_SIDE_EFFECTS__ */
+function getNames(task) {
+	const names = [task.name];
+	let current = task;
+	while (current === null || current === void 0 ? void 0 : current.suite) {
+		current = current.suite;
+		if (current === null || current === void 0 ? void 0 : current.name) names.unshift(current.name);
+	}
+	if (current !== task.file) names.unshift(task.file.name);
+	return names;
+}
+/* @__NO_SIDE_EFFECTS__ */
+function getTestName(task, separator = " > ") {
+	return (/* @__PURE__ */ getNames(task)).slice(1).join(separator);
+}
+/**
+* Generate a unique ID for a file based on its path and project name
+* @param file File relative to the root of the project to keep ID the same between different machines
+* @param projectName The name of the test project
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function generateFileHash(file, projectName, meta) {
+	return /* @__PURE__ */ generateHash([
+		file,
+		projectName || "",
+		(meta === null || meta === void 0 ? void 0 : meta.typecheck) ? "__typecheck__" : "",
+		(meta === null || meta === void 0 ? void 0 : meta.__vitest_label__) || ""
+	].join("\0"));
+}
+/* @__NO_SIDE_EFFECTS__ */
+function generateHash(str) {
+	let hash = 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;
+		hash = hash & hash;
+	}
+	return `${hash}`;
+}
+
 //#endregion
 //#region \0vite/preload-helper.js
 var scriptRel = "modulepreload";
@@ -264,4 +307,4 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-export { moduleRunner as a, relative as c, getWorkerState as i, resolve as l, getBrowserState as n, now as o, getConfig as r, __vitePreload as s, _defineProperty as t };
+export { moduleRunner as a, generateFileHash as c, resolve as d, getWorkerState as i, getTestName as l, getBrowserState as n, now as o, getConfig as r, __vitePreload as s, _defineProperty as t, relative as u };

package/dist/client/__vitest_browser__/{orchestrator-B44yH1M4.js → orchestrator-bDJB3Bid.js}

@@ -1,4 +1,4 @@
-import { c as relative, n as getBrowserState, r as getConfig, t as _defineProperty } from "./defineProperty-C3k2g8Sk.js";
+import { c as generateFileHash, n as getBrowserState, r as getConfig, t as _defineProperty, u as relative } from "./defineProperty-WHpdAQXR.js";
 import { channel, client, globalChannel } from "@vitest/browser/client";
 import { Traces } from "vitest/internal/traces";
 
@@ -16,6 +16,8 @@ var IframeOrchestrator = class {
 		_defineProperty(this, "cancelled", false);
 		_defineProperty(this, "recreateNonIsolatedIframe", false);
 		_defineProperty(this, "iframes", /* @__PURE__ */ new Map());
+		_defineProperty(this, "readyIframes", /* @__PURE__ */ new Set());
+		_defineProperty(this, "readyWaiters", /* @__PURE__ */ new Map());
 		_defineProperty(this, "eventTarget", new EventTarget());
 		_defineProperty(this, "traces", void 0);
 		_defineProperty(this, "loggedIframe", /* @__PURE__ */ new WeakSet());
@@ -28,6 +30,9 @@ var IframeOrchestrator = class {
 		});
 		channel.addEventListener("message", (e) => this.onIframeEvent(e));
 		globalChannel.addEventListener("message", (e) => this.onGlobalChannelEvent(e));
+		client.waitForConnection().then(() => client.rpc.onOrchestratorReady()).catch((error) => {
+			debug("failed to notify orchestrator readiness", error);
+		});
 	}
 	async createTesters(options) {
 		await this.traces.waitInit();
@@ -54,6 +59,8 @@ var IframeOrchestrator = class {
 		}
 		this.iframes.forEach((iframe) => iframe.remove());
 		this.iframes.clear();
+		this.readyIframes.clear();
+		this.readyWaiters.clear();
 		for (let i = 0; i < options.files.length; i++) {
 			if (this.cancelled) {
 				await endSpan();
@@ -85,8 +92,7 @@ var IframeOrchestrator = class {
 	async runNonIsolatedTests(container, options, startTime, otelContext) {
 		if (this.recreateNonIsolatedIframe) {
 			this.recreateNonIsolatedIframe = false;
-			this.iframes.get(ID_ALL).remove();
-			this.iframes.delete(ID_ALL);
+			this.removeIframe(ID_ALL);
 			debug("recreate non-isolated iframe");
 		}
 		if (!this.iframes.has(ID_ALL)) {
@@ -101,17 +107,16 @@ var IframeOrchestrator = class {
 			iframeId: ID_ALL,
 			files: options.files,
 			method: options.method,
-			context: options.providedContext
+			context: options.providedContext,
+			concurrencyId: options.concurrencyId,
+			workerId: options.workerId
 		});
 		debug("finished running tests", options.files.join(", "));
 	}
 	async runIsolatedTestInIframe(container, spec, options, startTime, otelContext) {
 		const { width, height } = getConfig().browser.viewport;
 		const file = spec.filepath;
-		if (this.iframes.has(file)) {
-			this.iframes.get(file).remove();
-			this.iframes.delete(file);
-		}
+		if (this.iframes.has(file)) this.removeIframe(file);
 		await this.prepareIframe(container, file, startTime, otelContext);
 		await setIframeViewport(width, height);
 		await this.sendEventToIframe({
@@ -119,7 +124,9 @@ var IframeOrchestrator = class {
 			files: [spec],
 			method: options.method,
 			iframeId: file,
-			context: options.providedContext
+			context: options.providedContext,
+			concurrencyId: options.concurrencyId,
+			workerId: options.workerId
 		});
 		await this.sendEventToIframe({
 			event: "cleanup",
@@ -147,12 +154,12 @@ Received URL: ${href || "unknown due to CORS"}\nExpected: ${iframe.src}`)));
 					else this.warnReload(iframe, iframeId);
 				} else {
 					this.iframes.set(iframeId, iframe);
-					this.sendEventToIframe({
+					this.waitForReady(iframeId).then(() => this.sendEventToIframe({
 						event: "prepare",
 						iframeId,
 						startTime,
 						otelCarrier: this.traces.getContextCarrier(otelContext)
-					}).then(resolve, (error) => reject(this.dispatchIframeError(error)));
+					})).then(resolve, (error) => reject(this.dispatchIframeError(error)));
 				}
 			};
 			iframe.onerror = (e) => {
@@ -163,6 +170,27 @@ Received URL: ${href || "unknown due to CORS"}\nExpected: ${iframe.src}`)));
 		});
 		return iframe;
 	}
+	markReady(iframeId) {
+		this.readyIframes.add(iframeId);
+		const waiter = this.readyWaiters.get(iframeId);
+		if (waiter) {
+			this.readyWaiters.delete(iframeId);
+			waiter();
+		}
+	}
+	waitForReady(iframeId) {
+		if (this.readyIframes.has(iframeId)) return Promise.resolve();
+		return new Promise((resolve) => {
+			this.readyWaiters.set(iframeId, resolve);
+		});
+	}
+	removeIframe(iframeId) {
+		const iframe = this.iframes.get(iframeId);
+		this.iframes.delete(iframeId);
+		this.readyIframes.delete(iframeId);
+		this.readyWaiters.delete(iframeId);
+		iframe === null || iframe === void 0 || iframe.remove();
+	}
 	createWarningMessage(iframeId, location) {
 		return `The iframe${iframeId === ID_ALL ? "" : ` for "${iframeId}"`} was reloaded ${location}. This can lead to unexpected behavior during tests, duplicated test results or tests hanging.\n\nMake sure that your test code does not change window's location, submit forms without preventing default behavior, or imports unoptimized dependencies.\nIf you are using a framework that manipulates browser history (like React Router), consider using memory-based routing for tests. If you think this is a false positive, open an issue with a reproduction: https://github.com/vitest-dev/vitest/issues/new`;
 	}
@@ -188,7 +216,7 @@ Received URL: ${href || "unknown due to CORS"}\nExpected: ${iframe.src}`)));
 	}
 	createTestIframe(iframeId) {
 		const iframe = document.createElement("iframe");
-		const src = `/?sessionId=${(/* @__PURE__ */ getBrowserState()).sessionId}&iframeId=${iframeId}`;
+		const src = `/?sessionId=${(/* @__PURE__ */ getBrowserState()).sessionId}&iframeId=${encodeURIComponent(iframeId)}`;
 		const config = getConfig();
 		iframe.setAttribute("loading", "eager");
 		iframe.setAttribute("src", src);
@@ -222,6 +250,9 @@ Received URL: ${href || "unknown due to CORS"}\nExpected: ${iframe.src}`)));
 	async onIframeEvent(e) {
 		debug("iframe event", JSON.stringify(e.data));
 		switch (e.data.event) {
+			case "ready":
+				this.markReady(e.data.iframeId);
+				break;
 			case "viewport": {
 				const { width, height, iframeId: id } = e.data;
 				if (!this.iframes.get(id)) {
@@ -300,29 +331,11 @@ async function getContainer(config) {
 }
 function generateFileId(file) {
 	const config = getConfig();
-	return generateFileHash(relative(config.root, file), config.name, {
+	return /* @__PURE__ */ generateFileHash(relative(config.root, file), config.name, {
 		typecheck: config.pool === "typescript",
 		__vitest_label__: config.mergeReportsLabel
 	});
 }
-function generateFileHash(file, projectName, meta) {
-	return generateHash([
-		file,
-		projectName || "",
-		(meta === null || meta === void 0 ? void 0 : meta.typecheck) ? "__typecheck__" : "",
-		(meta === null || meta === void 0 ? void 0 : meta.__vitest_label__) || ""
-	].join("\0"));
-}
-function generateHash(str) {
-	let hash = 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;
-		hash = hash & hash;
-	}
-	return `${hash}`;
-}
 async function setIframeViewport(width, height) {
 	const ui = /* @__PURE__ */ getUiAPI();
 	if (ui) await ui.setIframeViewport(width, height);