Skip to content

Commit e4977a6

Browse files
committed
Replace deepmerge with lodash.merge
1 parent 41736c8 commit e4977a6

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"prepublish": "yarn run lint && yarn run test && yarn run build"
5858
},
5959
"dependencies": {
60-
"deepmerge": "^1.5.1"
60+
"lodash.merge": "^4.6.0"
6161
},
6262
"peerDependencies": {
6363
"chart.js": "^2.6.0",

src/helpers/options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import merge from 'deepmerge'
1+
import merge from 'lodash.merge'
22

33
export function mergeOptions (obj, src) {
44
return merge(obj, src)

test/unit/specs/helpers/options.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ describe('mergeOptions.js', () => {
4141

4242
it('should add c if c is new', () => {
4343
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')
4646
expect(ac).to.have.property('c').and.to.equal('c')
4747
})
4848

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,10 +1663,6 @@ deep-is@~0.1.3:
16631663
version "0.1.3"
16641664
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
16651665

1666-
deepmerge@^1.5.1:
1667-
version "1.5.1"
1668-
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.1.tgz#c053bf06fd7276f1994f70c09a0760cb61a56237"
1669-
16701666
defined@^1.0.0:
16711667
version "1.0.0"
16721668
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -3548,6 +3544,10 @@ lodash.keysin@^4.0.0:
35483544
version "4.2.0"
35493545
resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28"
35503546

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+
35513551
lodash.mergewith@^4.0.0, lodash.mergewith@^4.6.0:
35523552
version "4.6.0"
35533553
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"

0 commit comments

Comments
 (0)