From 750abb2e8820538e9eafe36db2e36fef8a50ffa6 Mon Sep 17 00:00:00 2001 From: Jakub Juszczak Date: Fri, 8 Sep 2017 09:59:37 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20Add=20dependency=20deepmerge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +++- src/helpers/options.js | 5 +++-- yarn.lock | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b2dc90a..3502f2d 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,9 @@ "release": "webpack --progress --hide-modules --config ./build/webpack.release.js && NODE_ENV=production webpack --progress --hide-modules --config ./build/webpack.release.min.js && webpack --progress --hide-modules --config ./build/webpack.release.full.js && NODE_ENV=production webpack --progress --hide-modules --config ./build/webpack.release.full.min.js", "prepublish": "yarn run lint && yarn run test && yarn run build" }, - "dependencies": {}, + "dependencies": { + "deepmerge": "^1.5.1" + }, "peerDependencies": { "chart.js": "^2.6.0", "vue": "^2.4.2" diff --git a/src/helpers/options.js b/src/helpers/options.js index 8e3645d..99769c8 100644 --- a/src/helpers/options.js +++ b/src/helpers/options.js @@ -1,4 +1,5 @@ +import merge from 'deepmerge' + export function mergeOptions (obj, src) { - let mutableObj = Object.assign({}, obj) - return Object.assign(mutableObj, src) + return merge(obj, src) } diff --git a/yarn.lock b/yarn.lock index 17a1a0a..ebd70f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1663,6 +1663,10 @@ 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"