Comparing version 0.4.0-alpha25 to 0.4.0-alpha26
@@ -88,7 +88,4 @@ "use strict"; | ||
validateConfig(this._config); | ||
this._config = { | ||
...this._defaultConfig, | ||
...this._config, | ||
use: { ...this._defaultConfig.use, ...this._config.use }, | ||
}; | ||
const configUse = util_1.mergeObjects(this._defaultConfig.use, this._config.use); | ||
this._config = util_1.mergeObjects(util_1.mergeObjects(this._defaultConfig, this._config), { use: configUse }); | ||
if ('testDir' in this._config && !path.isAbsolute(this._config.testDir)) | ||
@@ -184,3 +181,3 @@ this._config.testDir = path.resolve(rootDir, this._config.testDir); | ||
timeout: takeFirst(this._configOverrides.timeout, projectConfig.timeout, this._config.timeout, 10000), | ||
use: { ...this._config.use, ...projectConfig.use, ...this._configOverrides.use }, | ||
use: util_1.mergeObjects(util_1.mergeObjects(this._config.use, projectConfig.use), this._configOverrides.use), | ||
}; | ||
@@ -187,0 +184,0 @@ this._projects.push(new project_1.ProjectImpl(fullProject, this._projects.length)); |
{ | ||
"name": "folio", | ||
"version": "0.4.0-alpha25", | ||
"version": "0.4.0-alpha26", | ||
"bin": { | ||
@@ -5,0 +5,0 @@ "folio": "./cli.js" |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
355030
7887