Compare commits

..

5 Commits

Author SHA1 Message Date
Jakub Juszczak
4c37616d00 v2.8.4 2017-09-08 10:15:31 +02:00
Jakub
5dc655a47a Merge pull request #191 from apertureless/feature/deepmerge
Replace Object.assign with deepmerge
2017-09-08 10:13:47 +02:00
Jakub Juszczak
3d291996f6 🔥 Remove transform-object-assign 2017-09-08 10:02:38 +02:00
Jakub Juszczak
750abb2e88 Add dependency deepmerge 2017-09-08 09:59:37 +02:00
Jakub Juszczak
46569a89cb 📝 Update CHANGELOG 2017-09-06 20:06:15 +02:00
5 changed files with 36 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
{
"presets": ["es2015", "stage-2"],
"plugins": ["transform-runtime", "transform-object-assign"],
"plugins": ["transform-runtime"],
"comments": false
}

View File

@@ -1,5 +1,29 @@
# Change Log
## [v2.8.3](https://github.com/apertureless/vue-chartjs/tree/v2.8.3) (2017-09-06)
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.8.2...v2.8.3)
**Closed issues:**
- Rounded corner for Bar chart [\#185](https://github.com/apertureless/vue-chartjs/issues/185)
- Access canvas object from parents [\#184](https://github.com/apertureless/vue-chartjs/issues/184)
- Issue with DonutChart in Safari [\#183](https://github.com/apertureless/vue-chartjs/issues/183)
- Responsive Width, Fixed Height [\#180](https://github.com/apertureless/vue-chartjs/issues/180)
- Entire Lodash Library Is Loaded!! 200kb chunk! [\#179](https://github.com/apertureless/vue-chartjs/issues/179)
- height changed unexpectedly after re-rendering [\#178](https://github.com/apertureless/vue-chartjs/issues/178)
- Default height no longer working in 2.8 [\#176](https://github.com/apertureless/vue-chartjs/issues/176)
- how to get click on point in bar chart? [\#175](https://github.com/apertureless/vue-chartjs/issues/175)
- clean install of from npm cannot be used in gulp / browserify [\#174](https://github.com/apertureless/vue-chartjs/issues/174)
- tooltip callbacks possible? [\#173](https://github.com/apertureless/vue-chartjs/issues/173)
- Computed object won't populate chart [\#170](https://github.com/apertureless/vue-chartjs/issues/170)
- Error in nextTick: "RangeError: Maximum call stack size exceeded" [\#169](https://github.com/apertureless/vue-chartjs/issues/169)
- Standalone chartjs build \(don't include moment.js\) [\#124](https://github.com/apertureless/vue-chartjs/issues/124)
**Merged pull requests:**
- 🔥 Remove default styles object as it causes problems [\#187](https://github.com/apertureless/vue-chartjs/pull/187) ([apertureless](https://github.com/apertureless))
- remvove lodash merge [\#186](https://github.com/apertureless/vue-chartjs/pull/186) ([apertureless](https://github.com/apertureless))
## [v2.8.2](https://github.com/apertureless/vue-chartjs/tree/v2.8.2) (2017-08-12)
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.8.1...v2.8.2)

View File

@@ -1,6 +1,6 @@
{
"name": "vue-chartjs",
"version": "2.8.3",
"version": "2.8.4",
"description": "vue.js wrapper for chart.js",
"author": "Jakub Juszczak <jakub@posteo.de>",
"homepage": "http://vue-chartjs.org",
@@ -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"

View File

@@ -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)
}

View File

@@ -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"