File tree Expand file tree Collapse file tree 2 files changed +1
-3
lines changed Expand file tree Collapse file tree 2 files changed +1
-3
lines changed Original file line number Diff line number Diff line change 1
1
var _ = require ( 'lodash' ) ;
2
2
var fs = require ( 'fs' ) ;
3
3
var path = require ( 'path' ) ;
4
- var extend = require ( 'deep-extend' ) ;
5
4
var osHomedir = require ( 'os-homedir' ) ;
6
5
7
6
var config = null ;
@@ -30,7 +29,7 @@ function load() {
30
29
/*eslint-enable */
31
30
}
32
31
33
- var merged = extend ( defaultConfig , customConfig ) ;
32
+ var merged = _ . defaultsDeep ( customConfig , defaultConfig ) ;
34
33
var errors = _ . map ( merged . colors , validateColor ) ;
35
34
errors . push ( validatePlatform ( merged . platform ) ) ;
36
35
errors = _ . compact ( errors ) ;
Original file line number Diff line number Diff line change 50
50
"colors" : " ~1.1.2" ,
51
51
"commander" : " ~2.9.0" ,
52
52
"cpr" : " ~1.0.0" ,
53
- "deep-extend" : " ~0.4.0" ,
54
53
"lodash" : " ~3.10.1" ,
55
54
"marked" : " ~0.3.5" ,
56
55
"mkdirp" : " ~0.5.1" ,
You can’t perform that action at this time.
0 commit comments