@wdio/cli 8.0.0-alpha.565 → 8.0.0-alpha.577

package/build/commands/config.js

@@ -75,7 +75,7 @@ const runConfig = async function (useYarn, yes, exit = false) {
      * add ts-node if TypeScript is desired but not installed
      */
     if (parsedAnswers.isUsingTypeScript) {
-        if (!hasPackage('ts-node')) {
+        if (!await hasPackage('ts-node')) {
             packagesToInstall.push('ts-node', 'typescript');
         }
         const types = [
@@ -112,17 +112,17 @@ const runConfig = async function (useYarn, yes, exit = false) {
      * add @babel/register package if not installed
      */
     if (parsedAnswers.isUsingBabel) {
-        if (!hasPackage('@babel/register')) {
+        if (!await hasPackage('@babel/register')) {
             packagesToInstall.push('@babel/register');
         }
         /**
          * setup Babel if no config file exists
          */
         if (!hasFile('babel.config.js')) {
-            if (!hasPackage('@babel/core')) {
+            if (!await hasPackage('@babel/core')) {
                 packagesToInstall.push('@babel/core');
             }
-            if (!hasPackage('@babel/preset-env')) {
+            if (!await hasPackage('@babel/preset-env')) {
                 packagesToInstall.push('@babel/preset-env');
             }
             await fs.writeFile(path.join(process.cwd(), 'babel.config.js'), `module.exports = ${JSON.stringify({

package/build/commands/run.d.ts

@@ -169,6 +169,6 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{}, "fr
     };
 }>>;
 export declare function launchWithStdin(wdioConfPath: string, params: Partial<RunCommandArguments>): void;
-export declare function launch(wdioConfPath: string, params: Partial<RunCommandArguments>): Promise<void> | cp.ChildProcess;
+export declare function launch(wdioConfPath: string, params: Partial<RunCommandArguments>): Promise<void | cp.ChildProcess>;
 export declare function handler(argv: RunCommandArguments): Promise<void | cp.ChildProcess>;
 //# sourceMappingURL=run.d.ts.map

package/build/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACnC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAMjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAEnD,eAAO,MAAM,OAAO,qBAAqB,CAAA;AAEzC,eAAO,MAAM,IAAI,yEAAyE,CAAA;AAE1F,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiFV,CAAA;AAEV,eAAO,MAAM,OAAO,UAAW,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAUlC,CAAA;AAED,wBAAgB,eAAe,CAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,QAc1F;AAED,wBAAgB,MAAM,CAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,mCAgDjF;AAED,wBAAsB,OAAO,CAAE,IAAI,EAAE,mBAAmB,mCA0CvD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACnC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAMjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAEnD,eAAO,MAAM,OAAO,qBAAqB,CAAA;AAEzC,eAAO,MAAM,IAAI,yEAAyE,CAAA;AAE1F,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiFV,CAAA;AAEV,eAAO,MAAM,OAAO,UAAW,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GASlC,CAAA;AAED,wBAAgB,eAAe,CAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,QAc1F;AAED,wBAAsB,MAAM,CAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,mCAmDvF;AAED,wBAAsB,OAAO,CAAE,IAAI,EAAE,mBAAmB,mCA0CvD"}

package/build/commands/run.js

@@ -96,7 +96,6 @@ export const builder = (yargs) => {
         .example('$0 run wdio.conf.js --spec ./tests/e2e/a.js --spec ./tests/e2e/b.js', 'Run suite on specific specs')
         .example('$0 run wdio.conf.js --mochaOpts.timeout 60000', 'Run suite with custom Mocha timeout')
         .example('$0 run wdio.conf.js --autoCompileOpts.autoCompile=false', 'Disable auto-loading of ts-node or @babel/register')
-        .example('$0 run wdio.conf.js --autoCompileOpts.tsNodeOpts.project=configs/bdd-tsconfig.json', 'Run suite with ts-node using custom tsconfig.json')
         .epilogue(CLI_EPILOGUE)
         .help();
 };
@@ -114,7 +113,7 @@ export function launchWithStdin(wdioConfPath, params) {
         launch(wdioConfPath, params);
     });
 }
-export function launch(wdioConfPath, params) {
+export async function launch(wdioConfPath, params) {
     /**
      * In order to load TypeScript files in ESM we need to apply the ts-node loader.
      * Let's have WebdriverIO set it automatically if the user doesn't.
@@ -126,12 +125,15 @@ export function launch(wdioConfPath, params) {
         NODE_OPTIONS?.includes('ts-node/esm'));
     if (wdioConfPath.endsWith('.ts') && !runsWithLoader && nodePath) {
         NODE_OPTIONS += ' --loader ts-node/esm/transpile-only --no-warnings';
+        const localTSConfigPath = path.join(path.dirname(wdioConfPath), 'tsconfig.json');
+        const hasLocalTSConfig = await fs.access(localTSConfigPath).then(() => true, () => false);
         const tsProcess = cp.spawn(nodePath, process.argv.slice(1), {
             cwd: process.cwd(),
             detached: true,
             stdio: 'inherit',
             env: {
                 ...process.env,
+                ...(hasLocalTSConfig ? { TS_NODE_PROJECT: localTSConfigPath } : {}),
                 NODE_OPTIONS
             }
         });

package/build/templates/wdio.conf.tpl.ejs

@@ -10,36 +10,6 @@ export const config: Options.Testrunner = {<%
     // ====================
     // Runner Configuration
     // ====================
-    //<%
-    if(answers.isUsingTypeScript){ %>
-    //
-    // =====================
-    // ts-node Configurations
-    // =====================
-    //
-    // You can write tests using TypeScript to get autocompletion and type safety.
-    // You will need typescript and ts-node installed as devDependencies.
-    // WebdriverIO will automatically detect if these dependencies are installed
-    // and will compile your config and tests for you.
-    // If you need to configure how ts-node runs please use the
-    // environment variables for ts-node or use wdio config's autoCompileOpts section.
-    //
-
-    autoCompileOpts: {
-        autoCompile: true,
-        // see https://github.com/TypeStrong/ts-node#cli-and-programmatic-options
-        // for all available options
-        tsNodeOpts: {
-            transpileOnly: true,
-            project: 'test/tsconfig.json'
-        }
-        // tsconfig-paths is only used if "tsConfigPathsOpts" are provided, if you
-        // do please make sure "tsconfig-paths" is installed as dependency
-        // tsConfigPathsOpts: {
-        //     baseUrl: './'
-        // }
-    },<% }
-
     if(answers.expEnvAccessKey){ %>
     hostname: '<%- answers.expEnvHostname %>',
     <% if (answers.expEnvPort === '443'){%>protocol: 'https',

package/build/utils.d.ts

@@ -77,7 +77,7 @@ export declare function hasFile(filename: string): boolean;
  * Check if package is installed
  * @param {string} package to check existance for
  */
-export declare function hasPackage(pkg: string): boolean;
+export declare function hasPackage(pkg: string): Promise<boolean>;
 /**
  * generate test files based on CLI answers
  */

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGlE,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAUpH,qBAAa,SAAU,SAAQ,kBAAkB;IACtC,MAAM,EAAE,MAAM,CAAA;gBACT,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAI9C;AAED;;GAEG;AACH,wBAAsB,cAAc,CAChC,QAAQ,EAAE,QAAQ,CAAC,eAAe,EAAE,EACpC,QAAQ,EAAE,MAAM,QAAQ,CAAC,aAAa,EACtC,GAAG,IAAI,EAAE,GAAG,EAAE,sBA2BjB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,yBAmBhF;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACnC,cAAc,EAAE,QAAQ,GAAG,QAAQ,EAAE,EACrC,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,YAAY,EAAE,YAAY,CAAC,kBAAkB,EAC7C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,gBAAgB,sBAkB5B;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAE,IAAI,GAAE,YAAY,CAAC,mBAAwB,UAkBzE;AAoBD,wBAAgB,YAAY,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,2BASzD;AAED,wBAAgB,aAAa,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,sBAYxE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,MAAM,UAAQ,QAmC3F;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,SAAS,GAAG,gBAAgB,CAMvF;AAED,wBAAsB,uBAAuB,CAAE,OAAO,EAAE,aAAa,iBAWpE;AAED,eAAO,MAAM,sBAAsB,YAAa,MAAM,EAAE,KAAG,OAAO,GAAG,MAgBpE,CAAA;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+C9D;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAE,QAAQ,EAAE,MAAM,WAOxC;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAE,GAAG,EAAE,MAAM,WActC;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAE,OAAO,EAAE,aAAa,iBA6B9D;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CA+BpE;AAED,wBAAgB,wBAAwB,CAAE,OAAO,EAAE,YAAY;;;;;EA+B9D;AAED,wBAAgB,eAAe,CAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,MAAM,UAIhF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAE,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,YAgBnF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGlE,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AASpH,qBAAa,SAAU,SAAQ,kBAAkB;IACtC,MAAM,EAAE,MAAM,CAAA;gBACT,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAI9C;AAED;;GAEG;AACH,wBAAsB,cAAc,CAChC,QAAQ,EAAE,QAAQ,CAAC,eAAe,EAAE,EACpC,QAAQ,EAAE,MAAM,QAAQ,CAAC,aAAa,EACtC,GAAG,IAAI,EAAE,GAAG,EAAE,sBA2BjB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,yBAmBhF;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACnC,cAAc,EAAE,QAAQ,GAAG,QAAQ,EAAE,EACrC,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,YAAY,EAAE,YAAY,CAAC,kBAAkB,EAC7C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,gBAAgB,sBAkB5B;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAE,IAAI,GAAE,YAAY,CAAC,mBAAwB,UAkBzE;AAoBD,wBAAgB,YAAY,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,2BASzD;AAED,wBAAgB,aAAa,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,sBAYxE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,MAAM,UAAQ,QAmC3F;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,SAAS,GAAG,gBAAgB,CAMvF;AAED,wBAAsB,uBAAuB,CAAE,OAAO,EAAE,aAAa,iBAWpE;AAED,eAAO,MAAM,sBAAsB,YAAa,MAAM,EAAE,KAAG,OAAO,GAAG,MAgBpE,CAAA;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+C9D;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAE,QAAQ,EAAE,MAAM,WAOxC;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAE,GAAG,EAAE,MAAM,oBAO5C;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAE,OAAO,EAAE,aAAa,iBA6B9D;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CA+BpE;AAED,wBAAgB,wBAAwB,CAAE,OAAO,EAAE,YAAY;;;;;EA+B9D;AAED,wBAAgB,eAAe,CAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,MAAM,UAIhF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAE,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,YAgBnF"}

package/build/utils.js

@@ -2,7 +2,6 @@ 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';
@@ -11,11 +10,11 @@ import inquirer from 'inquirer';
 import pickBy from 'lodash.pickby';
 import logger from '@wdio/logger';
 import readDir from 'recursive-readdir';
+import { resolve } from 'import-meta-resolve';
 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;
@@ -279,16 +278,9 @@ export function hasFile(filename) {
  * Check if package is installed
  * @param {string} package to check existance for
  */
-export function hasPackage(pkg) {
+export async 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.VITEST_WORKER_ID && process.env.WDIO_TEST_THROW_RESOLVE) {
-            throw new Error('resolve error');
-        }
-        require.resolve(pkg);
+        await resolve(pkg, import.meta.url);
         return true;
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/cli",
-  "version": "8.0.0-alpha.565+9959d0e91",
+  "version": "8.0.0-alpha.577+73cd77ef7",
   "description": "WebdriverIO testrunner command line interface",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-cli",
@@ -40,24 +40,25 @@
     "@types/lodash.union": "^4.6.7",
     "@types/recursive-readdir": "^2.2.1",
     "@types/yargs": "^17.0.10",
-    "@wdio/config": "8.0.0-alpha.565+9959d0e91",
-    "@wdio/globals": "8.0.0-alpha.565+9959d0e91",
-    "@wdio/logger": "8.0.0-alpha.565+9959d0e91",
-    "@wdio/protocols": "8.0.0-alpha.565+9959d0e91",
-    "@wdio/types": "8.0.0-alpha.565+9959d0e91",
-    "@wdio/utils": "8.0.0-alpha.565+9959d0e91",
+    "@wdio/config": "8.0.0-alpha.577+73cd77ef7",
+    "@wdio/globals": "8.0.0-alpha.577+73cd77ef7",
+    "@wdio/logger": "8.0.0-alpha.577+73cd77ef7",
+    "@wdio/protocols": "8.0.0-alpha.577+73cd77ef7",
+    "@wdio/types": "8.0.0-alpha.577+73cd77ef7",
+    "@wdio/utils": "8.0.0-alpha.577+73cd77ef7",
     "async-exit-hook": "^2.0.1",
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
     "cli-spinners": "^2.6.1",
     "ejs": "^3.1.8",
+    "import-meta-resolve": "^2.1.0",
     "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": "8.0.0-alpha.565+9959d0e91",
+    "webdriverio": "8.0.0-alpha.577+73cd77ef7",
     "yargs": "^17.5.1",
     "yarn-install": "^1.0.0"
   },
@@ -67,5 +68,5 @@
   "devDependencies": {
     "@types/node": "^18.0.0"
   },
-  "gitHead": "9959d0e91c0f7d2991a5a0c1eb34d288894dae74"
+  "gitHead": "73cd77ef7887819c56dc98932a0c34e8af10b64a"
 }