npm - @vitest/browser - Versions diffs - 1.5.3 → 1.6.1 - Mend

@vitest/browser 1.5.3 → 1.6.1

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 (11) hide show

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

@@ -17,7 +17,7 @@
       })()
     </script>
     <!-- !LOAD_METADATA! -->
-    <script type="module" crossorigin src="./assets/index-TejngHZE.js"></script>
+    <script type="module" crossorigin src="./assets/index-9agQl9q3.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-fUmMsp0O.css">
   </head>
   <body>

package/dist/client/__vitest_browser__/{main-v2hiOVax.js → main-_I3locjo.js} RENAMED Viewed

@@ -1,4 +1,4 @@
-import { c as client, g as getConfig, a as getBrowserState, b as channel, r as rpcDone } from "./rpc-slP7oy1q.js";
+import { c as client, g as getConfig, a as getBrowserState, b as channel, r as rpcDone } from "./rpc-mFMlTT5u.js";
 const url = new URL(location.href);
 const ID_ALL = "__vitest_all__";
 const iframes = /* @__PURE__ */ new Map();

package/dist/client/__vitest_browser__/{rpc-slP7oy1q.js → rpc-mFMlTT5u.js} RENAMED Viewed

@@ -575,7 +575,7 @@ function createClient(url, options = {}) {
 }
 const PORT = location.port;
 const HOST = [location.hostname, PORT].filter(Boolean).join(":");
-const ENTRY_URL = `${location.protocol === "https:" ? "wss:" : "ws:"}//${HOST}/__vitest_api__`;
+const ENTRY_URL = `${location.protocol === "https:" ? "wss:" : "ws:"}//${HOST}/__vitest_api__?token=${window.VITEST_API_TOKEN}`;
 let setCancel = (_) => {
 };
 const onCancel = new Promise((resolve2) => {

package/dist/client/__vitest_browser__/{tester-2urZfMAh.js → tester-y7J4ROPm.js} RENAMED Viewed

@@ -10,7 +10,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { i as importId, d as rpc, g as getConfig, _ as __vitePreload, b as channel, a as getBrowserState, c as client, l as loadSafeRpc, o as onCancel } from "./rpc-slP7oy1q.js";
+import { i as importId, d as rpc$1, g as getConfig, _ as __vitePreload, b as channel, a as getBrowserState, c as client, l as loadSafeRpc, o as onCancel } from "./rpc-mFMlTT5u.js";
 function showPopupWarning(name, value, defaultValue) {
   return (...params) => {
     const formatedParams = params.map((p) => JSON.stringify(p)).join(", ");
@@ -48,7 +48,7 @@ async function setupConsoleLogSpy() {
       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({
+    rpc$1().sendLog({
       content,
       time: Date$1.now(),
       taskId,
@@ -121,7 +121,7 @@ ${stack}`);
     return countReset(label);
   };
 }
-class BrowserSnapshotEnvironment {
+class VitestBrowserSnapshotEnvironment {
   getVersion() {
     return "1";
   }
@@ -144,6 +144,9 @@ class BrowserSnapshotEnvironment {
     return rpc().removeSnapshotFile(filepath);
   }
 }
+function rpc() {
+  return globalThis.__vitest_worker__.rpc;
+}
 const browserHashMap = /* @__PURE__ */ new Map();
 function createBrowserRunner(runnerClass, coverageModule) {
   return class BrowserTestRunner extends runnerClass {
@@ -155,10 +158,10 @@ function createBrowserRunner(runnerClass, coverageModule) {
         var _a, _b, _c;
         await ((_a = super.onAfterRunTask) == null ? void 0 : _a.call(this, task));
         if (this.config.bail && ((_b = task.result) == null ? void 0 : _b.state) === "fail") {
-          const previousFailures = await rpc().getCountOfFailedTests();
+          const previousFailures = await rpc$1().getCountOfFailedTests();
           const currentFailures = 1 + previousFailures;
           if (currentFailures >= this.config.bail) {
-            rpc().onCancel("test-failure");
+            rpc$1().onCancel("test-failure");
             (_c = this.onCancel) == null ? void 0 : _c.call(this, "test-failure");
           }
         }
@@ -168,7 +171,7 @@ function createBrowserRunner(runnerClass, coverageModule) {
         await ((_a = super.onAfterRunFiles) == null ? void 0 : _a.call(this, files));
         const coverage = await ((_b = coverageModule == null ? void 0 : coverageModule.takeCoverage) == null ? void 0 : _b.call(coverageModule));
         if (coverage) {
-          await rpc().onAfterSuiteRun({
+          await rpc$1().onAfterSuiteRun({
             coverage,
             transformMode: "web",
             projectName: this.config.name
@@ -182,10 +185,10 @@ function createBrowserRunner(runnerClass, coverageModule) {
           } catch (_) {
           }
         }
-        return rpc().onCollected(files);
+        return rpc$1().onCollected(files);
       });
       __publicField(this, "onTaskUpdate", (task) => {
-        return rpc().onTaskUpdate(task);
+        return rpc$1().onTaskUpdate(task);
       });
       __publicField(this, "importFile", async (filepath) => {
         let [test, hash] = this.hashMap.get(filepath) ?? [false, ""];
@@ -208,7 +211,10 @@ async function initiateRunner() {
   if (cachedRunner)
     return cachedRunner;
   const config = getConfig();
-  const [{ VitestTestRunner, NodeBenchmarkRunner }, { takeCoverageInsideWorker, loadDiffConfig, loadSnapshotSerializers }] = await Promise.all([
+  const [
+    { VitestTestRunner, NodeBenchmarkRunner },
+    { takeCoverageInsideWorker, loadDiffConfig, loadSnapshotSerializers }
+  ] = await Promise.all([
     importId("vitest/runners"),
     importId("vitest/browser")
   ]);
@@ -217,7 +223,7 @@ async function initiateRunner() {
     takeCoverage: () => takeCoverageInsideWorker(config.coverage, { executeId: importId })
   });
   if (!config.snapshotOptions.snapshotEnvironment)
-    config.snapshotOptions.snapshotEnvironment = new BrowserSnapshotEnvironment();
+    config.snapshotOptions.snapshotEnvironment = new VitestBrowserSnapshotEnvironment();
   const runner = new BrowserRunner({
     config
   });
@@ -234,7 +240,7 @@ async function updateFilesLocations(files) {
   const { loadSourceMapUtils } = await importId("vitest/utils");
   const { TraceMap, originalPositionFor } = await loadSourceMapUtils();
   const promises = files.map(async (file) => {
-    const result = await rpc().getBrowserFileSourceMap(file.filepath);
+    const result = await rpc$1().getBrowserFileSourceMap(file.filepath);
     if (!result)
       return null;
     const traceMap = new TraceMap(result);

package/dist/client/esm-client-injector.js CHANGED Viewed

@@ -38,6 +38,7 @@ window.__vitest_browser_runner__ = {
   config: { __VITEST_CONFIG__ },
   files: { __VITEST_FILES__ },
 }
+window.VITEST_API_TOKEN = { __VITEST_API_TOKEN__ }
 const config = __vitest_browser_runner__.config

package/dist/client/index.html CHANGED Viewed

@@ -22,8 +22,9 @@
       }
     </style>
     <script>{__VITEST_INJECTOR__}</script>
-    <script type="module" crossorigin src="/__vitest_browser__/main-v2hiOVax.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/rpc-slP7oy1q.js">
+    {__VITEST_SCRIPTS__}
+    <script type="module" crossorigin src="/__vitest_browser__/main-_I3locjo.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/rpc-mFMlTT5u.js">
   </head>
   <body>
     <iframe id="vitest-ui" src=""></iframe>

package/dist/client/tester.html CHANGED Viewed

@@ -16,8 +16,9 @@
       }
     </style>
     <script>{__VITEST_INJECTOR__}</script>
-    <script type="module" crossorigin src="/__vitest_browser__/tester-2urZfMAh.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/rpc-slP7oy1q.js">
+    {__VITEST_SCRIPTS__}
+    <script type="module" crossorigin src="/__vitest_browser__/tester-y7J4ROPm.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/rpc-mFMlTT5u.js">
   </head>
   <body>
     {__VITEST_APPEND__}

package/dist/index.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { fileURLToPath } from 'node:url';
 import { readFile } from 'node:fs/promises';
 import sirv from 'sirv';
 import { coverageConfigDefaults } from 'vitest/config';
+import { slash } from '@vitest/utils';
 import MagicString from 'magic-string';
 import { esmWalker } from '@vitest/utils/ast';
@@ -11,7 +12,58 @@ function normalizeWindowsPath(input = "") {
   }
   return input.replace(/\\/g, "/");
 }
+const _UNC_REGEX = /^[/\\]{2}/;
 const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+const _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
+const normalize = function(path) {
+  if (path.length === 0) {
+    return ".";
+  }
+  path = normalizeWindowsPath(path);
+  const isUNCPath = path.match(_UNC_REGEX);
+  const isPathAbsolute = isAbsolute(path);
+  const trailingSeparator = path[path.length - 1] === "/";
+  path = normalizeString(path, !isPathAbsolute);
+  if (path.length === 0) {
+    if (isPathAbsolute) {
+      return "/";
+    }
+    return trailingSeparator ? "./" : ".";
+  }
+  if (trailingSeparator) {
+    path += "/";
+  }
+  if (_DRIVE_LETTER_RE.test(path)) {
+    path += "/";
+  }
+  if (isUNCPath) {
+    if (!isPathAbsolute) {
+      return `//./${path}`;
+    }
+    return `//${path}`;
+  }
+  return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
+};
+const join = function(...arguments_) {
+  if (arguments_.length === 0) {
+    return ".";
+  }
+  let joined;
+  for (const argument of arguments_) {
+    if (argument && argument.length > 0) {
+      if (joined === void 0) {
+        joined = argument;
+      } else {
+        joined += `/${argument}`;
+      }
+    }
+  }
+  if (joined === void 0) {
+    return ".";
+  }
+  return normalize(joined.replace(/\/\/+/g, "/"));
+};
 function cwd() {
   if (typeof process !== "undefined") {
     return process.cwd().replace(/\\/g, "/");
@@ -345,9 +397,6 @@ export { ${viInjectedKey} }`);
   };
 }
-function replacer(code, values) {
-  return code.replace(/{\s*(\w+)\s*}/g, (_, key) => values[key] ?? "");
-}
 var index = (project, base = "/") => {
   const pkgRoot = resolve(fileURLToPath(import.meta.url), "../..");
   const distRoot = resolve(pkgRoot, "dist");
@@ -376,6 +425,8 @@ var index = (project, base = "/") => {
           }
           next();
         });
+        let indexScripts;
+        let testerScripts;
         server.middlewares.use(async (req, res, next) => {
           if (!req.url)
             return next();
@@ -390,12 +441,16 @@ var index = (project, base = "/") => {
           config.env.VITEST_BROWSER_DEBUG = process.env.VITEST_BROWSER_DEBUG || "";
           const injector = replacer(await injectorJs, {
             __VITEST_CONFIG__: JSON.stringify(config),
-            __VITEST_FILES__: JSON.stringify(files)
+            __VITEST_FILES__: JSON.stringify(files),
+            __VITEST_API_TOKEN__: JSON.stringify(project.ctx.config.api.token)
           });
           if (url.pathname === base) {
+            if (!indexScripts)
+              indexScripts = await formatScripts(project.config.browser.indexScripts, server);
             const html2 = replacer(await runnerHtml, {
               __VITEST_FAVICON__: favicon,
               __VITEST_TITLE__: "Vitest Browser Runner",
+              __VITEST_SCRIPTS__: indexScripts,
               __VITEST_INJECTOR__: injector
             });
             res.write(html2, "utf-8");
@@ -404,9 +459,12 @@ var index = (project, base = "/") => {
           }
           const decodedTestFile = decodeURIComponent(url.pathname.slice(testerPrefix.length));
           const tests = decodedTestFile === "__vitest_all__" || !files.includes(decodedTestFile) ? "__vitest_browser_runner__.files" : JSON.stringify([decodedTestFile]);
+          if (!testerScripts)
+            testerScripts = await formatScripts(project.config.browser.testerScripts, server);
           const html = replacer(await testerHtml, {
             __VITEST_FAVICON__: favicon,
             __VITEST_TITLE__: "Vitest Browser Tester",
+            __VITEST_SCRIPTS__: testerScripts,
             __VITEST_INJECTOR__: injector,
             __VITEST_APPEND__: (
               // TODO: have only a single global variable to not pollute the global scope
@@ -541,5 +599,20 @@ function wrapConfig(config) {
     testNamePattern: config.testNamePattern ? config.testNamePattern.toString() : void 0
   };
 }
+function replacer(code, values) {
+  return code.replace(/{\s*(\w+)\s*}/g, (_, key) => values[key] ?? "");
+}
+async function formatScripts(scripts, server) {
+  if (!scripts?.length)
+    return "";
+  const promises = scripts.map(async ({ content, src, async, id, type = "module" }, index) => {
+    const srcLink = (src ? (await server.pluginContainer.resolveId(src))?.id : void 0) || src;
+    const transformId = srcLink || join(server.config.root, `virtual__${id || `injected-${index}.js`}`);
+    await server.moduleGraph.ensureEntryFromUrl(transformId);
+    const contentProcessed = content && type === "module" ? (await server.pluginContainer.transform(content, transformId)).code : content;
+    return `<script type="${type}"${async ? " async" : ""}${srcLink ? ` src="${slash(`/@fs/${srcLink}`)}"` : ""}>${contentProcessed || ""}<\/script>`;
+  });
+  return (await Promise.all(promises)).join("\n");
+}
 export { index as default };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -43,7 +43,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "*",
-    "vitest": "1.5.3"
+    "vitest": "1.6.1"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -59,20 +59,20 @@
   "dependencies": {
     "magic-string": "^0.30.5",
     "sirv": "^2.0.4",
-    "@vitest/utils": "1.5.3"
+    "@vitest/utils": "1.6.1"
   },
   "devDependencies": {
     "@types/ws": "^8.5.9",
     "@wdio/protocols": "^8.29.7",
     "periscopic": "^4.0.2",
-    "playwright": "^1.41.0",
+    "playwright": "^1.49.1",
     "playwright-core": "^1.41.0",
     "safaridriver": "^0.1.2",
     "webdriverio": "^8.32.2",
-    "@vitest/ui": "1.5.3",
-    "@vitest/runner": "1.5.3",
-    "@vitest/ws-client": "1.5.3",
-    "vitest": "1.5.3"
+    "@vitest/ui": "1.6.1",
+    "@vitest/ws-client": "1.6.1",
+    "@vitest/runner": "1.6.1",
+    "vitest": "1.6.1"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",