Compare commits

...

15 Commits

Author SHA1 Message Date
Jakub Juszczak
c24dc84e2f 💎 Release new version 2.4.0 2017-03-03 16:17:48 +01:00
Jakub Juszczak
d3f7058685 📝 Update README and docs 2017-03-03 16:00:06 +01:00
Jakub Juszczak
6bdda62c62 Merge branch 'develop' of github.com:apertureless/vue-chartjs into develop
* 'develop' of github.com:apertureless/vue-chartjs:
  Added browserify support
2017-03-03 15:33:04 +01:00
Jakub Juszczak
491b2514cd Add unkpg build to package.json 2017-03-03 14:50:56 +01:00
Jakub
819b96b06a Merge pull request #51 from craigh411/patch-1
Added browserify support
2017-03-02 19:36:38 +01:00
Craig Humphreys
ada0fab17c Added browserify support
Added the `babilify` transform for `browserify` for `packge.json` so the src files can be transpiled in browserify projects.
2017-03-02 11:13:03 +00:00
Jakub Juszczak
1a22bae5ba 📝 Update CHANGELOG 2017-03-01 22:42:34 +01:00
Jakub Juszczak
d849706b9a Merge branch 'master' into develop
* master:
  Update CNAME
  Update CNAME
2017-03-01 22:40:22 +01:00
Jakub Juszczak
ad0e0de561 Merge commit '562539a3a54dc89b0216d8141541501eecee1560'
* commit '562539a3a54dc89b0216d8141541501eecee1560':
  🐛 Fix #49
2017-03-01 22:37:58 +01:00
Jakub
3da3fccc11 Merge pull request #50 from apertureless/feature/include_src
🐛 Fix #49
2017-03-01 22:37:20 +01:00
Jakub Juszczak
562539a3a5 🐛 Fix #49 2017-03-01 22:35:18 +01:00
Jakub Juszczak
6d8513ff75 Merge branch 'develop'
* develop:
  💎 Release new version 2.3.8
  ⬆️ Update dev dependencies
  ⬆️ Update dependencies
2017-03-01 14:49:29 +01:00
Jakub Juszczak
412f1f7b81 Merge branch 'develop'
* develop:
  🐛 Fix docs title
2017-02-27 23:11:13 +01:00
Jakub
1c76fdeff9 Update CNAME 2017-02-27 23:05:15 +01:00
Jakub
e8379c71ec Update CNAME 2017-02-27 23:05:07 +01:00
5 changed files with 109 additions and 6 deletions

View File

@@ -2,12 +2,31 @@
## [Unreleased](https://github.com/apertureless/vue-chartjs/tree/HEAD)
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.3.6...HEAD)
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.3.8...HEAD)
**Closed issues:**
- Add src folder to package.json "files" and make main "src/index.js" [\#49](https://github.com/apertureless/vue-chartjs/issues/49)
- Unable to refresh [\#41](https://github.com/apertureless/vue-chartjs/issues/41)
**Merged pull requests:**
- 🐛 Fix \#49 [\#50](https://github.com/apertureless/vue-chartjs/pull/50) ([apertureless](https://github.com/apertureless))
## [v2.3.8](https://github.com/apertureless/vue-chartjs/tree/v2.3.8) (2017-03-01)
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.3.6...v2.3.8)
**Closed issues:**
- Mixins don't seem to trigger a refresh of the chart [\#44](https://github.com/apertureless/vue-chartjs/issues/44)
- Colors of dynamically added bars in bar graph are the default color instead of specified color [\#42](https://github.com/apertureless/vue-chartjs/issues/42)
**Merged pull requests:**
- Feature/documentation [\#47](https://github.com/apertureless/vue-chartjs/pull/47) ([apertureless](https://github.com/apertureless))
- ⬆️ Update dependencies [\#46](https://github.com/apertureless/vue-chartjs/pull/46) ([apertureless](https://github.com/apertureless))
- 📝 Update github issue template [\#45](https://github.com/apertureless/vue-chartjs/pull/45) ([apertureless](https://github.com/apertureless))
## [v2.3.6](https://github.com/apertureless/vue-chartjs/tree/v2.3.6) (2017-02-22)
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.3.5...v2.3.6)

View File

@@ -176,6 +176,29 @@ export default Line.extend({
})
```
## Webpack & Bundling tools
There are now two version the main entry point is `src/index.js` which is the ES6 source, unbundled.
If you're using webpack it is recommended to use this one. Because the bundled umd version has vue.js and chart.js bundled into it.
However if you have problems o you can import the dist file
```
import VueCharts from 'vue-chartjs/dist/vue-chartjs'
// or
import { Line } from 'vue-chartjs/dist/vue-chartjs'
```
Or you can set an alias.
### Browserify
In order for a browserify user to transpile the code, they would need to install `babelify` and `babel-preset-es2015` and add a .babelrc file in the root of their project with the following code:
```
{
"presets": ["es2015"]
}
```
## Available Charts
### Bar Chart

View File

@@ -1 +1 @@
vue-chartjs.org
vue-chartjs.org

View File

@@ -278,3 +278,27 @@ Sometimes you need more control over chart.js. Thats why you can access the char
### Bubble
![Bubble](assets/bubble.png)
## Webpack & Bundling tools
There are now two version the main entry point is `src/index.js` which is the ES6 source, unbundled.
If you're using webpack it is recommended to use this one. Because the bundled umd version has vue.js and chart.js bundled into it.
However if you have problems o you can import the dist file
```
import VueCharts from 'vue-chartjs/dist/vue-chartjs'
// or
import { Line } from 'vue-chartjs/dist/vue-chartjs'
```
Or you can set an alias.
### Browserify
In order for a browserify user to transpile the code, they would need to install `babelify` and `babel-preset-es2015` and add a .babelrc file in the root of their project with the following code:
```
{
"presets": ["es2015"]
}
```

View File

@@ -1,12 +1,34 @@
{
"name": "vue-chartjs",
"version": "2.3.8",
"version": "2.4.0",
"description": "vue.js wrapper for chart.js",
"author": "Jakub Juszczak <jakub@nextindex.de>",
"author": "Jakub Juszczak <jakub@posteo.de>",
"homepage": "http://vue-chartjs.org",
"license": "MIT",
"contributors": [
{
"name": "Thorsten Lünborg",
"web": "https://github.com/LinusBorg"
},
{
"name": "Juan Carlos Alonso",
"web": "https://github.com/jcalonso"
}
],
"maintainers": [
{
"name": "Jakub Juszczak",
"email": "jakub@posteo.de",
"web": "http://www.jakubjuszczak.de"
}
],
"repository": {
"type": "git",
"url": "git+ssh://git@github.com:apertureless/vue-chartjs.git"
},
"bugs": {
"url": "https://github.com/apertureless/vue-chartjs/issues"
},
"keywords": [
"ChartJs",
"Vue",
@@ -14,8 +36,10 @@
"Wrapper",
"Charts"
],
"main": "dist/vue-chartjs.js",
"main": "src/index.js",
"unpkg": "dist/vue-chartjs.js",
"files": [
"src",
"dist"
],
"scripts": {
@@ -28,11 +52,11 @@
"release": "webpack --progress --hide-modules --config ./build/webpack.release.js"
},
"dependencies": {
"babel-runtime": "^6.23.0",
"chart.js": "^2.5.0",
"vue": "^2.2.1"
},
"devDependencies": {
"babel-runtime": "^6.23.0",
"babel-core": "^6.23.1",
"babel-loader": "^6.3.2",
"babel-plugin-transform-runtime": "^6.23.0",
@@ -90,5 +114,18 @@
"webpack-dev-middleware": "^1.4.0",
"webpack-hot-middleware": "^2.6.0",
"webpack-merge": "^1.1.1"
},
"engines": {
"node": ">=6.9.0"
},
"babel": {
"presets": [
"es2015"
]
},
"browserify": {
"transform": [
"babelify"
]
}
}