npm - @vitest/browser - Versions diffs - 1.0.0-beta.2 → 1.0.0-beta.4 - Mend

@vitest/browser 1.0.0-beta.2 → 1.0.0-beta.4

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-528f947f.css → index-575791d1.css} +1 -1
package/dist/client/__vitest__/assets/{index-14ea7095.js → index-877c8735.js} +21 -21
package/dist/client/__vitest__/index.html +2 -2
package/dist/client/__vitest_browser__/{index-a6988d73.js → index-cb73f258.js} +15 -4
package/dist/client/index.html +1 -1
package/dist/index.js +8 -11
package/dist/providers.js +172 -0
package/package.json +37 -8
package/providers/playwright.d.ts +8 -0
package/providers/webdriverio.d.ts +5 -0

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

@@ -17,8 +17,8 @@
       })()
     </script>
     <!-- !LOAD_METADATA! -->
-    <script type="module" crossorigin src="./assets/index-14ea7095.js"></script>
-    <link rel="stylesheet" href="./assets/index-528f947f.css">
+    <script type="module" crossorigin src="./assets/index-877c8735.js"></script>
+    <link rel="stylesheet" href="./assets/index-575791d1.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/client/__vitest_browser__/{index-a6988d73.js → index-cb73f258.js} RENAMED Viewed

@@ -674,8 +674,13 @@ function createBrowserRunner(original, coverageModule) {
       var _a, _b;
       await ((_a = super.onAfterRun) == null ? void 0 : _a.call(this));
       const coverage = await ((_b = coverageModule == null ? void 0 : coverageModule.takeCoverage) == null ? void 0 : _b.call(coverageModule));
-      if (coverage)
-        await rpc().onAfterSuiteRun({ coverage });
+      if (coverage) {
+        await rpc().onAfterSuiteRun({
+          coverage,
+          transformMode: "web",
+          projectName: this.config.name
+        });
+      }
     }
     onCollected(files) {
       return rpc().onCollected(files);
@@ -895,6 +900,8 @@ async function defaultErrorReport(type, unhandledError) {
     message: unhandledError.message,
     stack: unhandledError.stack
   };
+  if (testId !== "no-isolate")
+    error.VITEST_TEST_PATH = testId;
   await client.rpc.onUnhandledError(error, type);
   await client.rpc.onDone(testId);
 }
@@ -903,7 +910,10 @@ const stopRejectionHandler = on("unhandledrejection", (e) => defaultErrorReport(
 let runningTests = false;
 async function reportUnexpectedError(rpc2, type, error) {
   const { processError } = await importId("vitest/browser");
-  await rpc2.onUnhandledError(processError(error), type);
+  const processedError = processError(error);
+  if (testId !== "no-isolate")
+    error.VITEST_TEST_PATH = testId;
+  await rpc2.onUnhandledError(processedError, type);
   if (!runningTests)
     await rpc2.onDone(testId);
 }
@@ -929,7 +939,8 @@ ws.addEventListener("open", async () => {
     durations: {
       environment: 0,
       prepare: 0
-    }
+    },
+    providedContext: await client.rpc.getProvidedContext()
   };
   globalThis.__vitest_mocker__ = new VitestBrowserClientMocker();
   const paths = getQueryPaths();

package/dist/client/index.html CHANGED Viewed

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

package/dist/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { fileURLToPath } from 'url';
-import { resolve } from 'path';
-import { builtinModules } from 'module';
+import { fileURLToPath } from 'node:url';
+import { resolve } from 'node:path';
+import { builtinModules } from 'node:module';
 import sirv from 'sirv';
 import MagicString from 'magic-string';
 import { walk } from 'estree-walker';
@@ -93,10 +93,7 @@ function esmWalker(root, { onIdentifier, onImportMeta, onDynamicImport }) {
     scopeIds.add(name);
   };
   function isInScope(name, parents) {
-    return parents.some((node) => {
-      var _a;
-      return node && ((_a = scopeMap.get(node)) == null ? void 0 : _a.has(name));
-    });
+    return parents.some((node) => node && scopeMap.get(node)?.has(name));
   }
   function handlePattern(p, parentScope) {
     if (p.type === "Identifier") {
@@ -150,13 +147,13 @@ function esmWalker(root, { onIdentifier, onImportMeta, onDynamicImport }) {
           }
           walk(p.type === "AssignmentPattern" ? p.left : p, {
             enter(child, parent2) {
-              if ((parent2 == null ? void 0 : parent2.type) === "AssignmentPattern" && (parent2 == null ? void 0 : parent2.right) === child)
+              if (parent2?.type === "AssignmentPattern" && parent2?.right === child)
                 return this.skip();
               if (child.type !== "Identifier")
                 return;
               if (isStaticPropertyKey(child, parent2))
                 return;
-              if ((parent2 == null ? void 0 : parent2.type) === "TemplateLiteral" && (parent2 == null ? void 0 : parent2.expressions.includes(child)) || (parent2 == null ? void 0 : parent2.type) === "CallExpression" && (parent2 == null ? void 0 : parent2.callee) === child)
+              if (parent2?.type === "TemplateLiteral" && parent2?.expressions.includes(child) || parent2?.type === "CallExpression" && parent2?.callee === child)
                 return;
               setScope(node, child.name);
             }
@@ -398,7 +395,7 @@ export default { ${viInjectedKey}: ${viInjectedKey}.default };
       if (isStaticProperty(parent) && parent.shorthand) {
         if (!isNodeInPattern(parent) || isInDestructuringAssignment(parent, parentStack))
           s.appendLeft(id2.end, `: ${binding}`);
-      } else if (parent.type === "PropertyDefinition" && (grandparent == null ? void 0 : grandparent.type) === "ClassBody" || parent.type === "ClassDeclaration" && id2 === parent.superClass) {
+      } else if (parent.type === "PropertyDefinition" && grandparent?.type === "ClassBody" || parent.type === "ClassDeclaration" && id2 === parent.superClass) {
         if (!declaredConst.has(id2.name)) {
           declaredConst.add(id2.name);
           const topNode = parentStack[parentStack.length - 2];
@@ -443,7 +440,7 @@ var index = (project, base = "/") => {
       name: "vitest:browser",
       async config(viteConfig) {
         // Enables using ignore hint for coverage providers with @preserve keyword
-        viteConfig.esbuild || (viteConfig.esbuild = {});
+        viteConfig.esbuild ||= {};
         viteConfig.esbuild.legalComments = "inline";
       },
       async configureServer(server) {

package/dist/providers.js ADDED Viewed

@@ -0,0 +1,172 @@
+import { ensurePackageInstalled } from 'vitest/node';
+const playwrightBrowsers = ["firefox", "webkit", "chromium"];
+class PlaywrightBrowserProvider {
+  name = "playwright";
+  cachedBrowser = null;
+  cachedPage = null;
+  browser;
+  ctx;
+  options;
+  getSupportedBrowsers() {
+    return playwrightBrowsers;
+  }
+  async initialize(ctx, { browser, options }) {
+    this.ctx = ctx;
+    this.browser = browser;
+    this.options = options;
+    const root = this.ctx.config.root;
+    if (!await ensurePackageInstalled("playwright", root))
+      throw new Error('Cannot find "playwright" package. Please install it manually.');
+  }
+  async openBrowserPage() {
+    if (this.cachedPage)
+      return this.cachedPage;
+    const options = this.ctx.config.browser;
+    const playwright = await import('playwright');
+    const browser = await playwright[this.browser].launch({
+      ...this.options?.launch,
+      headless: options.headless
+    });
+    this.cachedBrowser = browser;
+    this.cachedPage = await browser.newPage(this.options?.page);
+    this.cachedPage.on("close", () => {
+      browser.close();
+    });
+    return this.cachedPage;
+  }
+  catchError(cb) {
+    this.cachedPage?.on("pageerror", cb);
+    return () => {
+      this.cachedPage?.off("pageerror", cb);
+    };
+  }
+  async openPage(url) {
+    const browserPage = await this.openBrowserPage();
+    await browserPage.goto(url);
+  }
+  async close() {
+    await this.cachedPage?.close();
+    await this.cachedBrowser?.close();
+  }
+}
+const webdriverBrowsers = ["firefox", "chrome", "edge", "safari"];
+class WebdriverBrowserProvider {
+  name = "webdriverio";
+  cachedBrowser = null;
+  stopSafari = () => {
+  };
+  browser;
+  ctx;
+  options;
+  getSupportedBrowsers() {
+    return webdriverBrowsers;
+  }
+  async initialize(ctx, { browser, options }) {
+    this.ctx = ctx;
+    this.browser = browser;
+    this.options = options;
+    const root = this.ctx.config.root;
+    if (!await ensurePackageInstalled("webdriverio", root))
+      throw new Error('Cannot find "webdriverio" package. Please install it manually.');
+    if (browser === "safari" && !await ensurePackageInstalled("safaridriver", root))
+      throw new Error('Cannot find "safaridriver" package. Please install it manually.');
+  }
+  async openBrowser() {
+    if (this.cachedBrowser)
+      return this.cachedBrowser;
+    const options = this.ctx.config.browser;
+    if (this.browser === "safari") {
+      if (options.headless)
+        throw new Error("You've enabled headless mode for Safari but it doesn't currently support it.");
+      const safaridriver = await import('safaridriver');
+      safaridriver.start({ diagnose: true });
+      this.stopSafari = () => safaridriver.stop();
+      process.on("beforeExit", () => {
+        safaridriver.stop();
+      });
+    }
+    const { remote } = await import('webdriverio');
+    this.cachedBrowser = await remote({
+      ...this.options,
+      logLevel: "error",
+      capabilities: this.buildCapabilities()
+    });
+    return this.cachedBrowser;
+  }
+  buildCapabilities() {
+    const capabilities = {
+      ...this.options?.capabilities,
+      browserName: this.browser
+    };
+    const headlessMap = {
+      chrome: ["goog:chromeOptions", ["headless", "disable-gpu"]],
+      firefox: ["moz:firefoxOptions", ["-headless"]],
+      edge: ["ms:edgeOptions", ["--headless"]]
+    };
+    const options = this.ctx.config.browser;
+    const browser = this.browser;
+    if (browser !== "safari" && options.headless) {
+      const [key, args] = headlessMap[browser];
+      const currentValues = this.options?.capabilities?.[key] || {};
+      const newArgs = [...currentValues.args || [], ...args];
+      capabilities[key] = { ...currentValues, args: newArgs };
+    }
+    return capabilities;
+  }
+  async openPage(url) {
+    const browserInstance = await this.openBrowser();
+    await browserInstance.url(url);
+  }
+  // TODO
+  catchError(_cb) {
+    return () => {
+    };
+  }
+  async close() {
+    await Promise.all([
+      this.stopSafari(),
+      this.cachedBrowser?.sessionId ? this.cachedBrowser?.deleteSession?.() : null
+    ]);
+    process.exit();
+  }
+}
+class NoneBrowserProvider {
+  name = "none";
+  ctx;
+  open = false;
+  getSupportedBrowsers() {
+    return [];
+  }
+  isOpen() {
+    return this.open;
+  }
+  async initialize(ctx) {
+    this.ctx = ctx;
+    this.open = false;
+  }
+  catchError(_cb) {
+    return () => {
+    };
+  }
+  async openPage(_url) {
+    this.open = true;
+    if (!this.ctx.browser)
+      throw new Error("Browser is not initialized");
+    const options = this.ctx.browser.config.server;
+    const _open = options.open;
+    options.open = _url;
+    this.ctx.browser.openBrowser();
+    options.open = _open;
+  }
+  async close() {
+  }
+}
+const webdriverio = WebdriverBrowserProvider;
+const playwright = PlaywrightBrowserProvider;
+const none = NoneBrowserProvider;
+export { none, playwright, webdriverio };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -20,6 +20,16 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
+    "./providers": {
+      "types": "./providers.d.ts",
+      "import": "./dist/providers.js"
+    },
+    "./providers/webdriverio": {
+      "types": "./dist/providers/webdriverio.d.ts"
+    },
+    "./providers/playwright": {
+      "types": "./dist/providers/playwright.d.ts"
+    },
     "./*": "./*"
   },
   "main": "./dist/index.js",
@@ -27,24 +37,43 @@
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
-    "stubs"
+    "providers"
   ],
   "peerDependencies": {
-    "vitest": ">=0.34.0"
+    "playwright": "*",
+    "safaridriver": "*",
+    "vitest": "^1.0.0-0",
+    "webdriverio": "*"
+  },
+  "peerDependenciesMeta": {
+    "webdriverio": {
+      "optional": true
+    },
+    "safaridriver": {
+      "optional": true
+    },
+    "playwright": {
+      "optional": true
+    }
   },
   "dependencies": {
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.4",
+    "magic-string": "^0.30.5",
     "sirv": "^2.0.3"
   },
   "devDependencies": {
     "@types/estree": "^1.0.1",
     "@types/ws": "^8.5.5",
+    "@wdio/protocols": "^8.18.0",
     "periscopic": "^3.1.0",
-    "@vitest/runner": "1.0.0-beta.2",
-    "@vitest/ui": "1.0.0-beta.2",
-    "vitest": "1.0.0-beta.2",
-    "@vitest/ws-client": "1.0.0-beta.2"
+    "playwright": "^1.39.0",
+    "playwright-core": "^1.39.0",
+    "safaridriver": "^0.1.0",
+    "webdriverio": "^8.20.0",
+    "@vitest/runner": "1.0.0-beta.4",
+    "@vitest/ui": "1.0.0-beta.4",
+    "@vitest/ws-client": "1.0.0-beta.4",
+    "vitest": "1.0.0-beta.4"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/providers/playwright.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import type { Browser, LaunchOptions } from 'playwright'
+declare module 'vitest/node' {
+  interface BrowserProviderOptions {
+    launch?: LaunchOptions
+    page?: Parameters<Browser['newPage']>[0]
+  }
+}

package/providers/webdriverio.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import type { RemoteOptions } from 'webdriverio'
+declare module 'vitest/node' {
+  interface BrowserProviderOptions extends RemoteOptions {}
+}