KevinMidboe/vue-chartjs
1
0
Fork 0
mirror of https://github.com/KevinMidboe/vue-chartjs.git synced 2025-10-29 18:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace deepmerge with lodash.merge

Browse Source
This commit is contained in:
Jakub Juszczak
2017-09-12 10:53:31 +02:00
parent 41736c840d
commit e4977a6be7
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -57,7 +57,7 @@
"prepublish": "yarn run lint && yarn run test && yarn run build" "prepublish": "yarn run lint && yarn run test && yarn run build"
}, },
"dependencies": { "dependencies": {
"deepmerge": "^1.5.1" "lodash.merge": "^4.6.0"
}, },
"peerDependencies": { "peerDependencies": {
"chart.js": "^2.6.0", "chart.js": "^2.6.0",

2
src/helpers/options.js
View File

@@ -1,4 +1,4 @@
import merge from 'deepmerge' import merge from 'lodash.merge'
export function mergeOptions (obj, src) { export function mergeOptions (obj, src) {
return merge(obj, src) return merge(obj, src)

4
test/unit/specs/helpers/options.spec.js
View File

@@ -41,8 +41,8 @@ describe('mergeOptions.js', () => {
it('should add c if c is new', () => { it('should add c if c is new', () => {
const ac = mergeOptions(a, c) const ac = mergeOptions(a, c)
expect(ac).to.have.property('a').and.to.equal('a') expect(ac).to.have.property('a').and.to.equal('b')
expect(ac).to.have.property('b').and.to.equal('a') expect(ac).to.have.property('b').and.to.equal('b')
expect(ac).to.have.property('c').and.to.equal('c') expect(ac).to.have.property('c').and.to.equal('c')
}) })

8
yarn.lock
View File

@@ -1663,10 +1663,6 @@ deep-is@~0.1.3:
version "0.1.3" version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" 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: defined@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -3548,6 +3544,10 @@ lodash.keysin@^4.0.0:
version "4.2.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28" 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: lodash.mergewith@^4.0.0, lodash.mergewith@^4.6.0:
version "4.6.0" version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"