@best/config
Advanced tools
Comparing version 4.0.0-beta4 to 4.0.0-beta5
@@ -20,3 +20,3 @@ "use strict"; | ||
}, | ||
metrics: ['script', 'aggregate', 'paint', 'layout', 'system', 'idle'], | ||
metrics: ['aggregate', 'script', 'recalculatestyles', 'layout', 'updatelayertree', 'paint', 'compositelayers', 'system', 'idle'], | ||
cacheDirectory: utils_1.cacheDirectory(), | ||
@@ -23,0 +23,0 @@ useHttp: false, |
@@ -27,12 +27,13 @@ "use strict"; | ||
if (runner === "default") { | ||
if (!defaultRunners.length) { | ||
throw new Error('No default runner found'); | ||
if (defaultRunners.length) { | ||
return defaultRunners[0].runner; | ||
} | ||
return defaultRunners[0].runner; | ||
} | ||
const selectedRunner = runners.find((c) => c.alias === runner || c.runner === runner); | ||
if (!selectedRunner) { | ||
throw new Error(`Unable to find a runner for ${runner}`); | ||
else { | ||
const selectedRunner = runners.find((c) => c.alias === runner || c.runner === runner); | ||
if (selectedRunner) { | ||
return selectedRunner.runner; | ||
} | ||
} | ||
return selectedRunner.runner; | ||
return 'unknown'; | ||
} | ||
@@ -43,23 +44,17 @@ function normalizeRunnerConfig(runner, runners, specs) { | ||
} | ||
let selectedRunner; | ||
if (runner === "default") { | ||
const defaultRunners = runners.filter((c) => c.alias === undefined || c.alias === 'default'); | ||
if (defaultRunners.length > 0) { | ||
const selectedRunner = defaultRunners[0]; | ||
const selectedRunnerConfig = selectedRunner.config ? selectedRunner.config : {}; | ||
return { | ||
...selectedRunnerConfig, | ||
specs: selectedRunner.specs || specs | ||
}; | ||
selectedRunner = defaultRunners[0]; | ||
} | ||
} | ||
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}`); | ||
else { | ||
const selectedAliasRunner = runners.find((c) => c.alias === runner); | ||
selectedRunner = selectedAliasRunner || runners.find((c) => c.runner === runner); | ||
} | ||
const selectedRunnerConfig = selectedRunner.config || {}; | ||
return { | ||
...selectedRunnerConfig, | ||
specs: selectedRunner.specs || specs | ||
}; | ||
if (selectedRunner) { | ||
const selectedRunnerConfig = selectedRunner.config || {}; | ||
return { ...selectedRunnerConfig, specs: selectedRunner.specs || specs }; | ||
} | ||
} | ||
@@ -66,0 +61,0 @@ function setCliOptionOverrides(initialOptions, argsCLI) { |
@@ -7,3 +7,3 @@ { | ||
}, | ||
"version": "4.0.0-beta4", | ||
"version": "4.0.0-beta5", | ||
"description": "Best config", | ||
@@ -17,4 +17,4 @@ "keywords": [ | ||
"dependencies": { | ||
"@best/regex-util": "4.0.0-beta4", | ||
"@best/utils": "4.0.0-beta4", | ||
"@best/regex-util": "4.0.0-beta5", | ||
"@best/utils": "4.0.0-beta5", | ||
"chalk": "~2.4.2", | ||
@@ -26,3 +26,3 @@ "simple-git": "~1.113.0" | ||
], | ||
"gitHead": "67f6d08521b7c5bb1eb314e3f287bb712721da03" | ||
"gitHead": "f42d23b357331db3b065cb25c610292aade7a43a" | ||
} |
23332
550
+ Added@best/regex-util@4.0.0-beta5(transitive)
+ Added@best/utils@4.0.0-beta5(transitive)
- Removed@best/regex-util@4.0.0-beta4(transitive)
- Removed@best/utils@4.0.0-beta4(transitive)
Updated@best/regex-util@4.0.0-beta5
Updated@best/utils@4.0.0-beta5