diff --git a/lib/load-parser-config.js b/lib/load-parser-config.js index 8c4bbdbd..44163652 100644 --- a/lib/load-parser-config.js +++ b/lib/load-parser-config.js @@ -22,18 +22,12 @@ export default async ({ preset, config, parserOpts, presetConfig }, { cwd }) => if (preset) { const presetPackage = `conventional-changelog-${preset.toLowerCase()}`; - loadedConfig = (importFrom.silent(__dirname, presetPackage) || importFrom(cwd, presetPackage))(); + loadedConfig = await (importFrom.silent(__dirname, presetPackage) || importFrom(cwd, presetPackage))(presetConfig); } else if (config) { - loadedConfig = (importFrom.silent(__dirname, config) || importFrom(cwd, config))(); + loadedConfig = await (importFrom.silent(__dirname, config) || importFrom(cwd, config))(); } else { - loadedConfig = conventionalChangelogAngular(); + loadedConfig = await conventionalChangelogAngular(); } - loadedConfig = await (typeof loadedConfig === "function" - ? isPlainObject(presetConfig) - ? loadedConfig(presetConfig) - : promisify(loadedConfig)() - : loadedConfig); - return { ...loadedConfig.parserOpts, ...parserOpts }; };