npm - @vitest/browser - Versions diffs - 0.29.7 → 0.30.0 - Mend

@vitest/browser 0.29.7 → 0.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/README.md +6 -6
package/dist/client/__vitest__/assets/index-561b5dad.css +1 -0
package/dist/client/__vitest__/assets/index-d949d382.js +43 -0
package/dist/client/__vitest__/index.html +2 -2
package/dist/client/assets/{index-ca7a263d.js → index-b8629a79.js} +258 -51
package/dist/client/index.html +1 -1
package/dist/index.js +13 -11
package/package.json +8 -13
package/dist/client/__vitest__/assets/index-57d38fc4.css +0 -1
package/dist/client/__vitest__/assets/index-d8f092a0.js +0 -37

package/dist/client/__vitest__/index.html CHANGED Viewed

@@ -17,8 +17,8 @@
       })()
     </script>
     <!-- !LOAD_METADATA! -->
-    <script type="module" crossorigin src="./assets/index-d8f092a0.js"></script>
-    <link rel="stylesheet" href="./assets/index-57d38fc4.css">
+    <script type="module" crossorigin src="./assets/index-d949d382.js"></script>
+    <link rel="stylesheet" href="./assets/index-561b5dad.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/client/assets/{index-ca7a263d.js → index-b8629a79.js} RENAMED Viewed

@@ -23,15 +23,15 @@ var __publicField = (obj, key, value) => {
       }
     }
   }).observe(document, { childList: true, subtree: true });
-  function getFetchOpts(script) {
+  function getFetchOpts(link) {
     const fetchOpts = {};
-    if (script.integrity)
-      fetchOpts.integrity = script.integrity;
-    if (script.referrerpolicy)
-      fetchOpts.referrerPolicy = script.referrerpolicy;
-    if (script.crossorigin === "use-credentials")
+    if (link.integrity)
+      fetchOpts.integrity = link.integrity;
+    if (link.referrerPolicy)
+      fetchOpts.referrerPolicy = link.referrerPolicy;
+    if (link.crossOrigin === "use-credentials")
       fetchOpts.credentials = "include";
-    else if (script.crossorigin === "anonymous")
+    else if (link.crossOrigin === "anonymous")
       fetchOpts.credentials = "omit";
     else
       fetchOpts.credentials = "same-origin";
@@ -100,7 +100,7 @@ function createBirpc(functions, options) {
     timeout = DEFAULT_TIMEOUT
   } = options;
   const rpcPromiseMap = /* @__PURE__ */ new Map();
-  const rpc = new Proxy({}, {
+  const rpc2 = new Proxy({}, {
     get(_, method) {
       const sendEvent = (...args) => {
         post(serialize({ m: method, a: args, t: "q" }));
@@ -132,7 +132,7 @@ function createBirpc(functions, options) {
       const { m: method, a: args } = msg;
       let result, error;
       try {
-        result = await functions[method].apply(rpc, args);
+        result = await functions[method].apply(rpc2, args);
       } catch (e) {
         error = e;
       }
@@ -148,7 +148,7 @@ function createBirpc(functions, options) {
       rpcPromiseMap.delete(ack);
     }
   });
-  return rpc;
+  return rpc2;
 }
 const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 function nanoid(size = 21) {
@@ -158,6 +158,7 @@ function nanoid(size = 21) {
     id += urlAlphabet[Math.random() * 64 | 0];
   return id;
 }
+/*! (c) 2020 Andrea Giammarchi */
 const { parse: $parse, stringify: $stringify } = JSON;
 const { keys } = Object;
 const Primitive = String;
@@ -229,16 +230,17 @@ const stringify = (value, replacer, space) => {
     return after;
   }
 };
-const isAggregateError = (err) => {
+function isAggregateError(err) {
   if (typeof AggregateError !== "undefined" && err instanceof AggregateError)
     return true;
   return err instanceof Error && "errors" in err;
-};
+}
 class StateManager {
   constructor() {
     this.filesMap = /* @__PURE__ */ new Map();
     this.pathsSet = /* @__PURE__ */ new Set();
     this.collectingPromise = void 0;
+    this.browserTestPromises = /* @__PURE__ */ new Map();
     this.idMap = /* @__PURE__ */ new Map();
     this.taskFileMap = /* @__PURE__ */ new WeakMap();
     this.errorsSet = /* @__PURE__ */ new Set();
@@ -267,8 +269,8 @@ class StateManager {
   }
   getFiles(keys2) {
     if (keys2)
-      return keys2.map((key) => this.filesMap.get(key)).filter(Boolean);
-    return Array.from(this.filesMap.values());
+      return keys2.map((key) => this.filesMap.get(key)).filter(Boolean).flat();
+    return Array.from(this.filesMap.values()).flat();
   }
   getFilepaths() {
     return Array.from(this.filesMap.keys());
@@ -286,13 +288,23 @@ class StateManager {
   }
   collectFiles(files = []) {
     files.forEach((file) => {
-      this.filesMap.set(file.filepath, file);
+      const existing = this.filesMap.get(file.filepath) || [];
+      const otherProject = existing.filter((i) => i.projectName !== file.projectName);
+      otherProject.push(file);
+      this.filesMap.set(file.filepath, otherProject);
       this.updateId(file);
     });
   }
-  clearFiles(paths = []) {
+  clearFiles(project, paths = []) {
     paths.forEach((path) => {
-      this.filesMap.delete(path);
+      const files = this.filesMap.get(path);
+      if (!files)
+        return;
+      const filtered = files.filter((file) => file.projectName !== project.config.name);
+      if (!filtered.length)
+        this.filesMap.delete(path);
+      else
+        this.filesMap.set(path, filtered);
     });
   }
   updateId(task) {
@@ -402,16 +414,72 @@ function createClient(url2, options = {}) {
   }
   return ctx;
 }
-function createBrowserRunner(original) {
+const { get } = Reflect;
+const safeRandom = Math.random;
+function withSafeTimers(getTimers, fn) {
+  const { setTimeout: setTimeout2, clearTimeout, nextTick, setImmediate, clearImmediate } = getTimers();
+  const currentSetTimeout = globalThis.setTimeout;
+  const currentClearTimeout = globalThis.clearTimeout;
+  const currentRandom = globalThis.Math.random;
+  const currentNextTick = globalThis.process.nextTick;
+  const currentSetImmediate = globalThis.setImmediate;
+  const currentClearImmediate = globalThis.clearImmediate;
+  try {
+    globalThis.setTimeout = setTimeout2;
+    globalThis.clearTimeout = clearTimeout;
+    globalThis.Math.random = safeRandom;
+    globalThis.process.nextTick = nextTick;
+    globalThis.setImmediate = setImmediate;
+    globalThis.clearImmediate = clearImmediate;
+    const result = fn();
+    return result;
+  } finally {
+    globalThis.setTimeout = currentSetTimeout;
+    globalThis.clearTimeout = currentClearTimeout;
+    globalThis.Math.random = currentRandom;
+    globalThis.setImmediate = currentSetImmediate;
+    globalThis.clearImmediate = currentClearImmediate;
+    nextTick(() => {
+      globalThis.process.nextTick = currentNextTick;
+    });
+  }
+}
+const promises = /* @__PURE__ */ new Set();
+async function rpcDone() {
+  if (!promises.size)
+    return;
+  const awaitable = Array.from(promises);
+  return Promise.all(awaitable);
+}
+function createSafeRpc(client2, getTimers) {
+  return new Proxy(client2.rpc, {
+    get(target, p, handler) {
+      const sendCall = get(target, p, handler);
+      const safeSendCall = (...args) => withSafeTimers(getTimers, async () => {
+        const result = sendCall(...args);
+        promises.add(result);
+        try {
+          return await result;
+        } finally {
+          promises.delete(result);
+        }
+      });
+      safeSendCall.asEvent = sendCall.asEvent;
+      return safeSendCall;
+    }
+  });
+}
+function rpc() {
+  return globalThis.__vitest_worker__.safeRpc;
+}
+function createBrowserRunner(original, coverageModule) {
   return class BrowserTestRunner extends original {
     constructor(options) {
       super(options.config);
       __publicField(this, "config");
       __publicField(this, "hashMap", /* @__PURE__ */ new Map());
-      __publicField(this, "client");
       this.config = options.config;
       this.hashMap = options.browserHashMap;
-      this.client = options.client;
     }
     async onAfterRunTest(task) {
       var _a, _b, _c;
@@ -420,11 +488,17 @@ function createBrowserRunner(original) {
         console.error(error.message);
       });
     }
+    async onAfterRunSuite() {
+      var _a, _b;
+      await ((_a = super.onAfterRunSuite) == null ? void 0 : _a.call(this));
+      const coverage = await ((_b = coverageModule == null ? void 0 : coverageModule.takeCoverage) == null ? void 0 : _b.call(coverageModule));
+      await rpc().onAfterSuiteRun({ coverage });
+    }
     onCollected(files) {
-      return this.client.rpc.onCollected(files);
+      return rpc().onCollected(files);
     }
     onTaskUpdate(task) {
-      return this.client.rpc.onTaskUpdate(task);
+      return rpc().onTaskUpdate(task);
     }
     async importFile(filepath) {
       const match = filepath.match(/^(\w:\/)/);
@@ -438,24 +512,144 @@ function createBrowserRunner(original) {
     }
   };
 }
+function importId(id) {
+  const name = `/@id/${id}`;
+  return __vitePreload(() => import(name), true ? [] : void 0);
+}
+const { Date: Date$1, console: console$1 } = globalThis;
+async function setupConsoleLogSpy() {
+  const { stringify: stringify2, format, utilInspect } = await importId("vitest/utils");
+  const { log, info, error, dir, dirxml, trace, time, timeEnd, timeLog, warn, debug, count, countReset } = console$1;
+  const formatInput = (input) => {
+    if (input instanceof Node)
+      return stringify2(input);
+    return format(input);
+  };
+  const processLog = (args) => args.map(formatInput).join(" ");
+  const sendLog = (type, content) => {
+    var _a, _b;
+    if (content.startsWith("[vite]"))
+      return;
+    const unknownTestId = "__vitest__unknown_test__";
+    const taskId = ((_b = (_a = globalThis.__vitest_worker__) == null ? void 0 : _a.current) == null ? void 0 : _b.id) ?? unknownTestId;
+    rpc().sendLog({
+      content,
+      time: Date$1.now(),
+      taskId,
+      type,
+      size: content.length
+    });
+  };
+  const stdout = (base) => (...args) => {
+    sendLog("stdout", processLog(args));
+    return base(...args);
+  };
+  const stderr = (base) => (...args) => {
+    sendLog("stderr", processLog(args));
+    return base(...args);
+  };
+  console$1.log = stdout(log);
+  console$1.debug = stdout(debug);
+  console$1.info = stdout(info);
+  console$1.error = stderr(error);
+  console$1.warn = stderr(warn);
+  console$1.dir = (item, options) => {
+    sendLog("stdout", utilInspect(item, options));
+    return dir(item, options);
+  };
+  console$1.dirxml = (...args) => {
+    sendLog("stdout", processLog(args));
+    return dirxml(...args);
+  };
+  console$1.trace = (...args) => {
+    const content = processLog(args);
+    const error2 = new Error("Trace");
+    const stack = (error2.stack || "").split("\n").slice(2).join("\n");
+    sendLog("stdout", `${content}
+${stack}`);
+    return trace(...args);
+  };
+  const timeLabels = {};
+  console$1.time = (label = "default") => {
+    const now = performance.now();
+    time(label);
+    timeLabels[label] = now;
+  };
+  console$1.timeLog = (label = "default") => {
+    timeLog(label);
+    if (!(label in timeLabels))
+      sendLog("stderr", `Timer "${label}" does not exist`);
+    else
+      sendLog("stdout", `${label}: ${timeLabels[label]} ms`);
+  };
+  console$1.timeEnd = (label = "default") => {
+    const end = performance.now();
+    timeEnd(label);
+    const start = timeLabels[label];
+    if (!(label in timeLabels)) {
+      sendLog("stderr", `Timer "${label}" does not exist`);
+    } else if (start) {
+      const duration = end - start;
+      sendLog("stdout", `${label}: ${duration} ms`);
+    }
+  };
+  const countLabels = {};
+  console$1.count = (label = "default") => {
+    const counter = (countLabels[label] ?? 0) + 1;
+    countLabels[label] = counter;
+    sendLog("stdout", `${label}: ${counter}`);
+    return count(label);
+  };
+  console$1.countReset = (label = "default") => {
+    countLabels[label] = 0;
+    return countReset(label);
+  };
+}
+function showPopupWarning(name, value, defaultValue) {
+  return (...params) => {
+    const formatedParams = params.map((p) => JSON.stringify(p)).join(", ");
+    console.warn(`Vitest encountered a \`${name}(${formatedParams})\` call that it cannot handle by default, so it returned \`${value}\`. Read more in https://vitest.dev/guide/browser#thread-blocking-dialogs.
+If needed, mock the \`${name}\` call manually like:
+\`\`\`
+import { expect, vi } from "vitest"
+vi.spyOn(window, "${name}")${defaultValue ? `.mockReturnValue(${JSON.stringify(defaultValue)})` : ""}
+${name}(${formatedParams})
+expect(${name}).toHaveBeenCalledWith(${formatedParams})
+\`\`\``);
+    return value;
+  };
+}
+function setupDialogsSpy() {
+  globalThis.alert = showPopupWarning("alert", void 0);
+  globalThis.confirm = showPopupWarning("confirm", false, true);
+  globalThis.prompt = showPopupWarning("prompt", null, "your value");
+}
 class BrowserSnapshotEnvironment {
-  constructor(client2) {
-    this.client = client2;
+  getVersion() {
+    return "1";
+  }
+  getHeader() {
+    return `// Vitest Snapshot v${this.getVersion()}, https://vitest.dev/guide/snapshot.html`;
   }
   readSnapshotFile(filepath) {
-    return this.client.rpc.readFile(filepath);
+    return rpc().readFile(filepath);
   }
   saveSnapshotFile(filepath, snapshot) {
-    return this.client.rpc.writeFile(filepath, snapshot);
+    return rpc().writeFile(filepath, snapshot);
   }
   resolvePath(filepath) {
-    return this.client.rpc.resolveSnapshotPath(filepath);
+    return rpc().resolveSnapshotPath(filepath);
+  }
+  resolveRawPath(testPath, rawPath) {
+    return rpc().resolveSnapshotRawPath(testPath, rawPath);
   }
   removeSnapshotFile(filepath) {
-    return this.client.rpc.removeFile(filepath);
+    return rpc().removeFile(filepath);
   }
   async prepareDirectory(filepath) {
-    await this.client.rpc.createDirectory(filepath);
+    await rpc().createDirectory(filepath);
   }
 }
 globalThis.process = { env: {}, argv: [], cwd: () => "/", stdout: { write: () => {
@@ -469,9 +663,9 @@ let runner;
 const browserHashMap = /* @__PURE__ */ new Map();
 const url = new URL(location.href);
 const testId = url.searchParams.get("id") || "unknown";
-const getQueryPaths = () => {
+function getQueryPaths() {
   return url.searchParams.getAll("path");
-};
+}
 const client = createClient(ENTRY_URL);
 const ws = client.ws;
 async function loadConfig() {
@@ -488,43 +682,56 @@ async function loadConfig() {
 }
 ws.addEventListener("open", async () => {
   await loadConfig();
+  const { getSafeTimers } = await importId("vitest/utils");
+  const safeRpc = createSafeRpc(client, getSafeTimers);
+  globalThis.__vitest_browser__ = true;
   globalThis.__vitest_worker__ = {
     config,
     browserHashMap,
     moduleCache: /* @__PURE__ */ new Map(),
-    rpc: client.rpc
+    rpc: client.rpc,
+    safeRpc,
+    durations: {
+      environment: 0,
+      prepare: 0
+    }
   };
-  globalThis.__vitest_mocker__ = {};
   const paths = getQueryPaths();
   const iFrame = document.getElementById("vitest-ui");
   iFrame.setAttribute("src", "/__vitest__/");
-  await runTests(paths, config, client);
+  await setupConsoleLogSpy();
+  setupDialogsSpy();
+  await runTests(paths, config);
 });
-let hasSnapshot = false;
-async function runTests(paths, config2, client2) {
+async function runTests(paths, config2) {
   const viteClientPath = "/@vite/client";
   await __vitePreload(() => import(viteClientPath), true ? [] : void 0);
-  const path = "/__vitest_index__";
-  const { startTests, setupCommonEnv, setupSnapshotEnvironment } = await __vitePreload(() => import(path), true ? [] : void 0);
+  const {
+    startTests,
+    setupCommonEnv,
+    takeCoverageInsideWorker
+  } = await importId("vitest/browser");
+  const executor = {
+    executeId: (id) => importId(id)
+  };
   if (!runner) {
-    const runnerPath = "/__vitest_runners__";
-    const { VitestTestRunner } = await __vitePreload(() => import(runnerPath), true ? [] : void 0);
-    const BrowserRunner = createBrowserRunner(VitestTestRunner);
-    runner = new BrowserRunner({ config: config2, client: client2, browserHashMap });
-  }
-  if (!hasSnapshot) {
-    setupSnapshotEnvironment(new BrowserSnapshotEnvironment(client2));
-    hasSnapshot = true;
+    const { VitestTestRunner } = await importId("vitest/runners");
+    const BrowserRunner = createBrowserRunner(VitestTestRunner, { takeCoverage: () => takeCoverageInsideWorker(config2.coverage, executor) });
+    runner = new BrowserRunner({ config: config2, browserHashMap });
   }
+  if (!config2.snapshotOptions.snapshotEnvironment)
+    config2.snapshotOptions.snapshotEnvironment = new BrowserSnapshotEnvironment();
   try {
     await setupCommonEnv(config2);
-    const files = paths.map((path2) => {
-      return `${config2.root}/${path2}`.replace(/\/+/g, "/");
+    const files = paths.map((path) => {
+      return `${config2.root}/${path}`.replace(/\/+/g, "/");
     });
-    const now = `${new Date().getTime()}`;
+    const now = `${(/* @__PURE__ */ new Date()).getTime()}`;
     files.forEach((i) => browserHashMap.set(i, now));
-    await startTests(files, runner);
+    for (const file of files)
+      await startTests([file], runner);
   } finally {
-    await client2.rpc.onDone(testId);
+    await rpcDone();
+    await rpc().onDone(testId);
   }
 }

package/dist/client/index.html CHANGED Viewed

@@ -21,7 +21,7 @@
         border: none;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-ca7a263d.js"></script>
+    <script type="module" crossorigin src="/assets/index-b8629a79.js"></script>
   </head>
   <body>
     <iframe id="vitest-ui" src=""></iframe>

package/dist/index.js CHANGED Viewed

@@ -14,16 +14,10 @@ var index = (base = "/") => {
     {
       enforce: "pre",
       name: "vitest:browser",
-      async resolveId(id) {
-        if (id === "/__vitest_index__")
-          return this.resolve("vitest/browser");
-        if (id === "/__vitest_runners__")
-          return this.resolve("vitest/runners");
-        if (id.startsWith("node:"))
-          id = id.slice(5);
-        if (polyfills.includes(id))
-          return polyfillPath(normalizeId(id));
-        return null;
+      async config(viteConfig) {
+        // Enables using ignore hint for coverage providers with @preserve keyword
+        viteConfig.esbuild || (viteConfig.esbuild = {});
+        viteConfig.esbuild.legalComments = "inline";
       },
       async configureServer(server) {
         server.middlewares.use(
@@ -37,8 +31,16 @@ var index = (base = "/") => {
     },
     {
       name: "modern-node-polyfills",
+      enforce: "pre",
+      config() {
+        return {
+          optimizeDeps: {
+            exclude: [...polyfills, ...builtinModules]
+          }
+        };
+      },
       async resolveId(id) {
-        if (!builtinModules.includes(id))
+        if (!builtinModules.includes(id) && !polyfills.includes(id) && !id.startsWith("node:"))
           return;
         id = normalizeId(id);
         return { id: await polyfillPath(id), moduleSideEffects: false };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "0.29.7",
+  "version": "0.30.0",
   "description": "Browser running for Vitest",
   "repository": {
     "type": "git",
@@ -27,27 +27,22 @@
     "vitest": ">=0.29.4"
   },
   "dependencies": {
-    "local-pkg": "^0.4.2",
-    "mlly": "^1.1.0",
     "modern-node-polyfills": "0.1.0",
-    "rollup-plugin-node-polyfills": "^0.2.1",
-    "sirv": "^2.0.2",
-    "@vitest/runner": "0.29.7"
+    "sirv": "^2.0.2"
   },
   "devDependencies": {
     "@types/ws": "^8.5.4",
-    "rollup": "^2.79.1",
-    "@vitest/ws-client": "0.29.7",
-    "@vitest/ui": "0.29.7",
-    "vitest": "0.29.7"
+    "@vitest/ws-client": "0.30.0",
+    "@vitest/ui": "0.30.0",
+    "@vitest/runner": "0.30.0",
+    "vitest": "0.30.0"
   },
   "scripts": {
-    "build": "rimraf dist && pnpm build:node && pnpm build:client && pnpm copy",
+    "build": "rimraf dist && pnpm build:node && pnpm build:client",
     "build:client": "vite build src/client",
     "build:node": "rollup -c",
     "dev:client": "vite build src/client --watch",
     "dev:node": "rollup -c --watch --watch.include src/node/index.ts",
-    "dev": "rimraf dist && run-p dev:node dev:client",
-    "copy": "esno scripts/copy-ui-to-browser.ts"
+    "dev": "rimraf dist && run-p dev:node dev:client"
   }
 }