mirror of
https://github.com/KevinMidboe/vue-chartjs.git
synced 2025-10-29 18:00:20 +00:00
Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13e783c29d | ||
|
|
b0b8d88794 | ||
|
|
dc8e198f10 | ||
|
|
348de825bf | ||
|
|
87fb35749e | ||
|
|
0f697a2bc5 | ||
|
|
8c670775f5 | ||
|
|
d6ff509dc0 | ||
|
|
94ce9f9b96 | ||
|
|
5fcf1eb79c | ||
|
|
50f5aed6d5 | ||
|
|
2573f438ac | ||
|
|
a982fde310 | ||
|
|
2894a1d64c | ||
|
|
a00fd1c7a1 | ||
|
|
db3bef1bae | ||
|
|
acc8904c54 | ||
|
|
e7c1158c25 | ||
|
|
8e305d8c46 | ||
|
|
3fc76050f6 | ||
|
|
e2a8f3ca3c | ||
|
|
3ecd0c8908 | ||
|
|
1c2bf08111 | ||
|
|
d6a53a6bd6 | ||
|
|
6913312be9 | ||
|
|
e0fb6ec8f3 | ||
|
|
71e032db7d |
43
CHANGELOG.md
43
CHANGELOG.md
@@ -1,5 +1,48 @@
|
|||||||
# Change Log
|
# 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)
|
||||||
|
|
||||||
|
**Closed issues:**
|
||||||
|
|
||||||
|
- TypeError: child.\_updateFromParent is not a function [\#62](https://github.com/apertureless/vue-chartjs/issues/62)
|
||||||
|
- child.\_updateFromParent is not a function [\#59](https://github.com/apertureless/vue-chartjs/issues/59)
|
||||||
|
- dependency was not found [\#58](https://github.com/apertureless/vue-chartjs/issues/58)
|
||||||
|
|
||||||
|
**Merged pull requests:**
|
||||||
|
|
||||||
|
- Develop [\#63](https://github.com/apertureless/vue-chartjs/pull/63) ([apertureless](https://github.com/apertureless))
|
||||||
|
- Fix typo for legacy tag [\#61](https://github.com/apertureless/vue-chartjs/pull/61) ([kylestev](https://github.com/kylestev))
|
||||||
|
|
||||||
|
## [v2.5.1](https://github.com/apertureless/vue-chartjs/tree/v2.5.1) (2017-03-11)
|
||||||
|
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.5.0...v2.5.1)
|
||||||
|
|
||||||
|
**Closed issues:**
|
||||||
|
|
||||||
|
- Lines are looking weird. [\#57](https://github.com/apertureless/vue-chartjs/issues/57)
|
||||||
|
- Working with objects [\#48](https://github.com/apertureless/vue-chartjs/issues/48)
|
||||||
|
- Mixins don't seem to trigger a refresh of the chart [\#44](https://github.com/apertureless/vue-chartjs/issues/44)
|
||||||
|
|
||||||
## [v2.5.0](https://github.com/apertureless/vue-chartjs/tree/v2.5.0) (2017-03-08)
|
## [v2.5.0](https://github.com/apertureless/vue-chartjs/tree/v2.5.0) (2017-03-08)
|
||||||
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.4.1...v2.5.0)
|
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.4.1...v2.5.0)
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ var projectRoot = path.resolve(__dirname, '../')
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: {
|
entry: {
|
||||||
app: './src/index.js'
|
app: './src/main.js'
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
path: config.build.assetsRoot,
|
path: config.build.assetsRoot,
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ module.exports = {
|
|||||||
output: {
|
output: {
|
||||||
filename: './dist/[name].js',
|
filename: './dist/[name].js',
|
||||||
library: 'VueChartJs',
|
library: 'VueChartJs',
|
||||||
libraryTarget: 'umd'
|
libraryTarget: 'umd',
|
||||||
|
umdNamedDefine: true
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
preLoaders: [
|
preLoaders: [
|
||||||
|
|||||||
18
build/webpack.release.min.js
vendored
Normal file
18
build/webpack.release.min.js
vendored
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
var config = require('./webpack.release.js')
|
||||||
|
var webpack = require('webpack')
|
||||||
|
|
||||||
|
config.output.filename = config.output.filename.replace(/\.js$/, '.min.js')
|
||||||
|
|
||||||
|
delete config.devtool
|
||||||
|
|
||||||
|
config.plugins = [
|
||||||
|
new webpack.optimize.UglifyJsPlugin({
|
||||||
|
sourceMap: false,
|
||||||
|
compress: {
|
||||||
|
warnings: false
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
new webpack.optimize.OccurenceOrderPlugin()
|
||||||
|
]
|
||||||
|
|
||||||
|
module.exports = config
|
||||||
@@ -13,11 +13,11 @@ It abstracts the basic logic but exposes the chart.js object to give you the mos
|
|||||||
## Installation
|
## Installation
|
||||||
If you are working with Vue.js 2+ simple run:
|
If you are working with Vue.js 2+ simple run:
|
||||||
|
|
||||||
`yarn add vue-chartjs -S`
|
`yarn add vue-chartjs`
|
||||||
|
|
||||||
If you are using vue 1.x please use the `legacy` tag. However the vue 1 version is not maintained anymore.
|
If you are using vue 1.x please use the `legacy` tag. However the vue 1 version is not maintained anymore.
|
||||||
|
|
||||||
`yarn add vue-chartjs@legacy -S`
|
`yarn add vue-chartjs@legacy`
|
||||||
|
|
||||||
## Quick Start
|
## Quick Start
|
||||||
|
|
||||||
|
|||||||
84
package.json
84
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vue-chartjs",
|
"name": "vue-chartjs",
|
||||||
"version": "2.5.2",
|
"version": "2.5.5",
|
||||||
"description": "vue.js wrapper for chart.js",
|
"description": "vue.js wrapper for chart.js",
|
||||||
"author": "Jakub Juszczak <jakub@posteo.de>",
|
"author": "Jakub Juszczak <jakub@posteo.de>",
|
||||||
"homepage": "http://vue-chartjs.org",
|
"homepage": "http://vue-chartjs.org",
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
"Charts"
|
"Charts"
|
||||||
],
|
],
|
||||||
"main": "dist/vue-chartjs.js",
|
"main": "dist/vue-chartjs.js",
|
||||||
"unpkg": "dist/vue-chartjs.js",
|
"unpkg": "dist/vue-chartjs.min.js",
|
||||||
"module": "es/index.js",
|
"module": "es/index.js",
|
||||||
"jsnext:main": "es/index.js",
|
"jsnext:main": "es/index.js",
|
||||||
"files": [
|
"files": [
|
||||||
@@ -53,74 +53,74 @@
|
|||||||
"e2e": "node test/e2e/runner.js",
|
"e2e": "node test/e2e/runner.js",
|
||||||
"test": "npm run unit",
|
"test": "npm run unit",
|
||||||
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
|
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
|
||||||
"release": "webpack --progress --hide-modules --config ./build/webpack.release.js",
|
"release": "webpack --progress --hide-modules --config ./build/webpack.release.js && NODE_ENV=production webpack --progress --hide-modules --config ./build/webpack.release.min.js",
|
||||||
"prepublish": "yarn run lint && yarn run test && yarn run build"
|
"prepublish": "yarn run lint && yarn run test && yarn run build"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chart.js": "^2.5.0",
|
"chart.js": "^2.5.0",
|
||||||
"lodash": "^4.17.4",
|
"lodash": "^4.17.4",
|
||||||
"vue": "^2.2.4"
|
"vue": "^2.2.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-cli": "^6.23.0",
|
"babel-cli": "^6.24.0",
|
||||||
"babel-core": "^6.23.1",
|
"babel-core": "^6.24.0",
|
||||||
"babel-loader": "^6.3.2",
|
"babel-loader": "^6.4.1",
|
||||||
"babel-plugin-transform-runtime": "^6.23.0",
|
"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-preset-stage-2": "^6.22.0",
|
||||||
"babel-runtime": "^6.23.0",
|
"babel-runtime": "^6.23.0",
|
||||||
"chai": "^3.5.0",
|
"chai": "^3.5.0",
|
||||||
"chromedriver": "^2.21.2",
|
"chromedriver": "^2.28.0",
|
||||||
"connect-history-api-fallback": "^1.1.0",
|
"connect-history-api-fallback": "^1.1.0",
|
||||||
"cross-env": "^3.1.4",
|
"cross-env": "^3.2.4",
|
||||||
"cross-spawn": "^5.0.1",
|
"cross-spawn": "^5.1.0",
|
||||||
"css-loader": "^0.26.2",
|
"css-loader": "^0.27.3",
|
||||||
"eslint": "^3.7.1",
|
"eslint": "^3.18.0",
|
||||||
"eslint-config-standard": "^6.2.0",
|
"eslint-config-standard": "^7.1.0",
|
||||||
"eslint-friendly-formatter": "^2.0.5",
|
"eslint-friendly-formatter": "^2.0.7",
|
||||||
"eslint-loader": "^1.3.0",
|
"eslint-loader": "^1.7.0",
|
||||||
"eslint-plugin-html": "^1.3.0",
|
"eslint-plugin-html": "^2.0.1",
|
||||||
"eslint-plugin-promise": "^3.5.0",
|
"eslint-plugin-promise": "^3.5.0",
|
||||||
"eslint-plugin-standard": "^2.1.1",
|
"eslint-plugin-standard": "^2.1.1",
|
||||||
"eventsource-polyfill": "^0.9.6",
|
"eventsource-polyfill": "^0.9.6",
|
||||||
"express": "^4.13.3",
|
"express": "^4.15.2",
|
||||||
"extract-text-webpack-plugin": "^1.0.1",
|
"extract-text-webpack-plugin": "^1.0.1",
|
||||||
"file-loader": "^0.9.0",
|
"file-loader": "^0.10.1",
|
||||||
"function-bind": "^1.0.2",
|
"function-bind": "^1.0.2",
|
||||||
"html-webpack-plugin": "^2.28.0",
|
"html-webpack-plugin": "^2.28.0",
|
||||||
"http-proxy-middleware": "^0.17.2",
|
"http-proxy-middleware": "^0.17.4",
|
||||||
"inject-loader": "^3.0.0-beta2",
|
"inject-loader": "^3.0.0-beta4",
|
||||||
"isparta-loader": "^2.0.0",
|
"isparta-loader": "^2.0.0",
|
||||||
"jasmine-core": "^2.5.2",
|
"jasmine-core": "^2.5.2",
|
||||||
"json-loader": "^0.5.4",
|
"json-loader": "^0.5.4",
|
||||||
"karma": "^1.3.0",
|
"karma": "^1.5.0",
|
||||||
"karma-coverage": "^1.1.1",
|
"karma-coverage": "^1.1.1",
|
||||||
"karma-jasmine": "^1.0.2",
|
"karma-jasmine": "^1.0.2",
|
||||||
"karma-mocha": "^1.2.0",
|
"karma-mocha": "^1.2.0",
|
||||||
"karma-phantomjs-launcher": "^1.0.0",
|
"karma-phantomjs-launcher": "^1.0.4",
|
||||||
"karma-sinon-chai": "^1.2.0",
|
"karma-sinon-chai": "^1.2.0",
|
||||||
"karma-sourcemap-loader": "^0.3.7",
|
"karma-sourcemap-loader": "^0.3.7",
|
||||||
"karma-spec-reporter": "0.0.26",
|
"karma-spec-reporter": "0.0.30",
|
||||||
"karma-webpack": "^1.7.0",
|
"karma-webpack": "1.8.1",
|
||||||
"lolex": "^1.4.0",
|
"lolex": "^1.6.0",
|
||||||
"mocha": "^3.1.0",
|
"mocha": "^3.1.0",
|
||||||
"nightwatch": "^0.9.8",
|
"nightwatch": "^0.9.14",
|
||||||
"ora": "^0.3.0",
|
"ora": "^1.2.0",
|
||||||
"phantomjs-prebuilt": "^2.1.13",
|
"phantomjs-prebuilt": "^2.1.13",
|
||||||
"selenium-server": "^3.0.1",
|
"selenium-server": "^3.3.1",
|
||||||
"shelljs": "^0.7.4",
|
"shelljs": "^0.7.7",
|
||||||
"sinon": "^1.17.3",
|
"sinon": "^2.1.0",
|
||||||
"sinon-chai": "^2.8.0",
|
"sinon-chai": "^2.9.0",
|
||||||
"url-loader": "^0.5.8",
|
"url-loader": "^0.5.8",
|
||||||
"vue-hot-reload-api": "^2.0.11",
|
"vue-hot-reload-api": "^2.0.11",
|
||||||
"vue-html-loader": "^1.2.4",
|
"vue-html-loader": "^1.2.4",
|
||||||
"vue-loader": "^11.1.4",
|
"vue-loader": "^11.3.2",
|
||||||
"vue-style-loader": "^2.0.3",
|
"vue-style-loader": "^2.0.4",
|
||||||
"vue-template-compiler": "^2.2.4",
|
"vue-template-compiler": "^2.2.5",
|
||||||
"webpack": "^1.13.2",
|
"webpack": "^1.13.2",
|
||||||
"webpack-dev-middleware": "^1.4.0",
|
"webpack-dev-middleware": "^1.10.1",
|
||||||
"webpack-hot-middleware": "^2.6.0",
|
"webpack-hot-middleware": "^2.17.1",
|
||||||
"webpack-merge": "^1.1.1"
|
"webpack-merge": "1.1.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
@@ -134,5 +134,13 @@
|
|||||||
"transform": [
|
"transform": [
|
||||||
"babelify"
|
"babelify"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"greenkeeper": {
|
||||||
|
"ignore": [
|
||||||
|
"extract-text-webpack-plugin",
|
||||||
|
"karma-webpack",
|
||||||
|
"webpack",
|
||||||
|
"webpack-merge"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
9
src/main.js
Normal file
9
src/main.js
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
// The Vue build version to load with the `import` command
|
||||||
|
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
|
||||||
|
import Vue from 'vue'
|
||||||
|
import App from './examples/App'
|
||||||
|
|
||||||
|
/* eslint-disable no-new */
|
||||||
|
new Vue({
|
||||||
|
render: h => h(App)
|
||||||
|
}).$mount('#app')
|
||||||
@@ -6,5 +6,8 @@
|
|||||||
"expect": true,
|
"expect": true,
|
||||||
"jasmine": true,
|
"jasmine": true,
|
||||||
"sinon": true
|
"sinon": true
|
||||||
|
},
|
||||||
|
"rules": {
|
||||||
|
"no-unused-expressions": 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user