@wdio/cli 7.20.7 → 7.20.8-alpha.504

package/build/utils.js

@@ -1,36 +1,37 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultFiles = exports.getPathForFileGeneration = exports.getAnswers = exports.generateTestFiles = exports.hasPackage = exports.hasFile = exports.getCapabilities = exports.validateServiceAnswers = exports.renderConfigurationFile = exports.convertPackageHashToObject = exports.addServiceDeps = exports.replaceConfig = exports.findInConfig = exports.getRunnerName = exports.runOnCompleteHook = exports.runLauncherHook = exports.runServiceHook = exports.HookError = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const ejs_1 = __importDefault(require("ejs"));
-const path_1 = __importDefault(require("path"));
-const lodash_pickby_1 = __importDefault(require("lodash.pickby"));
-const inquirer_1 = __importDefault(require("inquirer"));
-const logger_1 = __importDefault(require("@wdio/logger"));
-const recursive_readdir_1 = __importDefault(require("recursive-readdir"));
-const webdriverio_1 = require("webdriverio");
-const child_process_1 = require("child_process");
-const util_1 = require("util");
-const config_1 = require("@wdio/config");
-const protocols_1 = require("@wdio/protocols");
-const constants_1 = require("./constants");
-const log = (0, logger_1.default)('@wdio/cli:utils');
-const TEMPLATE_ROOT_DIR = path_1.default.join(__dirname, 'templates', 'exampleFiles');
-const renderFile = (0, util_1.promisify)(ejs_1.default.renderFile);
-class HookError extends webdriverio_1.SevereServiceError {
+import fs from 'node:fs/promises';
+import fsSync from 'node:fs';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { createRequire } from 'node:module';
+import { execSync } from 'node:child_process';
+import { promisify } from 'node:util';
+import ejs from 'ejs';
+import path from 'node:path';
+import inquirer from 'inquirer';
+import pickBy from 'lodash.pickby';
+import logger from '@wdio/logger';
+import readDir from 'recursive-readdir';
+import { SevereServiceError } from 'webdriverio';
+import { ConfigParser } from '@wdio/config';
+import { CAPABILITY_KEYS } from '@wdio/protocols';
+import { EXCLUSIVE_SERVICES, ANDROID_CONFIG, IOS_CONFIG, QUESTIONNAIRE, COMMUNITY_PACKAGES_WITH_V8_SUPPORT } from './constants.js';
+const require = createRequire(import.meta.url);
+const log = logger('@wdio/cli:utils');
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const VERSION_REGEXP = /(\d+)\.(\d+)\.(\d+)-(alpha|beta|)\.(\d+)\+(.+)/g;
+const TEMPLATE_ROOT_DIR = path.join(__dirname, 'templates', 'exampleFiles');
+const renderFile = promisify(ejs.renderFile);
+export class HookError extends SevereServiceError {
+    origin;
     constructor(message, origin) {
         super(message);
         this.origin = origin;
     }
 }
-exports.HookError = HookError;
 /**
  * run service launch sequences
  */
-async function runServiceHook(launcher, hookName, ...args) {
+export async function runServiceHook(launcher, hookName, ...args) {
     const start = Date.now();
     return Promise.all(launcher.map(async (service) => {
         try {
@@ -40,7 +41,7 @@ async function runServiceHook(launcher, hookName, ...args) {
         }
         catch (err) {
             const message = `A service failed in the '${hookName}' hook\n${err.stack}\n\n`;
-            if (err instanceof webdriverio_1.SevereServiceError) {
+            if (err instanceof SevereServiceError) {
                 return { status: 'rejected', reason: message, origin: hookName };
             }
             log.error(`${message}Continue...`);
@@ -55,20 +56,19 @@ async function runServiceHook(launcher, hookName, ...args) {
         }
     });
 }
-exports.runServiceHook = runServiceHook;
 /**
  * Run hook in service launcher
  * @param {Array|Function} hook - can be array of functions or single function
  * @param {Object} config
  * @param {Object} capabilities
  */
-async function runLauncherHook(hook, ...args) {
+export async function runLauncherHook(hook, ...args) {
     if (typeof hook === 'function') {
         hook = [hook];
     }
     const catchFn = (e) => {
         log.error(`Error in hook: ${e.stack}`);
-        if (e instanceof webdriverio_1.SevereServiceError) {
+        if (e instanceof SevereServiceError) {
             throw new HookError(e.message, hook[0].name);
         }
     };
@@ -81,7 +81,6 @@ async function runLauncherHook(hook, ...args) {
         }
     })).catch(catchFn);
 }
-exports.runLauncherHook = runLauncherHook;
 /**
  * Run onCompleteHook in Launcher
  * @param {Array|Function} onCompleteHook - can be array of functions or single function
@@ -90,7 +89,7 @@ exports.runLauncherHook = runLauncherHook;
  * @param {*} exitCode
  * @param {*} results
  */
-async function runOnCompleteHook(onCompleteHook, config, capabilities, exitCode, results) {
+export async function runOnCompleteHook(onCompleteHook, config, capabilities, exitCode, results) {
     if (typeof onCompleteHook === 'function') {
         onCompleteHook = [onCompleteHook];
     }
@@ -101,18 +100,17 @@ async function runOnCompleteHook(onCompleteHook, config, capabilities, exitCode,
         }
         catch (err) {
             log.error(`Error in onCompleteHook: ${err.stack}`);
-            if (err instanceof webdriverio_1.SevereServiceError) {
+            if (err instanceof SevereServiceError) {
                 throw new HookError(err.message, 'onComplete');
             }
             return 1;
         }
     }));
 }
-exports.runOnCompleteHook = runOnCompleteHook;
 /**
  * get runner identification by caps
  */
-function getRunnerName(caps = {}) {
+export function getRunnerName(caps = {}) {
     let runner = caps.browserName ||
         caps.appPackage ||
         caps.appWaitActivity ||
@@ -128,13 +126,11 @@ function getRunnerName(caps = {}) {
     }
     return runner;
 }
-exports.getRunnerName = getRunnerName;
 function buildNewConfigArray(str, type, change) {
-    var _a;
     const newStr = str
         .split(`${type}s: `)[1]
         .replace(/'/g, '');
-    let newArray = ((_a = newStr.match(/(\w*)/gmi)) === null || _a === void 0 ? void 0 : _a.filter(e => !!e).concat([change])) || [];
+    let newArray = newStr.match(/(\w*)/gmi)?.filter(e => !!e).concat([change]) || [];
     return str
         .replace('// ', '')
         .replace(new RegExp(`(${type}s: )((.*\\s*)*)`), `$1[${newArray.map(e => `'${e}'`)}]`);
@@ -142,7 +138,7 @@ function buildNewConfigArray(str, type, change) {
 function buildNewConfigString(str, type, change) {
     return str.replace(new RegExp(`(${type}: )('\\w*')`), `$1'${change}'`);
 }
-function findInConfig(config, type) {
+export function findInConfig(config, type) {
     let regexStr = `[\\/\\/]*[\\s]*${type}s: [\\s]*\\[([\\s]*['|"]\\w*['|"],*)*[\\s]*\\]`;
     if (type === 'framework') {
         regexStr = `[\\/\\/]*[\\s]*${type}: ([\\s]*['|"]\\w*['|"])`;
@@ -150,8 +146,7 @@ function findInConfig(config, type) {
     const regex = new RegExp(regexStr, 'gmi');
     return config.match(regex);
 }
-exports.findInConfig = findInConfig;
-function replaceConfig(config, type, name) {
+export function replaceConfig(config, type, name) {
     if (type === 'framework') {
         return buildNewConfigString(config, type, name);
     }
@@ -162,8 +157,7 @@ function replaceConfig(config, type, name) {
     const text = match.pop() || '';
     return config.replace(text, buildNewConfigArray(text, type, name));
 }
-exports.replaceConfig = replaceConfig;
-function addServiceDeps(names, packages, update = false) {
+export function addServiceDeps(names, packages, update = false) {
     /**
      * automatically install latest Chromedriver if `wdio-chromedriver-service`
      * was selected for install
@@ -180,7 +174,7 @@ function addServiceDeps(names, packages, update = false) {
      * was selected for install
      */
     if (names.some(({ short }) => short === 'appium')) {
-        const result = (0, child_process_1.execSync)('appium --version || echo APPIUM_MISSING').toString().trim();
+        const result = execSync('appium --version || echo APPIUM_MISSING').toString().trim();
         if (result === 'APPIUM_MISSING') {
             packages.push('appium');
         }
@@ -190,28 +184,25 @@ function addServiceDeps(names, packages, update = false) {
         }
     }
 }
-exports.addServiceDeps = addServiceDeps;
 /**
  * @todo add JSComments
  */
-function convertPackageHashToObject(pkg, hash = '$--$') {
+export function convertPackageHashToObject(pkg, hash = '$--$') {
     const splitHash = pkg.split(hash);
     return {
         package: splitHash[0],
         short: splitHash[1]
     };
 }
-exports.convertPackageHashToObject = convertPackageHashToObject;
-async function renderConfigurationFile(answers) {
-    const tplPath = path_1.default.join(__dirname, 'templates/wdio.conf.tpl.ejs');
+export async function renderConfigurationFile(answers) {
+    const tplPath = path.join(__dirname, 'templates/wdio.conf.tpl.ejs');
     const filename = `wdio.conf.${answers.isUsingTypeScript ? 'ts' : 'js'}`;
     const renderedTpl = await renderFile(tplPath, { answers });
-    return fs_extra_1.default.promises.writeFile(path_1.default.join(process.cwd(), answers.isUsingTypeScript ? 'test' : '', filename), renderedTpl);
+    return fs.writeFile(path.join(process.cwd(), answers.isUsingTypeScript ? 'test' : '', filename), renderedTpl);
 }
-exports.renderConfigurationFile = renderConfigurationFile;
-const validateServiceAnswers = (answers) => {
+export const validateServiceAnswers = (answers) => {
     let result = true;
-    Object.entries(constants_1.EXCLUSIVE_SERVICES).forEach(([name, { services, message }]) => {
+    Object.entries(EXCLUSIVE_SERVICES).forEach(([name, { services, message }]) => {
         const exists = answers.some(answer => answer.includes(name));
         const hasExclusive = services.some(service => answers.some(answer => answer.includes(service)));
         if (exists && hasExclusive) {
@@ -220,8 +211,7 @@ const validateServiceAnswers = (answers) => {
     });
     return result;
 };
-exports.validateServiceAnswers = validateServiceAnswers;
-function getCapabilities(arg) {
+export function getCapabilities(arg) {
     const optionalCapabilites = {
         platformVersion: arg.platformVersion,
         udid: arg.udid,
@@ -235,19 +225,19 @@ function getCapabilities(arg) {
         return {
             capabilities: {
                 app: arg.option,
-                ...(arg.option.endsWith('apk') ? constants_1.ANDROID_CONFIG : constants_1.IOS_CONFIG),
+                ...(arg.option.endsWith('apk') ? ANDROID_CONFIG : IOS_CONFIG),
                 ...optionalCapabilites,
             }
         };
     }
     else if (/android/.test(arg.option)) {
-        return { capabilities: { browserName: 'Chrome', ...constants_1.ANDROID_CONFIG, ...optionalCapabilites } };
+        return { capabilities: { browserName: 'Chrome', ...ANDROID_CONFIG, ...optionalCapabilites } };
     }
     else if (/ios/.test(arg.option)) {
-        return { capabilities: { browserName: 'Safari', ...constants_1.IOS_CONFIG, ...optionalCapabilites } };
+        return { capabilities: { browserName: 'Safari', ...IOS_CONFIG, ...optionalCapabilites } };
     }
     else if (/(js|ts)$/.test(arg.option)) {
-        const config = new config_1.ConfigParser();
+        const config = new ConfigParser();
         config.autoCompile();
         try {
             config.addConfigFile(arg.option);
@@ -265,7 +255,7 @@ function getCapabilities(arg) {
         requiredCaps[parseInt(arg.capabilities, 10)] ||
             // multiremote
             requiredCaps[arg.capabilities]);
-        const requiredW3CCaps = (0, lodash_pickby_1.default)(requiredCaps, (_, key) => protocols_1.CAPABILITY_KEYS.includes(key) || key.includes(':'));
+        const requiredW3CCaps = pickBy(requiredCaps, (_, key) => CAPABILITY_KEYS.includes(key) || key.includes(':'));
         if (!Object.keys(requiredW3CCaps).length) {
             throw Error(`No capability found in given config file with the provided capability indexed/named property: ${arg.capabilities}. Please check the capability in your wdio config file.`);
         }
@@ -273,26 +263,30 @@ function getCapabilities(arg) {
     }
     return { capabilities: { browserName: arg.option } };
 }
-exports.getCapabilities = getCapabilities;
 /**
  * Check if file exists in current work directory
  * @param {string} filename to check existance for
  */
-function hasFile(filename) {
-    return fs_extra_1.default.existsSync(path_1.default.join(process.cwd(), filename));
+export function hasFile(filename) {
+    try {
+        fsSync.accessSync(path.join(process.cwd(), filename));
+        return true;
+    }
+    catch (err) {
+        return false;
+    }
 }
-exports.hasFile = hasFile;
 /**
  * Check if package is installed
  * @param {string} package to check existance for
  */
-function hasPackage(pkg) {
+export function hasPackage(pkg) {
     try {
         /**
          * this is only for testing purposes as we want to check whether
          * we add `@babel/register` to the packages to install when resolving fails
          */
-        if (process.env.JEST_WORKER_ID && process.env.WDIO_TEST_THROW_RESOLVE) {
+        if (process.env.VITEST_WORKER_ID && process.env.WDIO_TEST_THROW_RESOLVE) {
             throw new Error('resolve error');
         }
         require.resolve(pkg);
@@ -302,35 +296,33 @@ function hasPackage(pkg) {
         return false;
     }
 }
-exports.hasPackage = hasPackage;
 /**
  * generate test files based on CLI answers
  */
-async function generateTestFiles(answers) {
+export async function generateTestFiles(answers) {
     const testFiles = answers.framework === 'cucumber'
-        ? [path_1.default.join(TEMPLATE_ROOT_DIR, 'cucumber')]
+        ? [path.join(TEMPLATE_ROOT_DIR, 'cucumber')]
         : (answers.framework === 'mocha'
-            ? [path_1.default.join(TEMPLATE_ROOT_DIR, 'mocha')]
-            : [path_1.default.join(TEMPLATE_ROOT_DIR, 'jasmine')]);
+            ? [path.join(TEMPLATE_ROOT_DIR, 'mocha')]
+            : [path.join(TEMPLATE_ROOT_DIR, 'jasmine')]);
     if (answers.usePageObjects) {
-        testFiles.push(path_1.default.join(TEMPLATE_ROOT_DIR, 'pageobjects'));
+        testFiles.push(path.join(TEMPLATE_ROOT_DIR, 'pageobjects'));
     }
-    const files = (await Promise.all(testFiles.map((dirPath) => (0, recursive_readdir_1.default)(dirPath, [(file, stats) => !stats.isDirectory() && !(file.endsWith('.ejs') || file.endsWith('.feature'))])))).reduce((cur, acc) => [...acc, ...(cur)], []);
+    const files = (await Promise.all(testFiles.map((dirPath) => readDir(dirPath, [(file, stats) => !stats.isDirectory() && !(file.endsWith('.ejs') || file.endsWith('.feature'))])))).reduce((cur, acc) => [...acc, ...(cur)], []);
     for (const file of files) {
         const renderedTpl = await renderFile(file, answers);
         let destPath = (file.endsWith('page.js.ejs')
-            ? `${answers.destPageObjectRootPath}/${path_1.default.basename(file)}`
+            ? `${answers.destPageObjectRootPath}/${path.basename(file)}`
             : file.includes('step_definition')
                 ? `${answers.stepDefinitions}`
-                : `${answers.destSpecRootPath}/${path_1.default.basename(file)}`).replace(/\.ejs$/, '').replace(/\.js$/, answers.isUsingTypeScript ? '.ts' : '.js');
-        fs_extra_1.default.ensureDirSync(path_1.default.dirname(destPath));
-        await fs_extra_1.default.promises.writeFile(destPath, renderedTpl);
+                : `${answers.destSpecRootPath}/${path.basename(file)}`).replace(/\.ejs$/, '').replace(/\.js$/, answers.isUsingTypeScript ? '.ts' : '.js');
+        await fs.mkdir(path.dirname(destPath), { recursive: true });
+        await fs.writeFile(destPath, renderedTpl);
     }
 }
-exports.generateTestFiles = generateTestFiles;
-async function getAnswers(yes) {
+export async function getAnswers(yes) {
     return yes
-        ? constants_1.QUESTIONNAIRE.reduce((answers, question) => Object.assign(answers, question.when && !question.when(answers)
+        ? QUESTIONNAIRE.reduce((answers, question) => Object.assign(answers, question.when && !question.when(answers)
             /**
              * set nothing if question doesn't apply
              */
@@ -351,19 +343,18 @@ async function getAnswers(yes) {
                             : question.choices[0]
                         : {}
             }), {})
-        : await inquirer_1.default.prompt(constants_1.QUESTIONNAIRE);
+        : await inquirer.prompt(QUESTIONNAIRE);
 }
-exports.getAnswers = getAnswers;
-function getPathForFileGeneration(answers) {
-    const destSpecRootPath = path_1.default.join(process.cwd(), path_1.default.dirname(answers.specs || '').replace(/\*\*$/, ''));
-    const destStepRootPath = path_1.default.join(process.cwd(), path_1.default.dirname(answers.stepDefinitions || ''));
+export function getPathForFileGeneration(answers) {
+    const destSpecRootPath = path.join(process.cwd(), path.dirname(answers.specs || '').replace(/\*\*$/, ''));
+    const destStepRootPath = path.join(process.cwd(), path.dirname(answers.stepDefinitions || ''));
     const destPageObjectRootPath = answers.usePageObjects
-        ? path_1.default.join(process.cwd(), path_1.default.dirname(answers.pages || '').replace(/\*\*$/, ''))
+        ? path.join(process.cwd(), path.dirname(answers.pages || '').replace(/\*\*$/, ''))
         : '';
     let relativePath = (answers.generateTestFiles && answers.usePageObjects)
         ? !(convertPackageHashToObject(answers.framework).short === 'cucumber')
-            ? path_1.default.relative(destSpecRootPath, destPageObjectRootPath)
-            : path_1.default.relative(destStepRootPath, destPageObjectRootPath)
+            ? path.relative(destSpecRootPath, destPageObjectRootPath)
+            : path.relative(destStepRootPath, destPageObjectRootPath)
         : '';
     /**
     * On Windows, path.relative can return backslashes that could be interpreted as espace sequences in strings
@@ -378,11 +369,30 @@ function getPathForFileGeneration(answers) {
         relativePath: relativePath
     };
 }
-exports.getPathForFileGeneration = getPathForFileGeneration;
-function getDefaultFiles(answers, filePath) {
-    var _a;
-    return ((_a = answers === null || answers === void 0 ? void 0 : answers.isUsingCompiler) === null || _a === void 0 ? void 0 : _a.toString().includes('TypeScript'))
+export function getDefaultFiles(answers, filePath) {
+    return answers?.isUsingCompiler?.toString().includes('TypeScript')
         ? `${filePath}.ts`
         : `${filePath}.js`;
 }
-exports.getDefaultFiles = getDefaultFiles;
+/**
+ * Ensure core WebdriverIO packages have the same version as cli so that if someone
+ * installs `@wdio/cli@next` and runs the wizard, all related packages have the same version.
+ * running `matchAll` to a version like "8.0.0-alpha.249+4bc237701", results in:
+ * ['8.0.0-alpha.249+4bc237701', '8', '0', '0', 'alpha', '249', '4bc237701']
+ */
+export function specifyVersionIfNeeded(packagesToInstall, version) {
+    const { value } = version.matchAll(VERSION_REGEXP).next();
+    if (value) {
+        const [major, minor, patch, tagName, build] = value.slice(1, -1); // drop commit bit
+        return packagesToInstall.map((p) => {
+            if (p.startsWith('@wdio') || ['devtools', 'webdriver', 'webdriverio'].includes(p)) {
+                return `${p}@^${major}.${minor}.${patch}-${tagName}.${build}`;
+            }
+            if (COMMUNITY_PACKAGES_WITH_V8_SUPPORT.includes(p)) {
+                return `${p}@next`;
+            }
+            return p;
+        });
+    }
+    return packagesToInstall;
+}

package/build/watcher.d.ts

@@ -1,5 +1,5 @@
 import type { Workers } from '@wdio/types';
-import { RunCommandArguments, ValueKeyIteratee } from './types.js';
+import type { RunCommandArguments, ValueKeyIteratee } from './types';
 declare type Spec = string | string[];
 export default class Watcher {
     private _configFile;

package/build/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAIlE,aAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAC7B,MAAM,CAAC,OAAO,OAAO,OAAO;IAKpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,KAAK;IALjB,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,MAAM,CAAQ;gBAGV,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC;IAYpD,KAAK;IAwCX;;;;OAIG;IACH,eAAe,CAAE,UAAU,UAAO,UAChB,MAAM;IA6BxB;;;;;OAKG;IACH,UAAU,CAAE,SAAS,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU;IAiB7H;;;OAGG;IACH,GAAG,CAAE,MAAM,GAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,IAAI,CAAA;KAAO;IAuC9E,OAAO;CAGV"}
+{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAA;AAGxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAIpE,aAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAC7B,MAAM,CAAC,OAAO,OAAO,OAAO;IAKpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,KAAK;IALjB,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,MAAM,CAAQ;gBAGV,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC;IAYpD,KAAK;IAwCX;;;;OAIG;IACH,eAAe,CAAE,UAAU,UAAO,UAChB,MAAM;IA6BxB;;;;;OAKG;IACH,UAAU,CAAE,SAAS,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU;IAqB7H;;;OAGG;IACH,GAAG,CAAE,MAAM,GAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,IAAI,CAAA;KAAO;IAuC9E,OAAO;CAGV"}

package/build/watcher.js

@@ -1,31 +1,30 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chokidar_1 = __importDefault(require("chokidar"));
-const logger_1 = __importDefault(require("@wdio/logger"));
-const lodash_pickby_1 = __importDefault(require("lodash.pickby"));
-const lodash_flattendeep_1 = __importDefault(require("lodash.flattendeep"));
-const lodash_union_1 = __importDefault(require("lodash.union"));
-const launcher_1 = __importDefault(require("./launcher"));
-const log = (0, logger_1.default)('@wdio/cli:watch');
-class Watcher {
+import chokidar from 'chokidar';
+import logger from '@wdio/logger';
+import pickBy from 'lodash.pickby';
+import flattenDeep from 'lodash.flattendeep';
+import union from 'lodash.union';
+import Launcher from './launcher.js';
+const log = logger('@wdio/cli:watch');
+export default class Watcher {
+    _configFile;
+    _args;
+    _launcher;
+    _specs;
     constructor(_configFile, _args) {
         this._configFile = _configFile;
         this._args = _args;
         log.info('Starting launcher in watch mode');
-        this._launcher = new launcher_1.default(this._configFile, this._args, true);
+        this._launcher = new Launcher(this._configFile, this._args, true);
         const specs = this._launcher.configParser.getSpecs();
-        const capSpecs = this._launcher.isMultiremote ? [] : (0, lodash_union_1.default)((0, lodash_flattendeep_1.default)(this._launcher.configParser.getCapabilities().map(cap => cap.specs || [])));
+        const capSpecs = this._launcher.isMultiremote ? [] : union(flattenDeep(this._launcher.configParser.getCapabilities().map(cap => cap.specs || [])));
         this._specs = [...specs, ...capSpecs];
     }
     async watch() {
         /**
          * listen on spec changes and rerun specific spec file
          */
-        let flattenedSpecs = (0, lodash_flattendeep_1.default)(this._specs);
-        chokidar_1.default.watch(flattenedSpecs, { ignoreInitial: true })
+        let flattenedSpecs = flattenDeep(this._specs);
+        chokidar.watch(flattenedSpecs, { ignoreInitial: true })
             .on('add', this.getFileListener())
             .on('change', this.getFileListener());
         /**
@@ -33,7 +32,7 @@ class Watcher {
          */
         const { filesToWatch } = this._launcher.configParser.getConfig();
         if (filesToWatch.length) {
-            chokidar_1.default.watch(filesToWatch, { ignoreInitial: true })
+            chokidar.watch(filesToWatch, { ignoreInitial: true })
                 .on('add', this.getFileListener(false))
                 .on('change', this.getFileListener(false));
         }
@@ -52,7 +51,7 @@ class Watcher {
             if (Object.values(workers).find((w) => w.isBusy)) {
                 return;
             }
-            this._launcher.interface.finalise();
+            this._launcher.interface?.finalise();
         }));
     }
     /**
@@ -95,15 +94,18 @@ class Watcher {
      * @return                   Object with workers, e.g. {'0-0': { ... }}
      */
     getWorkers(predicate, includeBusyWorker) {
+        if (!this._launcher.runner) {
+            throw new Error('Internal Error: no runner initialised, call run() first');
+        }
         let workers = this._launcher.runner.workerPool;
         if (typeof predicate === 'function') {
-            workers = (0, lodash_pickby_1.default)(workers, predicate);
+            workers = pickBy(workers, predicate);
         }
         /**
          * filter out busy workers, only skip if explicitly desired
          */
         if (!includeBusyWorker) {
-            workers = (0, lodash_pickby_1.default)(workers, (worker) => !worker.isBusy);
+            workers = pickBy(workers, (worker) => !worker.isBusy);
         }
         return workers;
     }
@@ -121,7 +123,7 @@ class Watcher {
         /**
          * don't do anything if no worker was found
          */
-        if (Object.keys(workers).length === 0) {
+        if (Object.keys(workers).length === 0 || !this._launcher.interface) {
             return;
         }
         /**
@@ -144,7 +146,6 @@ class Watcher {
         }
     }
     cleanUp() {
-        this._launcher.interface.setup();
+        this._launcher.interface?.setup();
     }
 }
-exports.default = Watcher;

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@wdio/cli",
-  "version": "7.20.7",
+  "version": "7.20.8-alpha.504+428a9d729",
   "description": "WebdriverIO testrunner command line interface",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-cli",
   "license": "MIT",
-  "main": "./build/index",
   "bin": {
     "wdio": "./bin/wdio.js"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": "^16.13 || >=18"
   },
   "scripts": {
     "copy": "copyfiles -u 1 -V \"src/templates/**/*\" ./build/"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/webdriverio/webdriverio.git"
+    "url": "git://github.com/webdriverio/webdriverio.git",
+    "directory": "packages/wdio-cli"
   },
   "keywords": [
     "webdriver",
@@ -28,39 +28,44 @@
   "bugs": {
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
+  "type": "module",
+  "exports": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "typeScriptVersion": "3.8.3",
   "dependencies": {
-    "@types/ejs": "^3.0.5",
-    "@types/fs-extra": "^9.0.4",
-    "@types/inquirer": "^8.1.2",
-    "@types/lodash.flattendeep": "^4.4.6",
-    "@types/lodash.pickby": "^4.6.6",
-    "@types/lodash.union": "^4.6.6",
-    "@types/node": "^18.0.0",
-    "@types/recursive-readdir": "^2.2.0",
-    "@wdio/config": "7.20.7",
-    "@wdio/logger": "7.19.0",
-    "@wdio/protocols": "7.20.6",
-    "@wdio/types": "7.20.7",
-    "@wdio/utils": "7.20.7",
+    "@types/ejs": "^3.1.1",
+    "@types/inquirer": "^9.0.0",
+    "@types/lodash.flattendeep": "^4.4.7",
+    "@types/lodash.pickby": "^4.6.7",
+    "@types/lodash.union": "^4.6.7",
+    "@types/recursive-readdir": "^2.2.1",
+    "@types/yargs": "^17.0.10",
+    "@wdio/config": "7.20.8-alpha.504+428a9d729",
+    "@wdio/globals": "7.20.8-alpha.504+428a9d729",
+    "@wdio/logger": "7.20.8-alpha.504+428a9d729",
+    "@wdio/protocols": "7.20.8-alpha.504+428a9d729",
+    "@wdio/types": "7.20.8-alpha.504+428a9d729",
+    "@wdio/utils": "7.20.8-alpha.504+428a9d729",
     "async-exit-hook": "^2.0.1",
-    "chalk": "^4.0.0",
-    "chokidar": "^3.0.0",
-    "cli-spinners": "^2.1.0",
-    "ejs": "^3.0.1",
-    "fs-extra": "^10.0.0",
-    "inquirer": "8.2.4",
+    "chalk": "^5.0.1",
+    "chokidar": "^3.5.3",
+    "cli-spinners": "^2.6.1",
+    "ejs": "^3.1.8",
+    "inquirer": "9.1.2",
     "lodash.flattendeep": "^4.4.0",
     "lodash.pickby": "^4.6.0",
     "lodash.union": "^4.6.0",
     "mkdirp": "^1.0.4",
     "recursive-readdir": "^2.2.2",
-    "webdriverio": "7.20.7",
-    "yargs": "^17.0.0",
+    "webdriverio": "7.20.8-alpha.504+428a9d729",
+    "yargs": "^17.5.1",
     "yarn-install": "^1.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "types": "./build/index.d.ts",
-  "gitHead": "21b8b61453f4749d87eca3e4d7d6e5e2cb60f043"
+  "devDependencies": {
+    "@types/node": "^18.0.0"
+  },
+  "gitHead": "428a9d729ae6231968a60908732fa3f607d195e9"
 }