webdriverio 7.20.7 → 7.20.8-alpha.504

package/build/utils/interception/devtools.js

@@ -1,16 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const logger_1 = __importDefault(require("@wdio/logger"));
-const _1 = __importDefault(require("."));
-const __1 = require("..");
-const constants_1 = require("../../constants");
-const log = (0, logger_1.default)('webdriverio');
-class DevtoolsInterception extends _1.default {
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import logger from '@wdio/logger';
+import Interception from './index.js';
+import { containsHeaderObject } from '../index.js';
+import { ERROR_REASON } from '../../constants.js';
+const log = logger('webdriverio');
+export default class DevtoolsInterception extends Interception {
     static handleRequestInterception(client, mocks) {
         return async (event) => {
             // responseHeaders and responseStatusCode are only present in Response stage
@@ -36,7 +31,7 @@ class DevtoolsInterception extends _1.default {
                 /**
                  * match mock url
                  */
-                if (!_1.default.isMatchingRequest(mock.url, request.url)) {
+                if (!Interception.isMatchingRequest(mock.url, request.url)) {
                     continue;
                 }
                 /**
@@ -94,9 +89,10 @@ class DevtoolsInterception extends _1.default {
                     /**
                      * check if local file and load it
                      */
-                    const responseFilePath = path_1.default.isAbsolute(newBody) ? newBody : path_1.default.join(process.cwd(), newBody);
-                    if (newBody.length > 0 && await fs_extra_1.default.pathExists(responseFilePath) && await canAccess(responseFilePath)) {
-                        newBody = await fs_extra_1.default.readFile(responseFilePath);
+                    const responseFilePath = path.isAbsolute(newBody) ? newBody : path.join(process.cwd(), newBody);
+                    const responseFileAccessible = await fs.access(responseFilePath).then(() => true, () => false);
+                    if (newBody.length > 0 && responseFileAccessible) {
+                        newBody = (await fs.readFile(responseFilePath));
                     }
                     else if (newBody.startsWith('http')) {
                         responseCode = 301;
@@ -169,8 +165,8 @@ class DevtoolsInterception extends _1.default {
      * @param {string} errorCode  error code of the response
      */
     abort(errorReason, sticky = true) {
-        if (typeof errorReason !== 'string' || !constants_1.ERROR_REASON.includes(errorReason)) {
-            throw new Error(`Invalid value for errorReason, allowed are: ${constants_1.ERROR_REASON.join(', ')}`);
+        if (typeof errorReason !== 'string' || !ERROR_REASON.includes(errorReason)) {
+            throw new Error(`Invalid value for errorReason, allowed are: ${ERROR_REASON.join(', ')}`);
         }
         this.respondOverwrites.push({ errorReason, sticky });
     }
@@ -182,7 +178,6 @@ class DevtoolsInterception extends _1.default {
         this.abort(errorReason, false);
     }
 }
-exports.default = DevtoolsInterception;
 const filterMethod = (method, expected) => {
     if (typeof expected === 'undefined') {
         return false;
@@ -199,7 +194,7 @@ const filterHeaders = (responseHeaders, expected) => {
     if (typeof expected === 'function') {
         return expected(responseHeaders) !== true;
     }
-    return !(0, __1.containsHeaderObject)(responseHeaders, expected);
+    return !containsHeaderObject(responseHeaders, expected);
 };
 const filterRequest = (postData, expected) => {
     if (typeof expected === 'undefined') {
@@ -219,20 +214,6 @@ const filterStatusCode = (statusCode, expected) => {
     }
     return statusCode !== expected;
 };
-/**
- * Helper utility to check file access
- * @param {String} file file to check access for
- * @return              Promise<true> if file can be accessed
- */
-const canAccess = async (filepath) => {
-    try {
-        await fs_extra_1.default.access(filepath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-};
 const tryParseJson = (body) => {
     try {
         return JSON.parse(body) || body;
@@ -243,5 +224,5 @@ const tryParseJson = (body) => {
 };
 const logFetchError = (err) => {
     /* istanbul ignore next */
-    log.debug(err === null || err === void 0 ? void 0 : err.message);
+    log.debug(err?.message);
 };

package/build/utils/interception/index.d.ts

@@ -1,5 +1,5 @@
-import { WaitForOptions } from '../../types';
-import { MockFilterOptions, MockOverwrite, MockResponseParams, Matches } from './types';
+import type { WaitForOptions } from '../../types';
+import type { MockFilterOptions, MockOverwrite, MockResponseParams, Matches } from './types';
 import type Protocol from 'devtools-protocol';
 export default abstract class Interception {
     url: string | RegExp;

package/build/utils/interception/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEvF,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAE7C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,YAAY;IAkB3B,GAAG,EAAE,MAAM,GAAG,MAAM;IACpB,aAAa,EAAE,iBAAiB;IAChC,OAAO,EAAE,WAAW,CAAC,OAAO;IAnBvC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,QAAQ,CAAC,KAAK,IAAK,IAAI;IACvB,QAAQ,CAAC,OAAO,IAAK,IAAI;IACzB,QAAQ,CAAC,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAC7E,QAAQ,CAAC,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IACjF,QAAQ,CAAC,KAAK,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IACjF,QAAQ,CAAC,SAAS,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI;IAEpE,iBAAiB,EAAE;QACf,SAAS,CAAC,EAAE,aAAa,CAAA;QACzB,MAAM,CAAC,EAAE,kBAAkB,CAAA;QAC3B,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,WAAW,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAA;KAC7C,EAAE,CAAK;IACR,OAAO,EAAE,OAAO,EAAE,CAAK;gBAGZ,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,aAAa,EAAE,iBAAsB,EACrC,OAAO,EAAE,WAAW,CAAC,OAAO;IAIvC,eAAe,CAAE,EACb,OAA6C,EAC7C,QAA+C,EAC/C,UAAU,GACb,GAAE,cAAmB;IA4BtB,MAAM,CAAC,iBAAiB,CAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM;CAU5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAE5F,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAE7C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,YAAY;IAkB3B,GAAG,EAAE,MAAM,GAAG,MAAM;IACpB,aAAa,EAAE,iBAAiB;IAChC,OAAO,EAAE,WAAW,CAAC,OAAO;IAnBvC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,QAAQ,CAAC,KAAK,IAAK,IAAI;IACvB,QAAQ,CAAC,OAAO,IAAK,IAAI;IACzB,QAAQ,CAAC,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAC7E,QAAQ,CAAC,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IACjF,QAAQ,CAAC,KAAK,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IACjF,QAAQ,CAAC,SAAS,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI;IAEpE,iBAAiB,EAAE;QACf,SAAS,CAAC,EAAE,aAAa,CAAA;QACzB,MAAM,CAAC,EAAE,kBAAkB,CAAA;QAC3B,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,WAAW,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAA;KAC7C,EAAE,CAAK;IACR,OAAO,EAAE,OAAO,EAAE,CAAK;gBAGZ,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,aAAa,EAAE,iBAAsB,EACrC,OAAO,EAAE,WAAW,CAAC,OAAO;IAIvC,eAAe,CAAE,EACb,OAA6C,EAC7C,QAA+C,EAC/C,UAAU,GACb,GAAE,cAAmB;IA4BtB,MAAM,CAAC,iBAAiB,CAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM;CAU5E"}

package/build/utils/interception/index.js

@@ -1,17 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const minimatch_1 = __importDefault(require("minimatch"));
-const Timer_1 = __importDefault(require("../Timer"));
-class Interception {
+import minimatch from 'minimatch';
+import Timer from '../Timer.js';
+export default class Interception {
+    url;
+    filterOptions;
+    browser;
+    respondOverwrites = [];
+    matches = [];
     constructor(url, filterOptions = {}, browser) {
         this.url = url;
         this.filterOptions = filterOptions;
         this.browser = browser;
-        this.respondOverwrites = [];
-        this.matches = [];
     }
     waitForResponse({ timeout = this.browser.options.waitforTimeout, interval = this.browser.options.waitforInterval, timeoutMsg, } = {}) {
         /*!
@@ -25,7 +23,7 @@ class Interception {
         }
         /* istanbul ignore next */
         const fn = async () => this.calls && (await this.calls).length > 0;
-        const timer = new Timer_1.default(interval, timeout, fn, true);
+        const timer = new Timer(interval, timeout, fn, true);
         return this.browser.call(() => timer.catch((e) => {
             if (e.message === 'timeout') {
                 if (typeof timeoutMsg === 'string') {
@@ -38,7 +36,7 @@ class Interception {
     }
     static isMatchingRequest(expectedUrl, actualUrl) {
         if (typeof expectedUrl === 'string') {
-            return (0, minimatch_1.default)(actualUrl, expectedUrl);
+            return minimatch(actualUrl, expectedUrl);
         }
         if (expectedUrl instanceof RegExp) {
             return Boolean(actualUrl.match(expectedUrl));
@@ -46,4 +44,3 @@ class Interception {
         throw new Error(`Unexpected type for mock url: ${expectedUrl}`);
     }
 }
-exports.default = Interception;

package/build/utils/interception/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { CDPSession } from 'puppeteer-core/lib/cjs/puppeteer/common/Connection';
-import { JsonCompatible } from '@wdio/types';
+import type { JsonCompatible } from '@wdio/types';
 /**
  * HTTP request data. (copied from the puppeteer-core package as there is currently
  * no way to access these types otherwise)

package/build/utils/interception/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/types.ts"],"names":[],"mappings":"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"}

package/build/utils/interception/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/build/utils/interception/webdriver.d.ts

@@ -1,4 +1,4 @@
-import Interception from '.';
+import Interception from './index.js';
 import type { Matches, MockResponseParams, MockOverwrite } from './types';
 /**
  * Network interception class based on a WebDriver compliant endpoint.

package/build/utils/interception/webdriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webdriver.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/webdriver.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,GAAG,CAAA;AAE5B,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEzE;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,YAAY;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAA;IAET,IAAI;IAQV;;OAEG;IACH,IAAI,KAAK,mCAIR;IAED;;OAEG;IACH,KAAK;IAKL;;;OAGG;IACH,OAAO;IAKP;;;;OAIG;IACH,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IASlE;;;;OAIG;IACH,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IAStE;;;OAGG;IACH,KAAK,CAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAE,OAAc;IAYlD;;;OAGG;IACH,SAAS,CAAE,WAAW,EAAE,MAAM;CAGjC"}
+{"version":3,"file":"webdriver.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/webdriver.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,YAAY,CAAA;AAErC,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEzE;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,YAAY;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAA;IAET,IAAI;IAQV;;OAEG;IACH,IAAI,KAAK,mCAIR;IAED;;OAEG;IACH,KAAK;IAKL;;;OAGG;IACH,OAAO;IAKP;;;;OAIG;IACH,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IASlE;;;;OAIG;IACH,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IAStE;;;OAGG;IACH,KAAK,CAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAE,OAAc;IAYlD;;;OAGG;IACH,SAAS,CAAE,WAAW,EAAE,MAAM;CAGjC"}

package/build/utils/interception/webdriver.js

@@ -1,17 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = __importDefault(require("."));
-const constants_1 = require("../../constants");
+import Interception from './index.js';
+import { ERROR_REASON } from '../../constants.js';
 /**
  * Network interception class based on a WebDriver compliant endpoint.
  * Instead of directly using the CDP with Puppeteer this version of the
  * class uses a WebDriver extension to trigger the same behavior on a
  * compliant backend.
  */
-class WebDriverInterception extends _1.default {
+export default class WebDriverInterception extends Interception {
+    mockId;
     async init() {
         if (this.url instanceof RegExp) {
             throw new Error('Regular Expressions as mock url are not supported');
@@ -59,8 +55,8 @@ class WebDriverInterception extends _1.default {
      * @param {string} errorCode  error code of the response
      */
     abort(errorReason, sticky = true) {
-        if (typeof errorReason !== 'string' || !constants_1.ERROR_REASON.includes(errorReason)) {
-            throw new Error(`Invalid value for errorReason, allowed are: ${constants_1.ERROR_REASON.join(', ')}`);
+        if (typeof errorReason !== 'string' || !ERROR_REASON.includes(errorReason)) {
+            throw new Error(`Invalid value for errorReason, allowed are: ${ERROR_REASON.join(', ')}`);
         }
         return this.browser.call(async () => this.browser.respondMock(this.mockId, { errorReason, sticky }));
     }
@@ -72,4 +68,3 @@ class WebDriverInterception extends _1.default {
         return this.abort(errorReason, false);
     }
 }
-exports.default = WebDriverInterception;

package/build/utils/refetchElement.js

@@ -1,14 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const implicitWait_1 = __importDefault(require("./implicitWait"));
+import implicitWait from './implicitWait.js';
 /**
  * helper utility to refetch an element and all its parent elements when running
  * into stale element exception errors
  */
-async function refetchElement(currentElement, commandName) {
+export default async function refetchElement(currentElement, commandName) {
     let selectors = [];
     //Crawl back to the browser object, and cache all selectors
     while (currentElement.elementId && currentElement.parent) {
@@ -26,7 +21,6 @@ async function refetchElement(currentElement, commandName) {
          *  For error purposes, changing command name to '$' if we aren't
          *  on the last element of the array
          */
-        return await (0, implicitWait_1.default)(nextElement, currentIndex + 1 < length ? '$' : commandName);
+        return await implicitWait(nextElement, currentIndex + 1 < length ? '$' : commandName);
     }, Promise.resolve(currentElement));
 }
-exports.default = refetchElement;

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "7.20.7",
+  "version": "7.20.8-alpha.504+428a9d729",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
-  "main": "./build/index.js",
   "repository": {
     "type": "git",
-    "url": "git://github.com/webdriverio/webdriverio.git"
+    "url": "git://github.com/webdriverio/webdriverio.git",
+    "directory": "packages/webdriverio"
   },
   "bugs": {
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": "^16.13 || >=18"
   },
   "tags": [
     "webdriver",
@@ -44,11 +44,22 @@
     "cucumber",
     "testingbot"
   ],
+  "main": "./build/cjs/index.js",
+  "type": "module",
+  "module": "./build/index.js",
+  "exports": {
+    ".": [
+      {
+        "import": "./build/index.js",
+        "require": "./build/cjs/index.js"
+      },
+      "./build/cjs/index.js"
+    ]
+  },
   "types": "./build/index.d.ts",
   "typeScriptVersion": "3.8.3",
   "devDependencies": {
     "@types/archiver": "^5.1.0",
-    "@types/fs-extra": "^9.0.2",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.isobject": "^3.0.6",
     "@types/lodash.isplainobject": "^4.0.6",
@@ -57,31 +68,30 @@
   "dependencies": {
     "@types/aria-query": "^5.0.0",
     "@types/node": "^18.0.0",
-    "@wdio/config": "7.20.7",
-    "@wdio/logger": "7.19.0",
-    "@wdio/protocols": "7.20.6",
-    "@wdio/repl": "7.20.7",
-    "@wdio/types": "7.20.7",
-    "@wdio/utils": "7.20.7",
+    "@wdio/config": "7.20.8-alpha.504+428a9d729",
+    "@wdio/logger": "7.20.8-alpha.504+428a9d729",
+    "@wdio/protocols": "7.20.8-alpha.504+428a9d729",
+    "@wdio/repl": "7.20.8-alpha.504+428a9d729",
+    "@wdio/types": "7.20.8-alpha.504+428a9d729",
+    "@wdio/utils": "7.20.8-alpha.504+428a9d729",
     "archiver": "^5.0.0",
     "aria-query": "^5.0.0",
     "css-shorthand-properties": "^1.1.1",
     "css-value": "^0.0.1",
-    "devtools": "7.20.7",
-    "devtools-protocol": "^0.0.1022601",
-    "fs-extra": "^10.0.0",
+    "devtools": "7.20.8-alpha.504+428a9d729",
+    "devtools-protocol": "^0.0.1065144",
     "grapheme-splitter": "^1.0.2",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isobject": "^3.0.2",
     "lodash.isplainobject": "^4.0.6",
     "lodash.zip": "^4.2.0",
     "minimatch": "^5.0.0",
-    "puppeteer-core": "^13.1.3",
+    "puppeteer-core": "19.2.0",
     "query-selector-shadow-dom": "^1.0.0",
     "resq": "^1.9.1",
     "rgb2hex": "0.2.5",
     "serialize-error": "^8.0.0",
-    "webdriver": "7.20.7"
+    "webdriver": "7.20.8-alpha.504+428a9d729"
   },
-  "gitHead": "21b8b61453f4749d87eca3e4d7d6e5e2cb60f043"
+  "gitHead": "428a9d729ae6231968a60908732fa3f607d195e9"
 }

package/async.d.ts

@@ -1,24 +0,0 @@
-type BrowserSync = import('./build/types').Browser<'async'>
-type ElementSync = import('./build/types').Element<'async'>
-type MultiRemoteBrowserAsync = import('./build/types').MultiRemoteBrowser<'async'>
-type ElementArrayImport = import('./build/types').ElementArray
-
-declare namespace WebdriverIOAsync {
-    interface Browser {}
-    interface Element {}
-    interface MultiRemoteBrowser {}
-}
-
-declare namespace WebdriverIO {
-    interface Browser extends BrowserSync, WebdriverIOAsync.Browser { }
-    interface Element extends ElementSync, WebdriverIOAsync.Element { }
-    // @ts-expect-error
-    interface MultiRemoteBrowser extends MultiRemoteBrowserAsync, WebdriverIOAsync.MultiRemoteBrowser { }
-    interface ElementArray extends ElementArrayImport {}
-}
-
-declare function $(...args: Parameters<WebdriverIO.Browser['$']>): ReturnType<WebdriverIO.Browser['$']>
-declare function $$(...args: Parameters<WebdriverIO.Browser['$$']>): ReturnType<WebdriverIO.Browser['$$']>
-declare const browser: WebdriverIO.Browser
-declare const driver: WebdriverIO.Browser
-declare const multiremotebrowser: WebdriverIO.MultiRemoteBrowser

package/sync.d.ts

@@ -1,24 +0,0 @@
-type BrowserSync = import('./build/types').Browser<'sync'>
-type ElementSync = import('./build/types').Element<'sync'>
-type MultiRemoteBrowserSync = import('./build/types').MultiRemoteBrowser<'sync'>
-type ElementArrayImport = import('./build/types').ElementArray
-
-declare namespace WebdriverIOSync {
-    interface Browser {}
-    interface Element {}
-    interface MultiRemoteBrowser {}
-}
-
-declare namespace WebdriverIO {
-    interface Browser extends BrowserSync, WebdriverIOSync.Browser { }
-    interface Element extends ElementSync, WebdriverIOSync.Element { }
-    // @ts-expect-error
-    interface MultiRemoteBrowser extends MultiRemoteBrowserSync, WebdriverIOSync.MultiRemoteBrowser { }
-    interface ElementArray extends ElementArrayImport {}
-}
-
-declare function $(...args: Parameters<WebdriverIO.Browser['$']>): ReturnType<WebdriverIO.Browser['$']>
-declare function $$(...args: Parameters<WebdriverIO.Browser['$$']>): ReturnType<WebdriverIO.Browser['$$']>
-declare const browser: WebdriverIO.Browser
-declare const driver: WebdriverIO.Browser
-declare const multiremotebrowser: WebdriverIO.MultiRemoteBrowser