@wdio/config 7.0.4 → 7.2.1

package/build/constants.d.ts

@@ -2,5 +2,4 @@ import { Options, Services } from '@wdio/types';
 export declare const DEFAULT_CONFIGS: () => Omit<Options.Testrunner, 'capabilities'>;
 export declare const SUPPORTED_HOOKS: (keyof Services.Hooks)[];
 export declare const SUPPORTED_FILE_EXTENSIONS: string[];
-export declare const DEFAULT_AUTOCOMPILE_CONFIGS: () => Options.AutoCompileConfig;
 //# sourceMappingURL=constants.d.ts.map

package/build/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAM/C,eAAO,MAAM,eAAe,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAuEzE,CAAA;AAEF,eAAO,MAAM,eAAe,EAAE,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,EAMnD,CAAA;AAED,eAAO,MAAM,yBAAyB,UAErC,CAAA;AAED,eAAO,MAAM,2BAA2B,EAAE,MAAM,OAAO,CAAC,iBAMtD,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAM/C,eAAO,MAAM,eAAe,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CA8EzE,CAAA;AAEF,eAAO,MAAM,eAAe,EAAE,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,EAMnD,CAAA;AAED,eAAO,MAAM,yBAAyB,UAErC,CAAA"}

package/build/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_AUTOCOMPILE_CONFIGS = exports.SUPPORTED_FILE_EXTENSIONS = exports.SUPPORTED_HOOKS = exports.DEFAULT_CONFIGS = void 0;
+exports.SUPPORTED_FILE_EXTENSIONS = exports.SUPPORTED_HOOKS = exports.DEFAULT_CONFIGS = void 0;
 const DEFAULT_TIMEOUT = 10000;
 /* istanbul ignore next */
 exports.DEFAULT_CONFIGS = () => ({
@@ -31,13 +31,20 @@ exports.DEFAULT_CONFIGS = () => ({
     reporterSyncInterval: 100,
     reporterSyncTimeout: 5000,
     cucumberFeaturesWithLineNumbers: [],
+    autoCompileOpts: {
+        autoCompile: true,
+        tsNodeOpts: {
+            transpileOnly: true
+        },
+        babelOpts: {}
+    },
     /**
      * framework defaults
      */
     mochaOpts: {
         timeout: DEFAULT_TIMEOUT
     },
-    jasmineNodeOpts: {
+    jasmineOpts: {
         defaultTimeoutInterval: DEFAULT_TIMEOUT
     },
     cucumberOpts: {
@@ -82,10 +89,3 @@ exports.SUPPORTED_HOOKS = [
 exports.SUPPORTED_FILE_EXTENSIONS = [
     '.js', '.mjs', '.es6', '.ts', '.feature', '.coffee', '.cjs'
 ];
-exports.DEFAULT_AUTOCOMPILE_CONFIGS = () => ({
-    autoCompile: true,
-    tsNodeOpts: {
-        transpileOnly: true
-    },
-    babelOpts: {}
-});

package/build/lib/ConfigParser.d.ts

@@ -28,7 +28,6 @@ interface Globber {
 export interface PathService extends CurrentPathFinder, LoadConfigFile, IsFileDetector, Globber, DeterminesAbsolutePath {
 }
 export default class ConfigParser {
-    private _autocompileConfig;
     private _config;
     private _capabilities;
     private _pathService;

package/build/lib/ConfigParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/lib/ConfigParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAElE,OAAO,EAEgB,oBAAoB,EAC1C,MAAM,UAAU,CAAA;AAcjB,UAAU,+BAAgC,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACtF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAAA;CACjD;AAED,UAAU,WAAY,SAAQ,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7F,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC9B;AAGD,UAAU,iBAAiB;IACvB,MAAM,IAAI,MAAM,CAAA;CACnB;AAGD,UAAU,cAAc;IACpB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAAA;CAC/B;AAGD,UAAU,cAAc;IACpB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC;AAED,UAAU,sBAAsB;IAC5B,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAC3C;AAGD,UAAU,OAAO;IACb,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,WAAY,SAAQ,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,sBAAsB;CAAG;AAE1H,MAAM,CAAC,OAAO,OAAO,YAAY;IAC7B,OAAO,CAAC,kBAAkB,CAA4D;IACtF,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,qBAAqB,CAAuB;gBAExC,WAAW,GAAE,WAAyC,EAAE,oBAAoB,GAAC,oBAA2C;IAKpI,WAAW;IAWX;;;OAGG;IACH,aAAa,CAAE,QAAQ,EAAE,MAAM;IAuD/B;;;OAGG;IACH,KAAK,CAAE,MAAM,GAAE,WAAgB;IA6C/B;;;OAGG;IACH,UAAU,CAAE,OAAO,EAAE,QAAQ,CAAC,KAAK;IA+BnC;;OAEG;IACH,QAAQ,CAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE;IAqDpD;;;;;;;;OAQG;IACH,0BAA0B,CAAE,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;IAwBtE;;OAEG;IACH,SAAS;IAIT;;OAEG;IACH,eAAe,CAAE,CAAC,CAAC,EAAE,MAAM;IAQ3B;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,WAAW,GAAE,iBAAiB,GAAG,OAAO,GAAG,sBAAoD;CA8BnK"}
+{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/lib/ConfigParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAElE,OAAO,EAEgB,oBAAoB,EAC1C,MAAM,UAAU,CAAA;AAajB,UAAU,+BAAgC,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACtF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAAA;CACjD;AAED,UAAU,WAAY,SAAQ,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7F,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC9B;AAGD,UAAU,iBAAiB;IACvB,MAAM,IAAI,MAAM,CAAA;CACnB;AAGD,UAAU,cAAc;IACpB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAAA;CAC/B;AAGD,UAAU,cAAc;IACpB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC;AAED,UAAU,sBAAsB;IAC5B,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAC3C;AAGD,UAAU,OAAO;IACb,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,WAAY,SAAQ,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,sBAAsB;CAAG;AAE1H,MAAM,CAAC,OAAO,OAAO,YAAY;IAC7B,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,qBAAqB,CAAuB;gBAExC,WAAW,GAAE,WAAyC,EAAE,oBAAoB,GAAC,oBAA2C;IAKpI,WAAW;IASX;;;OAGG;IACH,aAAa,CAAE,QAAQ,EAAE,MAAM;IA+C/B;;;OAGG;IACH,KAAK,CAAE,MAAM,GAAE,WAAgB;IAwC/B;;;OAGG;IACH,UAAU,CAAE,OAAO,EAAE,QAAQ,CAAC,KAAK;IA+BnC;;OAEG;IACH,QAAQ,CAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE;IAqDpD;;;;;;;;OAQG;IACH,0BAA0B,CAAE,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;IAwBtE;;OAEG;IACH,SAAS;IAIT;;OAEG;IACH,eAAe,CAAE,CAAC,CAAC,EAAE,MAAM;IAQ3B;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,WAAW,GAAE,iBAAiB,GAAG,OAAO,GAAG,sBAAoD;CA8BnK"}

package/build/lib/ConfigParser.js

@@ -14,7 +14,6 @@ const log = logger_1.default('@wdio/config:ConfigParser');
 const MERGE_OPTIONS = { clone: false };
 class ConfigParser {
     constructor(pathService = new FileSystemPathService_1.default(), moduleRequireService = new RequireLibrary_1.default()) {
-        this._autocompileConfig = constants_1.DEFAULT_AUTOCOMPILE_CONFIGS();
         this._config = __1.DEFAULT_CONFIGS();
         this._capabilities = [];
         this._pathService = pathService;
@@ -24,10 +23,8 @@ class ConfigParser {
         /**
          * on launcher compile files if Babel or TypeScript are installed using our defaults
          */
-        if (!utils_1.loadAutoCompilers(this._autocompileConfig, this._moduleRequireService)) {
-            if (this._autocompileConfig.autoCompile) {
-                log.debug('No compiler found, continue without compiling files');
-            }
+        if (this._config.autoCompileOpts && !utils_1.loadAutoCompilers(this._config.autoCompileOpts, this._moduleRequireService)) {
+            log.debug('No compiler found, continue without compiling files');
         }
     }
     /**
@@ -44,13 +41,6 @@ class ConfigParser {
             if (typeof config !== 'object') {
                 throw new Error('addConfigEntry requires config key');
             }
-            /**
-             * on launcher compile files if Babel or TypeScript are installed using our defaults
-             */
-            // Merge in config over defaults
-            if (config.autoCompileOpts) {
-                this._autocompileConfig = deepmerge_1.default(this._autocompileConfig, config.autoCompileOpts, MERGE_OPTIONS);
-            }
             /**
              * clone the original config
              */
@@ -88,10 +78,6 @@ class ConfigParser {
         const spec = Array.isArray(object.spec) ? object.spec : [];
         const exclude = Array.isArray(object.exclude) ? object.exclude : [];
         this._config = deepmerge_1.default(this._config, object, MERGE_OPTIONS);
-        // Merge in config over defaults
-        if (object.autoCompileOpts) {
-            this._autocompileConfig = deepmerge_1.default(this._autocompileConfig, object.autoCompileOpts, MERGE_OPTIONS);
-        }
         /**
          * overwrite config specs that got piped into the wdio command
          */

package/build/utils.d.ts

@@ -29,6 +29,6 @@ export interface ModuleRequireService {
     require<T>(module: string): T;
 }
 export declare function loadAutoCompilers(autoCompileConfig: Options.AutoCompileConfig, requireService: ModuleRequireService): boolean | undefined;
-export declare function loadTypeScriptCompiler(tsNodeOpts: RegisterOptions | undefined, requireService: ModuleRequireService): boolean;
+export declare function loadTypeScriptCompiler(tsNodeOpts: RegisterOptions | undefined, tsConfigPathsOpts: Options.TSConfigPathsOptions | undefined, requireService: ModuleRequireService): boolean;
 export declare function loadBabelCompiler(babelOpts: Record<string, any> | undefined, requireService: ModuleRequireService): boolean;
 //# sourceMappingURL=utils.d.ts.map

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,kBAAkB,WAAY,GAAG,6BACoB,CAAA;AAElE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,UAMjD;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,WAGtE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,CAAC,YAAY,WAEhE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,cAAoB,KA+C5G;AAED,MAAM,WAAW,oBAAoB;IACjC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAAE,GAAG,MAAM,CAAA;IACjE,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;CACjC;AAED,wBAAgB,iBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,uBAMnH;AAED,wBAAgB,sBAAsB,CAAE,UAAU,6BAAsB,EAAE,cAAc,EAAE,oBAAoB,WAS7G;AAED,wBAAgB,iBAAiB,CAAE,SAAS,iCAA0B,EAAE,cAAc,EAAE,oBAAoB,WAiB3G"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,kBAAkB,WAAY,GAAG,6BACoB,CAAA;AAElE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,UAMjD;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,WAGtE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,CAAC,YAAY,WAEhE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,cAAoB,KA+C5G;AAED,MAAM,WAAW,oBAAoB;IACjC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAAE,GAAG,MAAM,CAAA;IACjE,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;CACjC;AAED,wBAAgB,iBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,uBAgBnH;AAED,wBAAgB,sBAAsB,CAClC,UAAU,6BAAsB,EAChC,iBAAiB,EAAE,OAAO,CAAC,oBAAoB,GAAG,SAAS,EAC3D,cAAc,EAAE,oBAAoB,WAiBvC;AAED,wBAAgB,iBAAiB,CAAE,SAAS,iCAA0B,EAAE,cAAc,EAAE,oBAAoB,WAiB3G"}

package/build/utils.js

@@ -85,16 +85,22 @@ function validateConfig(defaults, options, keysToKeep = []) {
 }
 exports.validateConfig = validateConfig;
 function loadAutoCompilers(autoCompileConfig, requireService) {
-    return autoCompileConfig.autoCompile && (loadTypeScriptCompiler(autoCompileConfig.tsNodeOpts, requireService)
-        ||
-            loadBabelCompiler(autoCompileConfig.babelOpts, requireService));
+    return (autoCompileConfig.autoCompile &&
+        (loadTypeScriptCompiler(autoCompileConfig.tsNodeOpts, autoCompileConfig.tsConfigPathsOpts, requireService)
+            ||
+                loadBabelCompiler(autoCompileConfig.babelOpts, requireService)));
 }
 exports.loadAutoCompilers = loadAutoCompilers;
-function loadTypeScriptCompiler(tsNodeOpts = {}, requireService) {
+function loadTypeScriptCompiler(tsNodeOpts = {}, tsConfigPathsOpts, requireService) {
     try {
         requireService.resolve('ts-node');
         requireService.require('ts-node').register(tsNodeOpts);
         log.debug('Found \'ts-node\' package, auto-compiling TypeScript files');
+        if (tsConfigPathsOpts) {
+            log.debug('Found \'tsconfig-paths\' options, register paths');
+            const tsConfigPaths = require('tsconfig-paths');
+            tsConfigPaths.register(tsConfigPathsOpts);
+        }
         return true;
     }
     catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/config",
-  "version": "7.0.4",
+  "version": "7.2.1",
   "description": "A helper utility to parse and validate WebdriverIO options",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-config",
@@ -24,7 +24,7 @@
   "types": "./build/index.d.ts",
   "dependencies": {
     "@wdio/logger": "7.0.0",
-    "@wdio/types": "7.0.4",
+    "@wdio/types": "7.2.1",
     "deepmerge": "^4.0.0",
     "glob": "^7.1.2"
   },
@@ -32,7 +32,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "minimatch": "^3.0.4"
+    "minimatch": "^3.0.4",
+    "tsconfig-paths": "^3.9.0"
   },
-  "gitHead": "932f9694dc1cb3239b2f0b1eab73834419f2fe48"
+  "gitHead": "aa35412bc2f9a1591ace955f91ee7e7eef278ee5"
 }