@best/config
Advanced tools
Comparing version 4.0.0-alpha9 to 4.0.0-beta1
@@ -28,2 +28,3 @@ "use strict"; | ||
rootProjectName: options.projectName, | ||
runInBand: options.runInBand, | ||
nonFlagArgs: options.nonFlagArgs, | ||
@@ -30,0 +31,0 @@ gitInfo: gitInfo, |
@@ -14,2 +14,3 @@ "use strict"; | ||
commentThreshold: 5, | ||
specs: undefined, | ||
generateHTML: false, | ||
@@ -35,2 +36,3 @@ apiDatabase: { | ||
projects: [], | ||
runInBand: false, | ||
runnerConfig: {}, | ||
@@ -37,0 +39,0 @@ benchmarkEnvironment: 'production', |
@@ -38,3 +38,3 @@ "use strict"; | ||
} | ||
function normalizeRunnerConfig(runner, runners) { | ||
function normalizeRunnerConfig(runner, runners, specs) { | ||
if (!runners) { | ||
@@ -49,7 +49,12 @@ return {}; | ||
} | ||
const selectedRunner = runners.find((c) => c.alias === runner || c.runner === runner); | ||
const selectedAliasRunner = runners.find((c) => c.alias === runner); | ||
const selectedRunner = selectedAliasRunner || runners.find((c) => c.runner === runner); | ||
if (!selectedRunner) { | ||
throw new Error(`Unable to find a runner for ${runner}`); | ||
} | ||
return selectedRunner ? selectedRunner.config : {}; | ||
const selectedRunnerConfig = selectedRunner.config || {}; | ||
return { | ||
...selectedRunnerConfig, | ||
specs: selectedRunner.specs || specs | ||
}; | ||
} | ||
@@ -72,2 +77,5 @@ function setCliOptionOverrides(initialOptions, argsCLI) { | ||
break; | ||
case 'runInBand': | ||
options.runInBand = !!argsCLI[key]; | ||
break; | ||
case 'projects': | ||
@@ -163,2 +171,3 @@ if (argsCLI.projects && argsCLI.projects.length) { | ||
const normalizedConfig = { ...defaults_1.default, ...userCliMergedConfig }; | ||
const aliasRunner = normalizedConfig.runner; | ||
Object.keys(normalizedConfig).reduce((mergeConfig, key) => { | ||
@@ -172,11 +181,14 @@ switch (key) { | ||
break; | ||
case 'runnerConfig': | ||
mergeConfig['runnerConfig'] = normalizeRunnerConfig(aliasRunner, mergeConfig.runners, mergeConfig.specs); | ||
break; | ||
case 'runner': | ||
mergeConfig[key] = normalizeRunner(normalizedConfig[key], mergeConfig.runners); | ||
break; | ||
case 'runnerConfig': | ||
mergeConfig[key] = normalizeRunnerConfig(normalizedConfig['runner'], mergeConfig.runners); | ||
break; | ||
case 'compareStats': | ||
mergeConfig[key] = normalizeCommits(normalizedConfig[key]); | ||
break; | ||
case 'specs': | ||
mergeConfig[key] = normalizedConfig['runnerConfig'].specs || mergeConfig[key]; | ||
break; | ||
case 'apiDatabase': { | ||
@@ -183,0 +195,0 @@ const apiDatabaseConfig = normalizedConfig[key]; |
@@ -7,3 +7,3 @@ { | ||
}, | ||
"version": "4.0.0-alpha9", | ||
"version": "4.0.0-beta1", | ||
"description": "Best config", | ||
@@ -17,4 +17,4 @@ "keywords": [ | ||
"dependencies": { | ||
"@best/regex-util": "4.0.0-alpha9", | ||
"@best/utils": "4.0.0-alpha9", | ||
"@best/regex-util": "4.0.0-beta1", | ||
"@best/utils": "4.0.0-beta1", | ||
"chalk": "~2.4.2", | ||
@@ -26,3 +26,3 @@ "simple-git": "~1.113.0" | ||
], | ||
"gitHead": "6b3e5ae79feebd37eece19a9b6bc6b2d8e897d59" | ||
"gitHead": "4d06a44b069fcefaf95ea845a61bb99ac4254405" | ||
} |
23399
550
8
+ Added@best/regex-util@4.0.0-beta1(transitive)
+ Added@best/utils@4.0.0-beta1(transitive)
- Removed@best/regex-util@4.0.0-alpha9(transitive)
- Removed@best/utils@4.0.0-alpha9(transitive)
Updated@best/regex-util@4.0.0-beta1
Updated@best/utils@4.0.0-beta1