Skip to content

Commit 2894a1d

Browse files
committed
Merge branch 'develop'
* develop: πŸ› Fix badge position πŸ› Fix lintin πŸ› Fix dependencies docs(readme): add Greenkeeper badge chore(package): update dependencies
2 parents 8e305d8 + a00fd1c commit 2894a1d

File tree

4 files changed

+569
-486
lines changed

4 files changed

+569
-486
lines changed

β€ŽREADME.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
[![Package Quality](http://npm.packagequality.com/shield/vue-chartjs.svg)](http://packagequality.com/#?package=vue-chartjs)
99
[![npm](https://img.shields.io/npm/dm/localeval.svg)](https://www.npmjs.com/package/vue-chartjs)
1010
[![Gitter chat](https://img.shields.io/gitter/room/TechnologyAdvice/Stardust.svg)](https://gitter.im/vue-chartjs/Lobby)
11+
[![Greenkeeper badge](https://badges.greenkeeper.io/apertureless/vue-chartjs.svg)](https://greenkeeper.io/)
1112
[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/apertureless/vue-chartjs/blob/master/LICENSE.txt)
1213

1314
# vue-chartjs

β€Žpackage.json

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -63,65 +63,65 @@
6363
"vue": "^2.2.4"
6464
},
6565
"devDependencies": {
66-
"babel-cli": "^6.23.0",
67-
"babel-core": "^6.23.1",
68-
"babel-loader": "^6.3.2",
66+
"babel-cli": "^6.24.0",
67+
"babel-core": "^6.24.0",
68+
"babel-loader": "^6.4.1",
6969
"babel-plugin-transform-runtime": "^6.23.0",
70-
"babel-preset-es2015": "^6.22.0",
70+
"babel-preset-es2015": "^6.24.0",
7171
"babel-preset-stage-2": "^6.22.0",
7272
"babel-runtime": "^6.23.0",
7373
"chai": "^3.5.0",
74-
"chromedriver": "^2.21.2",
74+
"chromedriver": "^2.28.0",
7575
"connect-history-api-fallback": "^1.1.0",
76-
"cross-env": "^3.1.4",
77-
"cross-spawn": "^5.0.1",
78-
"css-loader": "^0.26.2",
79-
"eslint": "^3.7.1",
80-
"eslint-config-standard": "^6.2.0",
81-
"eslint-friendly-formatter": "^2.0.5",
82-
"eslint-loader": "^1.3.0",
83-
"eslint-plugin-html": "^1.3.0",
76+
"cross-env": "^3.2.4",
77+
"cross-spawn": "^5.1.0",
78+
"css-loader": "^0.27.3",
79+
"eslint": "^3.17.1",
80+
"eslint-config-standard": "^7.0.1",
81+
"eslint-friendly-formatter": "^2.0.7",
82+
"eslint-loader": "^1.6.3",
83+
"eslint-plugin-html": "^2.0.1",
8484
"eslint-plugin-promise": "^3.5.0",
8585
"eslint-plugin-standard": "^2.1.1",
8686
"eventsource-polyfill": "^0.9.6",
87-
"express": "^4.13.3",
87+
"express": "^4.15.2",
8888
"extract-text-webpack-plugin": "^1.0.1",
89-
"file-loader": "^0.9.0",
89+
"file-loader": "^0.10.1",
9090
"function-bind": "^1.0.2",
9191
"html-webpack-plugin": "^2.28.0",
92-
"http-proxy-middleware": "^0.17.2",
93-
"inject-loader": "^3.0.0-beta2",
92+
"http-proxy-middleware": "^0.17.4",
93+
"inject-loader": "^3.0.0-beta4",
9494
"isparta-loader": "^2.0.0",
9595
"jasmine-core": "^2.5.2",
9696
"json-loader": "^0.5.4",
97-
"karma": "^1.3.0",
97+
"karma": "^1.5.0",
9898
"karma-coverage": "^1.1.1",
9999
"karma-jasmine": "^1.0.2",
100100
"karma-mocha": "^1.2.0",
101-
"karma-phantomjs-launcher": "^1.0.0",
101+
"karma-phantomjs-launcher": "^1.0.4",
102102
"karma-sinon-chai": "^1.2.0",
103103
"karma-sourcemap-loader": "^0.3.7",
104-
"karma-spec-reporter": "0.0.26",
105-
"karma-webpack": "^1.7.0",
106-
"lolex": "^1.4.0",
104+
"karma-spec-reporter": "0.0.30",
105+
"karma-webpack": "1.8.1",
106+
"lolex": "^1.6.0",
107107
"mocha": "^3.1.0",
108-
"nightwatch": "^0.9.8",
109-
"ora": "^0.3.0",
108+
"nightwatch": "^0.9.13",
109+
"ora": "^1.1.0",
110110
"phantomjs-prebuilt": "^2.1.13",
111-
"selenium-server": "^3.0.1",
112-
"shelljs": "^0.7.4",
113-
"sinon": "^1.17.3",
111+
"selenium-server": "^3.3.1",
112+
"shelljs": "^0.7.7",
113+
"sinon": "^2.0.0",
114114
"sinon-chai": "^2.8.0",
115115
"url-loader": "^0.5.8",
116116
"vue-hot-reload-api": "^2.0.11",
117117
"vue-html-loader": "^1.2.4",
118118
"vue-loader": "^11.1.4",
119-
"vue-style-loader": "^2.0.3",
119+
"vue-style-loader": "^2.0.4",
120120
"vue-template-compiler": "^2.2.4",
121121
"webpack": "^1.13.2",
122-
"webpack-dev-middleware": "^1.4.0",
123-
"webpack-hot-middleware": "^2.6.0",
124-
"webpack-merge": "^1.1.1"
122+
"webpack-dev-middleware": "^1.10.1",
123+
"webpack-hot-middleware": "^2.17.1",
124+
"webpack-merge": "1.1.1"
125125
},
126126
"engines": {
127127
"node": ">=6.9.0"
@@ -135,5 +135,13 @@
135135
"transform": [
136136
"babelify"
137137
]
138+
},
139+
"greenkeeper": {
140+
"ignore": [
141+
"extract-text-webpack-plugin",
142+
"karma-webpack",
143+
"webpack",
144+
"webpack-merge"
145+
]
138146
}
139147
}

β€Žtest/unit/.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@
66
"expect": true,
77
"jasmine": true,
88
"sinon": true
9+
},
10+
"rules": {
11+
"no-unused-expressions": 0
912
}
1013
}

0 commit comments

Comments
Β (0)