webdriverio 9.5.4 → 9.5.7

package/build/index.js

@@ -3026,7 +3026,7 @@ var SessionManager = class {
     }
   }
   removeListeners() {
-    this.#browser.off("result", this.#onCommand.bind(this));
+    this.#browser.off("command", this.#onCommand.bind(this));
   }
   initialize() {
     return void 0;
@@ -3225,23 +3225,48 @@ var log5 = logger5("webdriverio:PolyfillManager");
 var NAME_POLYFILL = "var __defProp = Object.defineProperty;var __name = function (target, value) { return __defProp(target, 'name', { value: value, configurable: true }); };var __globalThis = (typeof globalThis === 'object' && globalThis) || (typeof window === 'object' && window);__globalThis.__name = __name;";
 var PolyfillManager = class _PolyfillManager extends SessionManager {
   #initialize;
+  #browser;
+  #scriptsRegisteredInContexts = /* @__PURE__ */ new Set();
   constructor(browser) {
     super(browser, _PolyfillManager.name);
+    this.#browser = browser;
     if (!this.isEnabled()) {
       this.#initialize = Promise.resolve(true);
       return;
     }
-    const polyfill = (polyfill2) => {
-      const closure = new Function(polyfill2);
-      return closure();
-    };
     this.#initialize = Promise.all([
-      browser.addInitScript(polyfill, NAME_POLYFILL),
-      browser.execute(polyfill, NAME_POLYFILL)
-    ]).then(() => {
-      log5.info("polyfill script added");
-      return true;
-    }, () => false);
+      this.#browser.browsingContextGetTree({}).then(({ contexts }) => {
+        return Promise.all(contexts.map((context) => this.#registerScripts(context)));
+      }),
+      this.#browser.sessionSubscribe({
+        events: ["browsingContext.contextCreated"]
+      })
+    ]).then(() => true, () => false);
+    this.#browser.on("browsingContext.contextCreated", this.#registerScripts.bind(this));
+  }
+  removeListeners() {
+    super.removeListeners();
+    this.#browser.off("browsingContext.contextCreated", this.#registerScripts.bind(this));
+  }
+  #registerScripts(context) {
+    if (this.#scriptsRegisteredInContexts.has(context.context)) {
+      return;
+    }
+    const functionDeclaration = `(() => {${NAME_POLYFILL}})()`;
+    log5.info(`Adding polyfill script to context with id ${context.context}`);
+    this.#scriptsRegisteredInContexts.add(context.context);
+    return Promise.all([
+      !context.parent ? this.#browser.scriptAddPreloadScript({
+        functionDeclaration,
+        contexts: [context.context]
+      }) : Promise.resolve(),
+      this.#browser.scriptCallFunction({
+        functionDeclaration,
+        target: context,
+        awaitPromise: false
+      }).catch(() => {
+      })
+    ]);
   }
   async initialize() {
     return this.#initialize;

package/build/session/polyfill.d.ts

@@ -1,5 +1,13 @@
 import { SessionManager } from './session.js';
 export declare function getPolyfillManager(browser: WebdriverIO.Browser): PolyfillManager;
+/**
+ * A polyfill to set `__name` to the global scope which is needed for WebdriverIO to properly
+ * execute custom (preload) scripts. When using `tsx` Esbuild runs some optimizations which
+ * assume that the file contains these global variables. This is a workaround until this issue
+ * is fixed.
+ *
+ * @see https://github.com/evanw/esbuild/issues/2605
+ */
 export declare const NAME_POLYFILL: string;
 /**
  * This class is responsible for setting polyfill scripts in the browser.
@@ -7,6 +15,7 @@ export declare const NAME_POLYFILL: string;
 export declare class PolyfillManager extends SessionManager {
     #private;
     constructor(browser: WebdriverIO.Browser);
+    removeListeners(): void;
     initialize(): Promise<boolean>;
 }
 //# sourceMappingURL=polyfill.d.ts.map

package/build/session/polyfill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polyfill.d.ts","sourceRoot":"","sources":["../../src/session/polyfill.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,mBAE9D;AAID,eAAO,MAAM,aAAa,QAKzB,CAAA;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,cAAc;;gBAGnC,OAAO,EAAE,WAAW,CAAC,OAAO;IAoClC,UAAU;CAGnB"}
+{"version":3,"file":"polyfill.d.ts","sourceRoot":"","sources":["../../src/session/polyfill.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,mBAE9D;AAID;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,QAKzB,CAAA;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,cAAc;;gBAKnC,OAAO,EAAE,WAAW,CAAC,OAAO;IA2BxC,eAAe;IAgCT,UAAU;CAGnB"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "9.5.4",
+  "version": "9.5.7",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -110,5 +110,5 @@
       "optional": true
     }
   },
-  "gitHead": "b4e5733841d26e9b3e29cac5630f9bb67e33e00e"
+  "gitHead": "a273d38d5724c27656fa6e8d7b8b79a716a9f00a"
 }