Skip to content

Commit a8b980a

Browse files
committed
fix: handle precedence and defaults correctly
1 parent 83314bb commit a8b980a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.conventional-changelog-lintrc

-4
This file was deleted.

source/library/get-configuration.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import merge from 'lodash.merge';
2+
import pick from 'lodash.pick';
23
import rc from 'rc';
34

5+
const defaults = {
6+
extends: ['angular']
7+
};
8+
49
// Resolve extend configs
510
function resolveExtends(config, prefix = '', key = 'extends') {
611
return Object.values(config[key] || [])
@@ -21,5 +26,10 @@ export default (name = 'conventional-changelog-lint', settings = {
2126
prefix: 'conventional-changelog-lint-config'
2227
}, seed = {}) => {
2328
const config = merge(rc(name, settings.defaults), seed);
24-
return resolveExtends(config, settings.prefix);
29+
const opts = merge({}, defaults, pick(config, ['extends']));
30+
return merge(
31+
{},
32+
resolveExtends(opts, settings.prefix),
33+
config
34+
);
2535
};

0 commit comments

Comments
 (0)