diff --git a/package.json b/package.json index 7d6ae4c..b5446bd 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/helpers/options.js b/src/helpers/options.js index 99769c8..ccae233 100644 --- a/src/helpers/options.js +++ b/src/helpers/options.js @@ -1,4 +1,4 @@ -import merge from 'deepmerge' +import merge from 'lodash.merge' export function mergeOptions (obj, src) { return merge(obj, src) diff --git a/test/unit/specs/helpers/options.spec.js b/test/unit/specs/helpers/options.spec.js index 47cefb9..ce01e21 100644 --- a/test/unit/specs/helpers/options.spec.js +++ b/test/unit/specs/helpers/options.spec.js @@ -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') }) diff --git a/yarn.lock b/yarn.lock index ebd70f2..459a64e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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"