Merge branch 'develop'

* develop: 💎 Release new version 2.5.4 🔥 Remove browser field from npm
💎 Release new version 2.5.4
2025-10-29 18:00:20 +00:00 · 2017-03-19 17:23:03 +01:00 · 2017-03-19 17:21:45 +01:00 · 2017-03-19 17:21:17 +01:00 · 2017-03-18 15:04:58 +01:00 · 2017-03-18 15:04:29 +01:00
5 changed files with 569 additions and 516 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Change Log

+## [Unreleased](https://github.com/apertureless/vue-chartjs/tree/HEAD)
+
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.3...HEAD)
+
+**Closed issues:**
+
+- How to use without babel/webpack? [\#66](https://github.com/apertureless/vue-chartjs/issues/66)
+- The vue-chartjs/src entry point is still creating a new vue instance. [\#55](https://github.com/apertureless/vue-chartjs/issues/55)
+
+**Merged pull requests:**
+
+- Update dependencies to enable Greenkeeper 🌴 [\#65](https://github.com/apertureless/vue-chartjs/pull/65) ([greenkeeper[bot]](https://github.com/integration/greenkeeper))
+
+## [v2.5.3](https://github.com/apertureless/vue-chartjs/tree/v2.5.3) (2017-03-17)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.2...v2.5.3)
+
+**Closed issues:**
+
+- Cannot modify styling using options [\#60](https://github.com/apertureless/vue-chartjs/issues/60)
+
 ## [v2.5.2](https://github.com/apertureless/vue-chartjs/tree/v2.5.2) (2017-03-14)
 [Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.1...v2.5.2)

--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 [![Package Quality](http://npm.packagequality.com/shield/vue-chartjs.svg)](http://packagequality.com/#?package=vue-chartjs)
 [![npm](https://img.shields.io/npm/dm/localeval.svg)](https://www.npmjs.com/package/vue-chartjs)
 [![Gitter chat](https://img.shields.io/gitter/room/TechnologyAdvice/Stardust.svg)](https://gitter.im/vue-chartjs/Lobby)
+[![Greenkeeper badge](https://badges.greenkeeper.io/apertureless/vue-chartjs.svg)](https://greenkeeper.io/)
 [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/apertureless/vue-chartjs/blob/master/LICENSE.txt)

 # vue-chartjs
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-chartjs",
-  "version": "2.5.3",
+  "version": "2.5.4",
  "description": "vue.js wrapper for chart.js",
  "author": "Jakub Juszczak <jakub@posteo.de>",
  "homepage": "http://vue-chartjs.org",
@@ -38,7 +38,6 @@
  ],
  "main": "dist/vue-chartjs.js",
  "unpkg": "dist/vue-chartjs.min.js",
-  "browser": "dist/vue-chartjs.min.js",
  "module": "es/index.js",
  "jsnext:main": "es/index.js",
  "files": [
@@ -63,65 +62,65 @@
    "vue": "^2.2.4"
  },
  "devDependencies": {
-    "babel-cli": "^6.23.0",
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
+    "babel-cli": "^6.24.0",
+    "babel-core": "^6.24.0",
+    "babel-loader": "^6.4.1",
    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "^6.22.0",
+    "babel-preset-es2015": "^6.24.0",
    "babel-preset-stage-2": "^6.22.0",
    "babel-runtime": "^6.23.0",
    "chai": "^3.5.0",
-    "chromedriver": "^2.21.2",
+    "chromedriver": "^2.28.0",
    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^3.1.4",
-    "cross-spawn": "^5.0.1",
-    "css-loader": "^0.26.2",
-    "eslint": "^3.7.1",
-    "eslint-config-standard": "^6.2.0",
-    "eslint-friendly-formatter": "^2.0.5",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.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",
+    "eslint-friendly-formatter": "^2.0.7",
+    "eslint-loader": "^1.6.3",
+    "eslint-plugin-html": "^2.0.1",
    "eslint-plugin-promise": "^3.5.0",
    "eslint-plugin-standard": "^2.1.1",
    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
+    "express": "^4.15.2",
    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.9.0",
+    "file-loader": "^0.10.1",
    "function-bind": "^1.0.2",
    "html-webpack-plugin": "^2.28.0",
-    "http-proxy-middleware": "^0.17.2",
-    "inject-loader": "^3.0.0-beta2",
+    "http-proxy-middleware": "^0.17.4",
+    "inject-loader": "^3.0.0-beta4",
    "isparta-loader": "^2.0.0",
    "jasmine-core": "^2.5.2",
    "json-loader": "^0.5.4",
-    "karma": "^1.3.0",
+    "karma": "^1.5.0",
    "karma-coverage": "^1.1.1",
    "karma-jasmine": "^1.0.2",
    "karma-mocha": "^1.2.0",
-    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-phantomjs-launcher": "^1.0.4",
    "karma-sinon-chai": "^1.2.0",
    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.26",
-    "karma-webpack": "^1.7.0",
-    "lolex": "^1.4.0",
+    "karma-spec-reporter": "0.0.30",
+    "karma-webpack": "1.8.1",
+    "lolex": "^1.6.0",
    "mocha": "^3.1.0",
-    "nightwatch": "^0.9.8",
-    "ora": "^0.3.0",
+    "nightwatch": "^0.9.13",
+    "ora": "^1.1.0",
    "phantomjs-prebuilt": "^2.1.13",
-    "selenium-server": "^3.0.1",
-    "shelljs": "^0.7.4",
-    "sinon": "^1.17.3",
+    "selenium-server": "^3.3.1",
+    "shelljs": "^0.7.7",
+    "sinon": "^2.0.0",
    "sinon-chai": "^2.8.0",
    "url-loader": "^0.5.8",
    "vue-hot-reload-api": "^2.0.11",
    "vue-html-loader": "^1.2.4",
    "vue-loader": "^11.1.4",
-    "vue-style-loader": "^2.0.3",
+    "vue-style-loader": "^2.0.4",
    "vue-template-compiler": "^2.2.4",
    "webpack": "^1.13.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^1.1.1"
+    "webpack-dev-middleware": "^1.10.1",
+    "webpack-hot-middleware": "^2.17.1",
+    "webpack-merge": "1.1.1"
  },
  "engines": {
    "node": ">=6.9.0"
@@ -135,5 +134,13 @@
    "transform": [
      "babelify"
    ]
+  },
+  "greenkeeper": {
+    "ignore": [
+      "extract-text-webpack-plugin",
+      "karma-webpack",
+      "webpack",
+      "webpack-merge"
+    ]
  }
 }
--- a/test/unit/.eslintrc
+++ b/test/unit/.eslintrc
@@ -6,5 +6,8 @@
    "expect": true,
    "jasmine": true,
    "sinon": true
+  },
+  "rules": {
+    "no-unused-expressions": 0
  }
 }
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Jakub Juszczak	8c670775f5	Merge branch 'develop' * develop: 💎 Release new version 2.5.4 🔥 Remove browser field from npm	2017-03-19 17:23:03 +01:00
Jakub Juszczak	d6ff509dc0	💎 Release new version 2.5.4	2017-03-19 17:21:45 +01:00
Jakub Juszczak	94ce9f9b96	🔥 Remove browser field from npm	2017-03-19 17:21:17 +01:00
Jakub Juszczak	5fcf1eb79c	Merge branch 'develop' * develop: ⬆️ Update dependencies	2017-03-18 15:04:58 +01:00
Jakub Juszczak	50f5aed6d5	⬆️ Update dependencies	2017-03-18 15:04:29 +01:00
Jakub Juszczak	2573f438ac	Merge branch 'develop' * develop: 📝 Update CHANGELOG	2017-03-17 17:00:23 +01:00
Jakub Juszczak	a982fde310	📝 Update CHANGELOG	2017-03-17 17:00:11 +01:00
Jakub Juszczak	2894a1d64c	Merge branch 'develop' * develop: 🐛 Fix badge position 🐛 Fix lintin 🐛 Fix dependencies docs(readme): add Greenkeeper badge chore(package): update dependencies	2017-03-17 16:58:17 +01:00
Jakub Juszczak	a00fd1c7a1	🐛 Fix badge position	2017-03-17 16:57:54 +01:00
Jakub	db3bef1bae	Merge pull request #65 from apertureless/greenkeeper/initial Update dependencies to enable Greenkeeper 🌴	2017-03-17 16:55:51 +01:00
Jakub Juszczak	acc8904c54	🐛 Fix lintin	2017-03-17 16:41:38 +01:00
Jakub Juszczak	e7c1158c25	🐛 Fix dependencies	2017-03-17 16:41:33 +01:00
Jakub Juszczak	8e305d8c46	Merge branch 'develop' * develop: 💎 Release new version 2.5.3 ✨ Add browser build	2017-03-17 15:48:32 +01:00
greenkeeper[bot]	3ecd0c8908	docs(readme): add Greenkeeper badge https://greenkeeper.io/	2017-03-14 22:12:27 +00:00
greenkeeper[bot]	1c2bf08111	chore(package): update dependencies https://greenkeeper.io/	2017-03-14 22:12:06 +00:00
Jakub Juszczak	d6a53a6bd6	Merge branch 'develop' * develop: 📝 Update CHANGELOG	2017-03-14 13:02:12 +01:00
Jakub Juszczak	e0fb6ec8f3	Merge branch 'develop' * develop: 💎 Release new version 2.5.2	2017-03-14 13:00:47 +01:00
Jakub	71e032db7d	Merge pull request #63 from apertureless/develop Develop	2017-03-13 13:22:55 +01:00