npm - @vitest/browser - Versions diffs - 2.0.0-beta.7 → 2.0.0-beta.9 - Mend

@vitest/browser 2.0.0-beta.7 → 2.0.0-beta.9

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

package/dist/client/__vitest__/assets/{index-BNIf8EuF.js → index-BZPCs_Bg.js} +20 -20
package/dist/client/__vitest__/index.html +1 -1
package/dist/index.js +33 -18
package/package.json +7 -7

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

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

package/dist/index.js CHANGED Viewed

@@ -2,11 +2,11 @@ import { fileURLToPath } from 'node:url';
 import { readFile as readFile$1 } from 'node:fs/promises';
 import { createRequire } from 'node:module';
 import sirv from 'sirv';
+import { isFileServingAllowed, getFilePoolName, distDir } from 'vitest/node';
 import { coverageConfigDefaults } from 'vitest/config';
-import { slash } from '@vitest/utils';
+import { slash, toArray } from '@vitest/utils';
 import fs, { promises } from 'node:fs';
 import { resolve as resolve$1, dirname as dirname$1 } from 'node:path';
-import { isFileServingAllowed } from 'vitest/node';
 import MagicString from 'magic-string';
 import { esmWalker } from '@vitest/utils/ast';
@@ -629,7 +629,7 @@ var index = (project, base = "/") => {
           }
           next();
         });
-        let indexScripts;
+        let orchestratorScripts;
         let testerScripts;
         server.middlewares.use(async (req, res, next) => {
           if (!req.url)
@@ -648,9 +648,11 @@ var index = (project, base = "/") => {
             __VITEST_FILES__: JSON.stringify(files),
             __VITEST_TYPE__: url.pathname === base ? '"orchestrator"' : '"tester"'
           });
+          res.removeHeader("X-Frame-Options");
           if (url.pathname === base) {
-            if (!indexScripts)
-              indexScripts = await formatScripts(project.config.browser.indexScripts, server);
+            res.removeHeader("Content-Security-Policy");
+            if (!orchestratorScripts)
+              orchestratorScripts = await formatScripts(project.config.browser.orchestratorScripts, server);
             let baseHtml = await orchestratorHtml;
             if (project.config.browser.ui) {
               const manifestContent = await manifest;
@@ -667,13 +669,17 @@ var index = (project, base = "/") => {
             const html2 = replacer(baseHtml, {
               __VITEST_FAVICON__: favicon,
               __VITEST_TITLE__: "Vitest Browser Runner",
-              __VITEST_SCRIPTS__: indexScripts,
+              __VITEST_SCRIPTS__: orchestratorScripts,
               __VITEST_INJECTOR__: injector
             });
             res.write(html2, "utf-8");
             res.end();
             return;
           }
+          const csp = res.getHeader("Content-Security-Policy");
+          if (typeof csp === "string") {
+            res.setHeader("Content-Security-Policy", csp.replace(/frame-ancestors [^;]+/, "frame-ancestors *"));
+          }
           const decodedTestFile = decodeURIComponent(url.pathname.slice(testerPrefix.length));
           const testFiles = await project.globTestFiles();
           const tests = decodedTestFile === "__vitest_all__" || !testFiles.includes(decodedTestFile) ? "__vitest_browser_runner__.files" : JSON.stringify([decodedTestFile]);
@@ -721,20 +727,37 @@ var index = (project, base = "/") => {
       name: "vitest:browser:tests",
       enforce: "pre",
       async config() {
+        const allTestFiles = await project.globTestFiles();
+        const browserTestFiles = allTestFiles.filter((file) => getFilePoolName(project, file) === "browser");
+        const setupFiles = toArray(project.config.setupFiles);
+        const vitestPaths = [
+          resolve(distDir, "index.js"),
+          resolve(distDir, "browser.js"),
+          resolve(distDir, "runners.js"),
+          resolve(distDir, "utils.js")
+        ];
         return {
           optimizeDeps: {
+            entries: [
+              ...browserTestFiles,
+              ...setupFiles,
+              ...vitestPaths
+            ],
             exclude: [
               "vitest",
               "vitest/utils",
               "vitest/browser",
               "vitest/runners",
               "@vitest/utils",
+              "@vitest/runner",
+              "@vitest/spy",
+              "@vitest/utils/error",
+              "@vitest/snapshot",
+              "@vitest/expect",
               "std-env",
               "tinybench",
               "tinyspy",
-              "pathe",
-              // loupe is manually transformed
-              "loupe"
+              "pathe"
             ],
             include: [
               "vitest > @vitest/utils > pretty-format",
@@ -744,6 +767,7 @@ var index = (project, base = "/") => {
               "vitest > pretty-format > ansi-styles",
               "vitest > pretty-format > ansi-regex",
               "vitest > chai",
+              "vitest > chai > loupe",
               "vitest > @vitest/runner > p-limit",
               "vitest > @vitest/utils > diff-sequences",
               "@vitest/browser > @testing-library/user-event",
@@ -752,15 +776,6 @@ var index = (project, base = "/") => {
           }
         };
       },
-      transform(code, id) {
-        if (id.includes("loupe/loupe.js")) {
-          const exportsList = ["custom", "inspect", "registerConstructor", "registerStringTag"];
-          const codeAppend = exportsList.map((i) => `export const ${i} = globalThis.loupe.${i}`).join("\n");
-          return `${code}
-${codeAppend}
-export default globalThis.loupe`;
-        }
-      },
       async resolveId(id) {
         if (!/\?browserv=\w+$/.test(id))
           return;

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.9",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -47,7 +47,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "*",
-    "vitest": "2.0.0-beta.7"
+    "vitest": "2.0.0-beta.9"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -65,7 +65,7 @@
     "@testing-library/user-event": "^14.5.2",
     "magic-string": "^0.30.10",
     "sirv": "^2.0.4",
-    "@vitest/utils": "2.0.0-beta.7"
+    "@vitest/utils": "2.0.0-beta.9"
   },
   "devDependencies": {
     "@types/ws": "^8.5.10",
@@ -77,10 +77,10 @@
     "playwright-core": "^1.44.0",
     "safaridriver": "^0.1.2",
     "webdriverio": "^8.36.1",
-    "@vitest/ws-client": "2.0.0-beta.7",
-    "vitest": "2.0.0-beta.7",
-    "@vitest/runner": "2.0.0-beta.7",
-    "@vitest/ui": "2.0.0-beta.7"
+    "@vitest/runner": "2.0.0-beta.9",
+    "@vitest/ui": "2.0.0-beta.9",
+    "vitest": "2.0.0-beta.9",
+    "@vitest/ws-client": "2.0.0-beta.9"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",