Skip to content

Commit

Permalink
Replace deepmerge with lodash.merge
Browse files Browse the repository at this point in the history
  • Loading branch information
apertureless committed Sep 12, 2017
1 parent 41736c8 commit e4977a6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"prepublish": "yarn run lint && yarn run test && yarn run build"
},
"dependencies": {
"deepmerge": "^1.5.1"
"lodash.merge": "^4.6.0"
},
"peerDependencies": {
"chart.js": "^2.6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/options.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import merge from 'deepmerge'
import merge from 'lodash.merge'

export function mergeOptions (obj, src) {
return merge(obj, src)
Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/helpers/options.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ describe('mergeOptions.js', () => {

it('should add c if c is new', () => {
const ac = mergeOptions(a, c)
expect(ac).to.have.property('a').and.to.equal('a')
expect(ac).to.have.property('b').and.to.equal('a')
expect(ac).to.have.property('a').and.to.equal('b')
expect(ac).to.have.property('b').and.to.equal('b')
expect(ac).to.have.property('c').and.to.equal('c')
})

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1663,10 +1663,6 @@ deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"

deepmerge@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.1.tgz#c053bf06fd7276f1994f70c09a0760cb61a56237"

defined@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
Expand Down Expand Up @@ -3548,6 +3544,10 @@ lodash.keysin@^4.0.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28"

lodash.merge@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"

lodash.mergewith@^4.0.0, lodash.mergewith@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
Expand Down

0 comments on commit e4977a6

Please sign in to comment.