@wdio/utils 9.28.0 → 9.29.0

package/build/node/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/node/manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AA4GxD,wBAAsB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,kCAqB7H;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,kCAsBxH"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/node/manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AA0GxD,wBAAsB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,kCAc7H;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,kCAsBxH"}

package/build/node/startWebDriver.d.ts

@@ -1,8 +1,8 @@
 import cp from 'node:child_process';
 import { type SafaridriverOptions as SafaridriverParameters } from 'safaridriver';
 import { type GeckodriverParameters } from 'geckodriver';
-import { type EdgedriverParameters } from 'edgedriver';
 import type { InstallOptions } from '@puppeteer/browsers';
+import type { EdgedriverParameters } from 'edgedriver';
 import type { Capabilities } from '@wdio/types';
 export type ChromedriverParameters = (Partial<InstallOptions> & Omit<EdgedriverParameters, 'port' | 'edgeDriverVersion' | 'customEdgeDriverPath'> & Pick<GeckodriverParameters, 'spawnOpts'>);
 declare global {

package/build/node/startWebDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startWebDriver.d.ts","sourceRoot":"","sources":["../../src/node/startWebDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAQ1D,OAAO,EAA8B,KAAK,mBAAmB,IAAI,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA0C,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM/C,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,CAAC,cAAc,CAAC,GACvB,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,GACjF,IAAI,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAC3C,CAAA;AACD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,mBAAoB,SAAQ,sBAAsB;SAAI;QAChE,UAAU,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC;SAAI;QAC5E,UAAU,iBAAkB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;SAAI;QAC1E,UAAU,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;SAAI;KACjF;CACJ;AAMD,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,YAAY,wCA+LtE"}
+{"version":3,"file":"startWebDriver.d.ts","sourceRoot":"","sources":["../../src/node/startWebDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAQ1D,OAAO,EAA8B,KAAK,mBAAmB,IAAI,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM/C,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,CAAC,cAAc,CAAC,GACvB,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,GACjF,IAAI,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAC3C,CAAA;AACD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,mBAAoB,SAAQ,sBAAsB;SAAI;QAChE,UAAU,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC;SAAI;QAC5E,UAAU,iBAAkB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;SAAI;QAC1E,UAAU,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;SAAI;KACjF;CACJ;AAMD,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,YAAY,wCAiMtE"}

package/build/node/utils.d.ts

@@ -1,5 +1,7 @@
 import type { EdgedriverParameters } from 'edgedriver';
 import type { Options } from '@wdio/types';
+export declare const DEFAULT_EDGEDRIVER_CDN_URL = "https://msedgedriver.microsoft.com";
+export declare function setDefaultEdgedriverCdnUrl(): void;
 /**
  * Helper utility to check file access
  * @param {string} file file to check access for

package/build/node/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/node/utils.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAK1C;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,YAWtC,CAAA;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,sBA6BzD;AAED,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,MAAM,+BAyBjE;AAGD,eAAO,MAAM,wBAAwB,GAAI,UAAU,MAAM,EAAE,iBAAiB,MAAM,EAAE,YAAY,MAAM,SAOrG,CAAA;AAgCD,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;GA4G3F;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,CAAC,YAAY,oGAS/D;AAED,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY,UAGxG;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAC,MAAM,UAM3D;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GAgDhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAgB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAExE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;EAIlE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/node/utils.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAG9E,wBAAgB,0BAA0B,SAKzC;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,YAWtC,CAAA;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,sBA6BzD;AAED,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,MAAM,+BAyBjE;AAGD,eAAO,MAAM,wBAAwB,GAAI,UAAU,MAAM,EAAE,iBAAiB,MAAM,EAAE,YAAY,MAAM,SAOrG,CAAA;AAgCD,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;GA4G3F;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,CAAC,YAAY,oGAS/D;AAED,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY,UAGxG;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAC,MAAM,UAM3D;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GAgDhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAsB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAI9E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;EAIlE"}

package/build/node.js

@@ -10,7 +10,6 @@ import split2 from "split2";
 import { deepmerge } from "deepmerge-ts";
 import { start as startSafaridriver } from "safaridriver";
 import { start as startGeckodriver } from "geckodriver";
-import { start as startEdgedriver, findEdgePath } from "edgedriver";
 
 // src/node/utils.ts
 import os from "node:os";
@@ -30,10 +29,17 @@ import {
   computeExecutablePath
 } from "@puppeteer/browsers";
 import { download as downloadGeckodriver } from "geckodriver";
-import { download as downloadEdgedriver } from "edgedriver";
 import { locateChrome, locateFirefox, locateApp } from "locate-app";
 var log = logger("webdriver");
 var EXCLUDED_PARAMS = ["version", "help"];
+var DEFAULT_EDGEDRIVER_CDN_URL = "https://msedgedriver.microsoft.com";
+var LEGACY_EDGEDRIVER_CDN_URL = "https://msedgedriver.azureedge.net";
+function setDefaultEdgedriverCdnUrl() {
+  const edgedriverCdnUrl = process.env.EDGEDRIVER_CDNURL?.replace(/\/+$/, "");
+  if (!edgedriverCdnUrl || edgedriverCdnUrl === LEGACY_EDGEDRIVER_CDN_URL) {
+    process.env.EDGEDRIVER_CDNURL = DEFAULT_EDGEDRIVER_CDN_URL;
+  }
+}
 var canAccess = (file) => {
   if (!file) {
     return false;
@@ -248,7 +254,9 @@ async function setupChromedriver(cacheDir, driverVersion) {
 function setupGeckodriver(cacheDir, driverVersion) {
   return downloadGeckodriver(driverVersion, cacheDir);
 }
-function setupEdgedriver(cacheDir, driverVersion) {
+async function setupEdgedriver(cacheDir, driverVersion) {
+  setDefaultEdgedriverCdnUrl();
+  const { download: downloadEdgedriver } = await import("edgedriver");
   return downloadEdgedriver(driverVersion, cacheDir);
 }
 function generateDefaultPrefs(caps) {
@@ -385,6 +393,8 @@ If you like to run a local browser session make sure to pick from one of the fol
     if (binary) {
       edgedriverOptions.customEdgeDriverPath = binary;
     }
+    setDefaultEdgedriverCdnUrl();
+    const { start: startEdgedriver, findEdgePath } = await import("edgedriver");
     driver = "EdgeDriver";
     driverProcess = await startEdgedriver({ ...edgedriverOptions, cacheDir, port, allowedIps: ["0.0.0.0"] }).catch((err) => {
       log2.warn(`Couldn't start EdgeDriver: ${err.message}, retry ...`);
@@ -426,7 +436,6 @@ If you like to run a local browser session make sure to pick from one of the fol
 import logger3 from "@wdio/logger";
 var log3 = logger3("@wdio/utils");
 var UNDEFINED_BROWSER_VERSION = null;
-var firefoxChannels = ["stable", "latest"];
 function mapCapabilities(options, caps, task, taskItemLabel) {
   const capabilitiesToRequireSetup = (Array.isArray(caps) ? caps.map((cap) => {
     const w3cCaps = cap;
@@ -489,8 +498,8 @@ async function setupDriver(options, caps) {
     if (isEdge(cap.browserName)) {
       return setupEdgedriver(cacheDir, cap.browserVersion);
     } else if (isFirefox(cap.browserName)) {
-      const version = firefoxChannels.includes(cap.browserVersion ?? "") ? void 0 : cap.browserVersion;
-      return setupGeckodriver(cacheDir, version);
+      const driverVersion = cap["wdio:geckodriverOptions"]?.geckoDriverVersion;
+      return setupGeckodriver(cacheDir, driverVersion);
     } else if (isChrome(cap.browserName)) {
       return setupChromedriver(cacheDir, cap.browserVersion);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "9.28.0",
+  "version": "9.29.0",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@puppeteer/browsers": "^2.2.0",
     "@wdio/logger": "9.18.0",
-    "@wdio/types": "9.28.0",
+    "@wdio/types": "9.29.0",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^7.0.3",
     "edgedriver": "^6.1.2",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "66baa0049385cd9161677e1e6728fde90db56f35"
+  "gitHead": "c7808c59ca3ab6a677230cebd688454426cba0f2"
 }