@vitest/browser 4.0.14 → 4.0.16

package/dist/index.js

@@ -18,7 +18,7 @@ import { PNG } from 'pngjs';
 import pm from 'pixelmatch';
 import { WebSocketServer } from 'ws';
 
-var version = "4.0.14";
+var version = "4.0.16";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -1376,8 +1376,18 @@ body {
 						});
 					}
 				};
-				return { optimizeDeps: rolldownVersion ? { rollupOptions: { plugins: [rolldownPlugin] } } : { esbuildOptions: { plugins: [esbuildPlugin] } } };
+				return { optimizeDeps: rolldownVersion ? { rolldownOptions: { plugins: [rolldownPlugin] } } : { esbuildOptions: { plugins: [esbuildPlugin] } } };
 			}
+		},
+		{
+			name: "vitest:browser:__vitest_browser_import_meta_env_init__",
+			transform: { handler(code) {
+				// this transform runs after `vitest:meta-env-replacer` so that
+				// `import.meta.env` will be handled by Vite import analysis to match behavior.
+				if (code.includes("__vitest_browser_import_meta_env_init__")) {
+					return code.replace("__vitest_browser_import_meta_env_init__", "import.meta.env");
+				}
+			} }
 		}
 	];
 };
@@ -2680,223 +2690,209 @@ class ParentBrowserProject {
 	}
 }
 
+//#region src/messages.ts
 const TYPE_REQUEST = "q";
 const TYPE_RESPONSE = "s";
-const DEFAULT_TIMEOUT = 6e4;
-function defaultSerialize(i) {
-  return i;
-}
-const defaultDeserialize = defaultSerialize;
-const { clearTimeout, setTimeout: setTimeout$1 } = globalThis;
-const random = Math.random.bind(Math);
-function createBirpc($functions, options) {
-  const {
-    post,
-    on,
-    off = () => {
-    },
-    eventNames = [],
-    serialize = defaultSerialize,
-    deserialize = defaultDeserialize,
-    resolver,
-    bind = "rpc",
-    timeout = DEFAULT_TIMEOUT
-  } = options;
-  let $closed = false;
-  const _rpcPromiseMap = /* @__PURE__ */ new Map();
-  let _promiseInit;
-  async function _call(method, args, event, optional) {
-    if ($closed)
-      throw new Error(`[birpc] rpc is closed, cannot call "${method}"`);
-    const req = { m: method, a: args, t: TYPE_REQUEST };
-    if (optional)
-      req.o = true;
-    const send = async (_req) => post(serialize(_req));
-    if (event) {
-      await send(req);
-      return;
-    }
-    if (_promiseInit) {
-      try {
-        await _promiseInit;
-      } finally {
-        _promiseInit = void 0;
-      }
-    }
-    let { promise, resolve, reject } = createPromiseWithResolvers();
-    const id = nanoid();
-    req.i = id;
-    let timeoutId;
-    async function handler(newReq = req) {
-      if (timeout >= 0) {
-        timeoutId = setTimeout$1(() => {
-          try {
-            const handleResult = options.onTimeoutError?.(method, args);
-            if (handleResult !== true)
-              throw new Error(`[birpc] timeout on calling "${method}"`);
-          } catch (e) {
-            reject(e);
-          }
-          _rpcPromiseMap.delete(id);
-        }, timeout);
-        if (typeof timeoutId === "object")
-          timeoutId = timeoutId.unref?.();
-      }
-      _rpcPromiseMap.set(id, { resolve, reject, timeoutId, method });
-      await send(newReq);
-      return promise;
-    }
-    try {
-      if (options.onRequest)
-        await options.onRequest(req, handler, resolve);
-      else
-        await handler();
-    } catch (e) {
-      if (options.onGeneralError?.(e) !== true)
-        throw e;
-      return;
-    } finally {
-      clearTimeout(timeoutId);
-      _rpcPromiseMap.delete(id);
-    }
-    return promise;
-  }
-  const $call = (method, ...args) => _call(method, args, false);
-  const $callOptional = (method, ...args) => _call(method, args, false, true);
-  const $callEvent = (method, ...args) => _call(method, args, true);
-  const $callRaw = (options2) => _call(options2.method, options2.args, options2.event, options2.optional);
-  const builtinMethods = {
-    $call,
-    $callOptional,
-    $callEvent,
-    $callRaw,
-    $rejectPendingCalls,
-    get $closed() {
-      return $closed;
-    },
-    $close,
-    $functions
-  };
-  const rpc = new Proxy({}, {
-    get(_, method) {
-      if (Object.prototype.hasOwnProperty.call(builtinMethods, method))
-        return builtinMethods[method];
-      if (method === "then" && !eventNames.includes("then") && !("then" in $functions))
-        return void 0;
-      const sendEvent = (...args) => _call(method, args, true);
-      if (eventNames.includes(method)) {
-        sendEvent.asEvent = sendEvent;
-        return sendEvent;
-      }
-      const sendCall = (...args) => _call(method, args, false);
-      sendCall.asEvent = sendEvent;
-      return sendCall;
-    }
-  });
-  function $close(customError) {
-    $closed = true;
-    _rpcPromiseMap.forEach(({ reject, method }) => {
-      const error = new Error(`[birpc] rpc is closed, cannot call "${method}"`);
-      if (customError) {
-        customError.cause ??= error;
-        return reject(customError);
-      }
-      reject(error);
-    });
-    _rpcPromiseMap.clear();
-    off(onMessage);
-  }
-  function $rejectPendingCalls(handler) {
-    const entries = Array.from(_rpcPromiseMap.values());
-    const handlerResults = entries.map(({ method, reject }) => {
-      if (!handler) {
-        return reject(new Error(`[birpc]: rejected pending call "${method}".`));
-      }
-      return handler({ method, reject });
-    });
-    _rpcPromiseMap.clear();
-    return handlerResults;
-  }
-  async function onMessage(data, ...extra) {
-    let msg;
-    try {
-      msg = deserialize(data);
-    } catch (e) {
-      if (options.onGeneralError?.(e) !== true)
-        throw e;
-      return;
-    }
-    if (msg.t === TYPE_REQUEST) {
-      const { m: method, a: args, o: optional } = msg;
-      let result, error;
-      let fn = await (resolver ? resolver(method, $functions[method]) : $functions[method]);
-      if (optional)
-        fn ||= () => void 0;
-      if (!fn) {
-        error = new Error(`[birpc] function "${method}" not found`);
-      } else {
-        try {
-          result = await fn.apply(bind === "rpc" ? rpc : $functions, args);
-        } catch (e) {
-          error = e;
-        }
-      }
-      if (msg.i) {
-        if (error && options.onError)
-          options.onError(error, method, args);
-        if (error && options.onFunctionError) {
-          if (options.onFunctionError(error, method, args) === true)
-            return;
-        }
-        if (!error) {
-          try {
-            await post(serialize({ t: TYPE_RESPONSE, i: msg.i, r: result }), ...extra);
-            return;
-          } catch (e) {
-            error = e;
-            if (options.onGeneralError?.(e, method, args) !== true)
-              throw e;
-          }
-        }
-        try {
-          await post(serialize({ t: TYPE_RESPONSE, i: msg.i, e: error }), ...extra);
-        } catch (e) {
-          if (options.onGeneralError?.(e, method, args) !== true)
-            throw e;
-        }
-      }
-    } else {
-      const { i: ack, r: result, e: error } = msg;
-      const promise = _rpcPromiseMap.get(ack);
-      if (promise) {
-        clearTimeout(promise.timeoutId);
-        if (error)
-          promise.reject(error);
-        else
-          promise.resolve(result);
-      }
-      _rpcPromiseMap.delete(ack);
-    }
-  }
-  _promiseInit = on(onMessage);
-  return rpc;
-}
+
+//#endregion
+//#region src/utils.ts
 function createPromiseWithResolvers() {
-  let resolve;
-  let reject;
-  const promise = new Promise((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  return { promise, resolve, reject };
+	let resolve;
+	let reject;
+	return {
+		promise: new Promise((res, rej) => {
+			resolve = res;
+			reject = rej;
+		}),
+		resolve,
+		reject
+	};
 }
+const random = Math.random.bind(Math);
 const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 function nanoid(size = 21) {
-  let id = "";
-  let i = size;
-  while (i--)
-    id += urlAlphabet[random() * 64 | 0];
-  return id;
+	let id = "";
+	let i = size;
+	while (i--) id += urlAlphabet[random() * 64 | 0];
+	return id;
+}
+
+//#endregion
+//#region src/main.ts
+const DEFAULT_TIMEOUT = 6e4;
+const defaultSerialize = (i) => i;
+const defaultDeserialize = defaultSerialize;
+const { clearTimeout, setTimeout: setTimeout$1 } = globalThis;
+function createBirpc($functions, options) {
+	const { post, on, off = () => {}, eventNames = [], serialize = defaultSerialize, deserialize = defaultDeserialize, resolver, bind = "rpc", timeout = DEFAULT_TIMEOUT, proxify = true } = options;
+	let $closed = false;
+	const _rpcPromiseMap = /* @__PURE__ */ new Map();
+	let _promiseInit;
+	let rpc;
+	async function _call(method, args, event, optional) {
+		if ($closed) throw new Error(`[birpc] rpc is closed, cannot call "${method}"`);
+		const req = {
+			m: method,
+			a: args,
+			t: TYPE_REQUEST
+		};
+		if (optional) req.o = true;
+		const send = async (_req) => post(serialize(_req));
+		if (event) {
+			await send(req);
+			return;
+		}
+		if (_promiseInit) try {
+			await _promiseInit;
+		} finally {
+			_promiseInit = void 0;
+		}
+		let { promise, resolve, reject } = createPromiseWithResolvers();
+		const id = nanoid();
+		req.i = id;
+		let timeoutId;
+		async function handler(newReq = req) {
+			if (timeout >= 0) {
+				timeoutId = setTimeout$1(() => {
+					try {
+						if (options.onTimeoutError?.call(rpc, method, args) !== true) throw new Error(`[birpc] timeout on calling "${method}"`);
+					} catch (e) {
+						reject(e);
+					}
+					_rpcPromiseMap.delete(id);
+				}, timeout);
+				if (typeof timeoutId === "object") timeoutId = timeoutId.unref?.();
+			}
+			_rpcPromiseMap.set(id, {
+				resolve,
+				reject,
+				timeoutId,
+				method
+			});
+			await send(newReq);
+			return promise;
+		}
+		try {
+			if (options.onRequest) await options.onRequest.call(rpc, req, handler, resolve);
+			else await handler();
+		} catch (e) {
+			if (options.onGeneralError?.call(rpc, e) !== true) throw e;
+			return;
+		} finally {
+			clearTimeout(timeoutId);
+			_rpcPromiseMap.delete(id);
+		}
+		return promise;
+	}
+	const builtinMethods = {
+		$call: (method, ...args) => _call(method, args, false),
+		$callOptional: (method, ...args) => _call(method, args, false, true),
+		$callEvent: (method, ...args) => _call(method, args, true),
+		$callRaw: (options$1) => _call(options$1.method, options$1.args, options$1.event, options$1.optional),
+		$rejectPendingCalls,
+		get $closed() {
+			return $closed;
+		},
+		get $meta() {
+			return options.meta;
+		},
+		$close,
+		$functions
+	};
+	if (proxify) rpc = new Proxy({}, { get(_, method) {
+		if (Object.prototype.hasOwnProperty.call(builtinMethods, method)) return builtinMethods[method];
+		if (method === "then" && !eventNames.includes("then") && !("then" in $functions)) return void 0;
+		const sendEvent = (...args) => _call(method, args, true);
+		if (eventNames.includes(method)) {
+			sendEvent.asEvent = sendEvent;
+			return sendEvent;
+		}
+		const sendCall = (...args) => _call(method, args, false);
+		sendCall.asEvent = sendEvent;
+		return sendCall;
+	} });
+	else rpc = builtinMethods;
+	function $close(customError) {
+		$closed = true;
+		_rpcPromiseMap.forEach(({ reject, method }) => {
+			const error = /* @__PURE__ */ new Error(`[birpc] rpc is closed, cannot call "${method}"`);
+			if (customError) {
+				customError.cause ??= error;
+				return reject(customError);
+			}
+			reject(error);
+		});
+		_rpcPromiseMap.clear();
+		off(onMessage);
+	}
+	function $rejectPendingCalls(handler) {
+		const handlerResults = Array.from(_rpcPromiseMap.values()).map(({ method, reject }) => {
+			if (!handler) return reject(/* @__PURE__ */ new Error(`[birpc]: rejected pending call "${method}".`));
+			return handler({
+				method,
+				reject
+			});
+		});
+		_rpcPromiseMap.clear();
+		return handlerResults;
+	}
+	async function onMessage(data, ...extra) {
+		let msg;
+		try {
+			msg = deserialize(data);
+		} catch (e) {
+			if (options.onGeneralError?.call(rpc, e) !== true) throw e;
+			return;
+		}
+		if (msg.t === TYPE_REQUEST) {
+			const { m: method, a: args, o: optional } = msg;
+			let result, error;
+			let fn = await (resolver ? resolver.call(rpc, method, $functions[method]) : $functions[method]);
+			if (optional) fn ||= () => void 0;
+			if (!fn) error = /* @__PURE__ */ new Error(`[birpc] function "${method}" not found`);
+			else try {
+				result = await fn.apply(bind === "rpc" ? rpc : $functions, args);
+			} catch (e) {
+				error = e;
+			}
+			if (msg.i) {
+				if (error && options.onFunctionError) {
+					if (options.onFunctionError.call(rpc, error, method, args) === true) return;
+				}
+				if (!error) try {
+					await post(serialize({
+						t: TYPE_RESPONSE,
+						i: msg.i,
+						r: result
+					}), ...extra);
+					return;
+				} catch (e) {
+					error = e;
+					if (options.onGeneralError?.call(rpc, e, method, args) !== true) throw e;
+				}
+				try {
+					await post(serialize({
+						t: TYPE_RESPONSE,
+						i: msg.i,
+						e: error
+					}), ...extra);
+				} catch (e) {
+					if (options.onGeneralError?.call(rpc, e, method, args) !== true) throw e;
+				}
+			}
+		} else {
+			const { i: ack, r: result, e: error } = msg;
+			const promise = _rpcPromiseMap.get(ack);
+			if (promise) {
+				clearTimeout(promise.timeoutId);
+				if (error) promise.reject(error);
+				else promise.resolve(result);
+			}
+			_rpcPromiseMap.delete(ack);
+		}
+	}
+	_promiseInit = on(onMessage);
+	return rpc;
 }
 
 const debug = createDebugger("vitest:browser:api");

package/package.json

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