File tree 4 files changed +8
-8
lines changed
4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 57
57
"prepublish" : " yarn run lint && yarn run test && yarn run build"
58
58
},
59
59
"dependencies" : {
60
- "deepmerge " : " ^1.5.1 "
60
+ "lodash.merge " : " ^4.6.0 "
61
61
},
62
62
"peerDependencies" : {
63
63
"chart.js" : " ^2.6.0" ,
Original file line number Diff line number Diff line change 1
- import merge from 'deepmerge '
1
+ import merge from 'lodash.merge '
2
2
3
3
export function mergeOptions ( obj , src ) {
4
4
return merge ( obj , src )
Original file line number Diff line number Diff line change @@ -41,8 +41,8 @@ describe('mergeOptions.js', () => {
41
41
42
42
it ( 'should add c if c is new' , ( ) => {
43
43
const ac = mergeOptions ( a , c )
44
- expect ( ac ) . to . have . property ( 'a' ) . and . to . equal ( 'a ' )
45
- expect ( ac ) . to . have . property ( 'b' ) . and . to . equal ( 'a ' )
44
+ expect ( ac ) . to . have . property ( 'a' ) . and . to . equal ( 'b ' )
45
+ expect ( ac ) . to . have . property ( 'b' ) . and . to . equal ( 'b ' )
46
46
expect ( ac ) . to . have . property ( 'c' ) . and . to . equal ( 'c' )
47
47
} )
48
48
Original file line number Diff line number Diff line change @@ -1663,10 +1663,6 @@ deep-is@~0.1.3:
1663
1663
version "0.1.3"
1664
1664
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
1665
1665
1666
- deepmerge@^1.5.1 :
1667
- version "1.5.1"
1668
- resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.1.tgz#c053bf06fd7276f1994f70c09a0760cb61a56237"
1669
-
1670
1666
defined@^1.0.0 :
1671
1667
version "1.0.0"
1672
1668
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -3548,6 +3544,10 @@ lodash.keysin@^4.0.0:
3548
3544
version "4.2.0"
3549
3545
resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28"
3550
3546
3547
+ lodash.merge@^4.6.0 :
3548
+ version "4.6.0"
3549
+ resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
3550
+
3551
3551
lodash.mergewith@^4.0.0, lodash.mergewith@^4.6.0 :
3552
3552
version "4.6.0"
3553
3553
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
You can’t perform that action at this time.
0 commit comments