fix: enable merge option for yaml parser (#3577)

This commit is contained in:
Bartholomew 2020-04-10 22:50:05 +01:00 committed by GitHub
parent b9d6632203
commit b8eeab2e35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -119,7 +119,7 @@ function mergePreloadedConfig(preloadedConfig, loadedConfig) {
}
function parseConfig(data) {
const config = yaml.parse(data, { maxAliasCount: -1, prettyErrors: true });
const config = yaml.parse(data, { maxAliasCount: -1, prettyErrors: true, merge: true });
if (typeof CMS_ENV === 'string' && config[CMS_ENV]) {
Object.keys(config[CMS_ENV]).forEach(key => {
config[key] = config[CMS_ENV][key];