Skip to content

Commit 5dc655a

Browse files
authored
Merge pull request #191 from apertureless/feature/deepmerge
Replace Object.assign with deepmerge
2 parents 46569a8 + 3d29199 commit 5dc655a

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"presets": ["es2015", "stage-2"],
3-
"plugins": ["transform-runtime", "transform-object-assign"],
3+
"plugins": ["transform-runtime"],
44
"comments": false
55
}

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
"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",
5757
"prepublish": "yarn run lint && yarn run test && yarn run build"
5858
},
59-
"dependencies": {},
59+
"dependencies": {
60+
"deepmerge": "^1.5.1"
61+
},
6062
"peerDependencies": {
6163
"chart.js": "^2.6.0",
6264
"vue": "^2.4.2"

src/helpers/options.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import merge from 'deepmerge'
2+
13
export function mergeOptions (obj, src) {
2-
let mutableObj = Object.assign({}, obj)
3-
return Object.assign(mutableObj, src)
4+
return merge(obj, src)
45
}

yarn.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,10 @@ 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+
16661670
defined@^1.0.0:
16671671
version "1.0.0"
16681672
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"

0 commit comments

Comments
 (0)