Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
simonbrunel committed Aug 23, 2019
1 parent 451589a commit d85e750
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 26 deletions.
1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ extends: chartjs

parserOptions:
sourceType: module
ecmaVersion: 2015

env:
browser: true
Expand Down
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
language: node_js
node_js:
- lts/*
node_js: lts/*
dist: xenial

services:
- xvfb

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
Expand Down
11 changes: 5 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ var argv = require('yargs')

function run(bin, args) {
return new Promise((resolve, reject) => {
var exe = '"' + process.execPath + '"';
var src = require.resolve(bin);
var ps = exec([exe, src].concat(args || []).join(' '));
var exe = path.join('node_modules', '.bin', bin);
var ps = exec([exe].concat(args || []).join(' '));

ps.stdout.pipe(process.stdout);
ps.stderr.pipe(process.stderr);
Expand All @@ -38,7 +37,7 @@ function run(bin, args) {
}

gulp.task('build', function() {
return run('rollup/bin/rollup', ['-c', argv.watch ? '--watch' : '']);
return run('rollup', ['-c', argv.watch ? '--watch' : '']);
});

gulp.task('test-unit', function(done) {
Expand All @@ -59,7 +58,7 @@ gulp.task('test-unit', function(done) {
});

gulp.task('test-types', function() {
return run('typescript/bin/tsc', ['-p', 'types/test/']);
return run('tsc', ['-p', 'types/test/']);
});

gulp.task('test', gulp.parallel('test-unit', 'test-types'));
Expand All @@ -83,7 +82,7 @@ gulp.task('docs', function() {
var mode = argv.watch ? 'dev' : 'build';
var out = path.join(argv.output, argv.docsDir);
var args = argv.watch ? '' : '--dest ' + out;
return run('vuepress/bin/vuepress.js', [mode, 'docs', args]);
return run('vuepress', [mode, 'docs', args]);
});

gulp.task('samples', function() {
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@
"types/*.d.ts"
],
"devDependencies": {
"@types/chart.js": "^2.7.52",
"@types/chart.js": "^2.7.56",
"chart.js": "~2.8.0",
"eslint-config-chartjs": "^0.1.0",
"eslint-plugin-es": "^1.4.0",
"eslint-plugin-html": "^5.0.3",
"gulp": "^4.0.0",
"gulp-eslint": "^5.0.0",
"eslint-plugin-html": "^6.0.0",
"gulp": "^4.0.2",
"gulp-eslint": "^6.0.0",
"gulp-file": "^0.4.0",
"gulp-replace": "^1.0.0",
"gulp-streamify": "^1.0.2",
"gulp-zip": "^4.2.0",
"gulp-zip": "^5.0.0",
"jasmine-core": "^3.4.0",
"karma": "^4.1.0",
"karma": "^4.2.0",
"karma-coverage": "^1.1.2",
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "^2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"karma-rollup-preprocessor": "^7.0.0",
"karma-rollup-preprocessor": "^7.0.2",
"karma-spec-reporter": "^0.0.32",
"merge2": "^1.2.3",
"pixelmatch": "^4.0.2",
"rollup": "^1.11.2",
"rollup-plugin-commonjs": "^9.3.4",
"pixelmatch": "^5.0.2",
"rollup": "^1.17.0",
"rollup-plugin-commonjs": "^10.0.1",
"rollup-plugin-istanbul": "^2.0.1",
"rollup-plugin-node-resolve": "^4.2.3",
"rollup-plugin-terser": "^4.0.4",
"typescript": "^3.4.5",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-terser": "^5.1.1",
"typescript": "^3.5.3",
"vuepress": "^0.14.11",
"yargs": "^13.2.2"
"yargs": "^13.3.0"
},
"peerDependencies": {
"chart.js": ">= 2.7.0 < 3"
Expand Down
2 changes: 2 additions & 0 deletions samples/.eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ globals:

parserOptions:
sourceType: script
ecmaFeatures:
globalReturn: false

rules:
no-unused-vars: 0
4 changes: 2 additions & 2 deletions test/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ function acquireChart(config, options) {
options.wrapper = options.wrapper || {class: 'chartjs-wrapper'};

for (key in options.canvas) {
if (options.canvas.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(options.canvas, key)) {
canvas.setAttribute(key, options.canvas[key]);
}
}

for (key in options.wrapper) {
if (options.wrapper.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(options.wrapper, key)) {
wrapper.setAttribute(key, options.wrapper[key]);
}
}
Expand Down

0 comments on commit d85e750

Please sign in to comment.