npm - @vitest/browser - Versions diffs - 0.30.1 → 0.31.0 - Mend

@vitest/browser 0.30.1 → 0.31.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/dist/client/__vitest__/assets/index-412667a2.css +1 -0
package/dist/client/__vitest__/assets/index-ee62cb59.js +43 -0
package/dist/client/__vitest__/index.html +2 -2
package/dist/client/assets/{index-8a9c2d7a.js → index-5fc20d62.js} +189 -16
package/dist/client/index.html +50 -1
package/dist/index.d.ts +1 -1
package/dist/index.js +1930 -4
package/package.json +17 -7
package/dist/client/__vitest__/assets/index-561b5dad.css +0 -1
package/dist/client/__vitest__/assets/index-d949d382.js +0 -43

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

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

package/dist/client/assets/{index-8a9c2d7a.js → index-5fc20d62.js} RENAMED Viewed

@@ -110,9 +110,9 @@ function createBirpc(functions, options) {
         return sendEvent;
       }
       const sendCall = (...args) => {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve2, reject) => {
           const id = nanoid();
-          rpcPromiseMap.set(id, { resolve, reject });
+          rpcPromiseMap.set(id, { resolve: resolve2, reject });
           post(serialize({ m: method, a: args, i: id, t: "q" }));
           if (timeout >= 0) {
             setTimeout(() => {
@@ -230,6 +230,114 @@ const stringify = (value, replacer, space) => {
     return after;
   }
 };
+function normalizeWindowsPath(input = "") {
+  if (!input || !input.includes("\\")) {
+    return input;
+  }
+  return input.replace(/\\/g, "/");
+}
+const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+function cwd() {
+  if (typeof process !== "undefined") {
+    return process.cwd().replace(/\\/g, "/");
+  }
+  return "/";
+}
+const resolve = function(...arguments_) {
+  arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
+  let resolvedPath = "";
+  let resolvedAbsolute = false;
+  for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
+    const path = index >= 0 ? arguments_[index] : cwd();
+    if (!path || path.length === 0) {
+      continue;
+    }
+    resolvedPath = `${path}/${resolvedPath}`;
+    resolvedAbsolute = isAbsolute(path);
+  }
+  resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
+  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
+    return `/${resolvedPath}`;
+  }
+  return resolvedPath.length > 0 ? resolvedPath : ".";
+};
+function normalizeString(path, allowAboveRoot) {
+  let res = "";
+  let lastSegmentLength = 0;
+  let lastSlash = -1;
+  let dots = 0;
+  let char = null;
+  for (let index = 0; index <= path.length; ++index) {
+    if (index < path.length) {
+      char = path[index];
+    } else if (char === "/") {
+      break;
+    } else {
+      char = "/";
+    }
+    if (char === "/") {
+      if (lastSlash === index - 1 || dots === 1)
+        ;
+      else if (dots === 2) {
+        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
+          if (res.length > 2) {
+            const lastSlashIndex = res.lastIndexOf("/");
+            if (lastSlashIndex === -1) {
+              res = "";
+              lastSegmentLength = 0;
+            } else {
+              res = res.slice(0, lastSlashIndex);
+              lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
+            }
+            lastSlash = index;
+            dots = 0;
+            continue;
+          } else if (res.length > 0) {
+            res = "";
+            lastSegmentLength = 0;
+            lastSlash = index;
+            dots = 0;
+            continue;
+          }
+        }
+        if (allowAboveRoot) {
+          res += res.length > 0 ? "/.." : "..";
+          lastSegmentLength = 2;
+        }
+      } else {
+        if (res.length > 0) {
+          res += `/${path.slice(lastSlash + 1, index)}`;
+        } else {
+          res = path.slice(lastSlash + 1, index);
+        }
+        lastSegmentLength = index - lastSlash - 1;
+      }
+      lastSlash = index;
+      dots = 0;
+    } else if (char === "." && dots !== -1) {
+      ++dots;
+    } else {
+      dots = -1;
+    }
+  }
+  return res;
+}
+const isAbsolute = function(p) {
+  return _IS_ABSOLUTE_RE.test(p);
+};
+const relative = function(from, to) {
+  const _from = resolve(from).split("/");
+  const _to = resolve(to).split("/");
+  const _fromCopy = [..._from];
+  for (const segment of _fromCopy) {
+    if (_to[0] !== segment) {
+      break;
+    }
+    _from.shift();
+    _to.shift();
+  }
+  return [..._from.map(() => ".."), ..._to].join("/");
+};
 function isAggregateError(err) {
   if (typeof AggregateError !== "undefined" && err instanceof AggregateError)
     return true;
@@ -331,6 +439,26 @@ class StateManager {
       task.logs.push(log);
     }
   }
+  getCountOfFailedTests() {
+    return Array.from(this.idMap.values()).filter((t) => {
+      var _a;
+      return ((_a = t.result) == null ? void 0 : _a.state) === "fail";
+    }).length;
+  }
+  cancelFiles(files, root) {
+    this.collectFiles(files.map((filepath) => ({
+      filepath,
+      name: relative(root, filepath),
+      id: filepath,
+      mode: "skip",
+      type: "suite",
+      result: {
+        state: "skip"
+      },
+      // Cancelled files have not yet collected tests
+      tasks: []
+    })));
+  }
 }
 function createClient(url2, options = {}) {
   const {
@@ -373,6 +501,10 @@ function createClient(url2, options = {}) {
     onFinished(files) {
       var _a;
       (_a = handlers.onFinished) == null ? void 0 : _a.call(handlers, files);
+    },
+    onCancel(reason) {
+      var _a;
+      (_a = handlers.onCancel) == null ? void 0 : _a.call(handlers, reason);
     }
   };
   const birpcHandlers = {
@@ -393,10 +525,10 @@ function createClient(url2, options = {}) {
     registerWS();
   }
   function registerWS() {
-    openPromise = new Promise((resolve) => {
+    openPromise = new Promise((resolve2) => {
       ctx.ws.addEventListener("open", () => {
         tries = reconnectTries;
-        resolve();
+        resolve2();
       });
     });
     ctx.ws.addEventListener("message", (v) => {
@@ -482,11 +614,19 @@ function createBrowserRunner(original, coverageModule) {
       this.hashMap = options.browserHashMap;
     }
     async onAfterRunTest(task) {
-      var _a, _b, _c;
-      await ((_a = super.onAfterRunTest) == null ? void 0 : _a.call(this));
+      var _a, _b, _c, _d, _e;
+      await ((_a = super.onAfterRunTest) == null ? void 0 : _a.call(this, task));
       (_c = (_b = task.result) == null ? void 0 : _b.errors) == null ? void 0 : _c.forEach((error) => {
         console.error(error.message);
       });
+      if (this.config.bail && ((_d = task.result) == null ? void 0 : _d.state) === "fail") {
+        const previousFailures = await rpc().getCountOfFailedTests();
+        const currentFailures = 1 + previousFailures;
+        if (currentFailures >= this.config.bail) {
+          rpc().onCancel("test-failure");
+          (_e = this.onCancel) == null ? void 0 : _e.call(this, "test-failure");
+        }
+      }
     }
     async onAfterRunSuite() {
       var _a, _b;
@@ -501,20 +641,19 @@ function createBrowserRunner(original, coverageModule) {
       return rpc().onTaskUpdate(task);
     }
     async importFile(filepath) {
-      const match = filepath.match(/^(\w:\/)/);
-      let hash = this.hashMap.get(filepath);
-      if (!hash) {
+      let [test, hash] = this.hashMap.get(filepath) ?? [false, ""];
+      if (hash === "") {
         hash = Date.now().toString();
-        this.hashMap.set(filepath, hash);
+        this.hashMap.set(filepath, [false, hash]);
       }
-      const importpath = match ? `/@fs/${filepath.slice(match[1].length)}?v=${hash}` : `${filepath}?v=${hash}`;
+      const importpath = /^\w:/.test(filepath) ? `/@fs/${filepath}?${test ? "browserv" : "v"}=${hash}` : `${filepath}?${test ? "browserv" : "v"}=${hash}`;
       await __vitePreload(() => import(importpath), true ? [] : void 0);
     }
   };
 }
 function importId(id) {
   const name = `/@id/${id}`;
-  return __vitePreload(() => import(name), true ? [] : void 0);
+  return __vi_wrap_module__(__vitePreload(() => import(name), true ? [] : void 0));
 }
 const { Date: Date$1, console: console$1 } = globalThis;
 async function setupConsoleLogSpy() {
@@ -652,6 +791,25 @@ class BrowserSnapshotEnvironment {
     await rpc().createDirectory(dirPath);
   }
 }
+function throwNotImplemented(name) {
+  throw new Error(`[vitest] ${name} is not implemented in browser environment yet.`);
+}
+class VitestBrowserClientMocker {
+  importActual() {
+    throwNotImplemented("importActual");
+  }
+  importMock() {
+    throwNotImplemented("importMock");
+  }
+  queueMock() {
+    throwNotImplemented("queueMock");
+  }
+  queueUnmock() {
+    throwNotImplemented("queueUnmock");
+  }
+  prepare() {
+  }
+}
 globalThis.process = { env: {}, argv: [], cwd: () => "/", stdout: { write: () => {
 } }, nextTick: (cb) => cb() };
 globalThis.global = globalThis;
@@ -666,13 +824,22 @@ const testId = url.searchParams.get("id") || "unknown";
 function getQueryPaths() {
   return url.searchParams.getAll("path");
 }
-const client = createClient(ENTRY_URL);
+let setCancel = (_) => {
+};
+const onCancel = new Promise((resolve2) => {
+  setCancel = resolve2;
+});
+const client = createClient(ENTRY_URL, {
+  handlers: {
+    onCancel: setCancel
+  }
+});
 const ws = client.ws;
 async function loadConfig() {
   let retries = 5;
   do {
     try {
-      await new Promise((resolve) => setTimeout(resolve, 150));
+      await new Promise((resolve2) => setTimeout(resolve2, 150));
       config = await client.rpc.getConfig();
       return;
     } catch (_) {
@@ -688,7 +855,8 @@ ws.addEventListener("open", async () => {
   globalThis.__vitest_worker__ = {
     config,
     browserHashMap,
-    moduleCache: /* @__PURE__ */ new Map(),
+    // @ts-expect-error untyped global for internal use
+    moduleCache: globalThis.__vi_module_cache__,
     rpc: client.rpc,
     safeRpc,
     durations: {
@@ -696,6 +864,7 @@ ws.addEventListener("open", async () => {
       prepare: 0
     }
   };
+  globalThis.__vitest_mocker__ = new VitestBrowserClientMocker();
   const paths = getQueryPaths();
   const iFrame = document.getElementById("vitest-ui");
   iFrame.setAttribute("src", "/__vitest__/");
@@ -719,6 +888,10 @@ async function runTests(paths, config2) {
     const BrowserRunner = createBrowserRunner(VitestTestRunner, { takeCoverage: () => takeCoverageInsideWorker(config2.coverage, executor) });
     runner = new BrowserRunner({ config: config2, browserHashMap });
   }
+  onCancel.then((reason) => {
+    var _a;
+    (_a = runner == null ? void 0 : runner.onCancel) == null ? void 0 : _a.call(runner, reason);
+  });
   if (!config2.snapshotOptions.snapshotEnvironment)
     config2.snapshotOptions.snapshotEnvironment = new BrowserSnapshotEnvironment();
   try {
@@ -727,7 +900,7 @@ async function runTests(paths, config2) {
       return `${config2.root}/${path}`.replace(/\/+/g, "/");
     });
     const now = `${(/* @__PURE__ */ new Date()).getTime()}`;
-    files.forEach((i) => browserHashMap.set(i, now));
+    files.forEach((i) => browserHashMap.set(i, [true, now]));
     for (const file of files)
       await startTests([file], runner);
   } finally {

package/dist/client/index.html CHANGED Viewed

@@ -21,10 +21,59 @@
         border: none;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-8a9c2d7a.js"></script>
+    <script type="module" crossorigin src="/assets/index-5fc20d62.js"></script>
   </head>
   <body>
     <iframe id="vitest-ui" src=""></iframe>
+    <script>
+      const moduleCache = new Map()
+      // this method receives a module object or "import" promise that it resolves and keeps track of
+      // and returns a hijacked module object that can be used to mock module exports
+      function wrapModule(module) {
+        if (module instanceof Promise) {
+          moduleCache.set(module, { promise: module, evaluated: false })
+          return module
+            .then(m => m.__vi_inject__)
+            .finally(() => moduleCache.delete(module))
+        }
+        return module.__vi_inject__
+      }
+      function exportAll(exports, sourceModule) {
+        // #1120 when a module exports itself it causes
+        // call stack error
+        if (exports === sourceModule)
+          return
+        if (Object(sourceModule) !== sourceModule || Array.isArray(sourceModule))
+          return
+        for (const key in sourceModule) {
+          if (key !== 'default') {
+            try {
+              Object.defineProperty(exports, key, {
+                enumerable: true,
+                configurable: true,
+                get: () => sourceModule[key],
+              })
+            }
+            catch (_err) { }
+          }
+        }
+      }
+      window.__vi_export_all__ = exportAll
+      // TODO: allow easier rewriting of import.meta.env
+      window.__vi_import_meta__ = {
+        env: {},
+        url: location.href,
+      }
+      window.__vi_module_cache__ = moduleCache
+      window.__vi_wrap_module__ = wrapModule
+    </script>
   </body>
 </html>

package/dist/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Plugin } from 'vite';
-declare const _default: (base?: string) => Plugin[];
+declare const _default: (project: any, base?: string) => Plugin[];
 export { _default as default };