💎 Release new version 2.6.2

Signed-off-by: Jakub Juszczak <netghost03@gmail.com>

CHANGELOG.md

@@ -1,13 +1,53 @@
 # Change Log
 
-## [Unreleased](https://github.com/apertureless/vue-chartjs/tree/HEAD)
-
-[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.5...HEAD)
+## [v2.6.1](https://github.com/apertureless/vue-chartjs/tree/v2.6.1) (2017-04-21)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.6.0...v2.6.1)
 
 **Closed issues:**
 
+- Not understanding options [\#93](https://github.com/apertureless/vue-chartjs/issues/93)
+- A Gotcha on component creation. [\#92](https://github.com/apertureless/vue-chartjs/issues/92)
+- Error when building: 'This dependency was not found: chartjs' [\#91](https://github.com/apertureless/vue-chartjs/issues/91)
+- Chart does not render inside conditional [\#90](https://github.com/apertureless/vue-chartjs/issues/90)
+- Unable to add to material-vue layout [\#87](https://github.com/apertureless/vue-chartjs/issues/87)
+
+## [v2.6.0](https://github.com/apertureless/vue-chartjs/tree/v2.6.0) (2017-04-09)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.6.0-rc1...v2.6.0)
+
+**Closed issues:**
+
+- how to export to image or pdf [\#89](https://github.com/apertureless/vue-chartjs/issues/89)
+- 🙏🏻 Testing 2.6.0-rc1 [\#88](https://github.com/apertureless/vue-chartjs/issues/88)
+- Adding annotation plugin functionality [\#86](https://github.com/apertureless/vue-chartjs/issues/86)
+
+## [v2.6.0-rc1](https://github.com/apertureless/vue-chartjs/tree/v2.6.0-rc1) (2017-04-05)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.6...v2.6.0-rc1)
+
+**Closed issues:**
+
+- Overwrite prop [\#85](https://github.com/apertureless/vue-chartjs/issues/85)
+
+**Merged pull requests:**
+
+- Update release build to not include externals. [\#84](https://github.com/apertureless/vue-chartjs/pull/84) ([gcoguiec](https://github.com/gcoguiec))
+
+## [v2.5.6](https://github.com/apertureless/vue-chartjs/tree/v2.5.6) (2017-03-29)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.5...v2.5.6)
+
+**Closed issues:**
+
+- Can not render two lines at the same time [\#83](https://github.com/apertureless/vue-chartjs/issues/83)
+- Suggestion: Chart not re-rendering on window resize [\#82](https://github.com/apertureless/vue-chartjs/issues/82)
+- How can you change legend label colour? [\#81](https://github.com/apertureless/vue-chartjs/issues/81)
+- Doughnut with text in the middle [\#80](https://github.com/apertureless/vue-chartjs/issues/80)
+- Set chart width without affecting labels [\#79](https://github.com/apertureless/vue-chartjs/issues/79)
+- Loading data from server and displaying [\#78](https://github.com/apertureless/vue-chartjs/issues/78)
+- Why separate .js files in the examples? [\#77](https://github.com/apertureless/vue-chartjs/issues/77)
 - An in-range update of vue is breaking the build 🚨 [\#76](https://github.com/apertureless/vue-chartjs/issues/76)
 - An in-range update of vue-template-compiler is breaking the build 🚨 [\#75](https://github.com/apertureless/vue-chartjs/issues/75)
+- Uncaught TypeError: Cannot read property 'chartId' of undefined [\#74](https://github.com/apertureless/vue-chartjs/issues/74)
+- TypeError: child.\_updateFromParent is not a function [\#72](https://github.com/apertureless/vue-chartjs/issues/72)
+- Styling componement's surrounding \<div\> [\#70](https://github.com/apertureless/vue-chartjs/issues/70)
 
 ## [v2.5.5](https://github.com/apertureless/vue-chartjs/tree/v2.5.5) (2017-03-24)
 [Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.4...v2.5.5)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-chartjs",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "vue.js wrapper for chart.js",
   "author": "Jakub Juszczak <jakub@posteo.de>",
   "homepage": "http://vue-chartjs.org",
@@ -61,15 +61,15 @@
   },
   "peerDependencies": {
     "chart.js": "^2.5.0",
-    "vue": "^2.2.6"
+    "vue": "^2.3.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.0",
-    "babel-core": "^6.24.0",
-    "babel-loader": "^6.4.1",
+    "babel-cli": "^6.24.1",
+    "babel-core": "^6.24.1",
+    "babel-loader": "^7.0.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "^6.24.0",
-    "babel-preset-stage-2": "^6.22.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
     "babel-runtime": "^6.23.0",
     "chai": "^3.5.0",
     "chart.js": "^2.5.0",
@@ -77,14 +77,16 @@
     "connect-history-api-fallback": "^1.1.0",
     "cross-env": "^3.2.4",
     "cross-spawn": "^5.1.0",
-    "css-loader": "^0.27.3",
-    "eslint": "^3.18.0",
-    "eslint-config-standard": "^7.1.0",
+    "css-loader": "^0.28.0",
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
     "eslint-friendly-formatter": "^2.0.7",
-    "eslint-loader": "^1.7.0",
+    "eslint-loader": "^1.7.1",
     "eslint-plugin-html": "^2.0.1",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-node": "^4.2.2",
     "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-standard": "^2.1.1",
+    "eslint-plugin-standard": "^3.0.1",
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.15.2",
     "extract-text-webpack-plugin": "^1.0.1",
@@ -115,12 +117,12 @@
     "sinon": "^2.1.0",
     "sinon-chai": "^2.9.0",
     "url-loader": "^0.5.8",
-    "vue": "^2.2.6",
-    "vue-hot-reload-api": "^2.0.11",
+    "vue": "^2.3.0",
+    "vue-hot-reload-api": "^2.1.0",
     "vue-html-loader": "^1.2.4",
-    "vue-loader": "^11.3.4",
-    "vue-style-loader": "^2.0.5",
-    "vue-template-compiler": "^2.2.6",
+    "vue-loader": "^12.0.2",
+    "vue-style-loader": "^3.0.1",
+    "vue-template-compiler": "^2.3.0",
     "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.10.1",
     "webpack-hot-middleware": "^2.17.1",

src/BaseCharts/Bar.js

@@ -61,7 +61,7 @@ export default Vue.extend({
   },
 
   methods: {
-    renderChart (data, options, type) {
+    renderChart (data, options) {
       let chartOptions = mergeOptions(this.defaultOptions, options)
       this._chart = new Chart(
         this.$refs.canvas.getContext('2d'), {