Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> 0.5%
last 2 versions
Firefox ESR
not dead
defaults
not IE 11
not IE_Mob 11
maintained node versions
2 changes: 0 additions & 2 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ env:
browser: true
node: true

parser: babel-eslint

parserOptions:
ecmaVersion: 7
sourceType: module
Expand Down
19 changes: 0 additions & 19 deletions babel.config.json

This file was deleted.

13 changes: 7 additions & 6 deletions docs/docs/developers/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ Latest builds are available for testing at:

## Browser support

Chart.js offers support for the following browsers:
All modern and up-to-date browsers are supported, including, but not limited to:

- Chrome 50+
- Firefox 45+
- Internet Explorer 11
- Edge 14+
- Safari 9+
Chrome
Edge
Firefox
Safari

As of version 3, we have dropped Internet Explorer 11 support.

Browser support for the canvas element is available in all modern & major mobile browsers. [CanIUse](https://caniuse.com/#feat=canvas)

Expand Down
15 changes: 9 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* eslint-disable import/no-commonjs */

const commonjs = require('@rollup/plugin-commonjs');
const istanbul = require('rollup-plugin-istanbul');
const json = require('@rollup/plugin-json');
const resolve = require('@rollup/plugin-node-resolve').default;
const builds = require('./rollup.config');
const yargs = require('yargs');


module.exports = function(karma) {
const args = yargs
.option('verbose', {default: false})
Expand All @@ -22,6 +22,14 @@ module.exports = function(karma) {
const regex = karma.autoWatch ? /chart\.js$/ : /chart\.min\.js$/;
const build = builds.filter(v => v.output.file && v.output.file.match(regex))[0];

if (args.coverage) {
build.plugins = [
json(),
resolve(),
istanbul({exclude: ['node_modules/**/*.js', 'package.json']})
];
}

karma.set({
frameworks: ['jasmine'],
reporters: ['progress', 'kjhtml'],
Expand Down Expand Up @@ -101,11 +109,6 @@ module.exports = function(karma) {
browserDisconnectTolerance: 3
});

// https://swizec.com/blog/how-to-run-javascript-tests-in-chrome-on-travis/swizec/6647
if (process.env.TRAVIS) {
karma.customLaunchers.chrome.flags.push('--no-sandbox');
}

if (args.coverage) {
karma.reporters.push('coverage');
karma.coverageReporter = {
Expand Down
Loading