Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
962ee4b
Add element diagrams to the annotation types guide
stockiNail Jun 6, 2022
05e619c
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Jun 8, 2022
22a3aa3
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Jun 8, 2022
f5186fe
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Jun 8, 2022
6d87201
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Jul 21, 2022
84366b3
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Jul 22, 2022
ec3a554
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Jul 26, 2022
1324e43
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Aug 4, 2022
693e84d
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Aug 19, 2022
30b5941
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Aug 19, 2022
b30c95e
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Sep 28, 2022
ff2a323
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Sep 28, 2022
b686c7a
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Oct 28, 2022
e2ebc2f
Change CHART.JS dependency to version 4
stockiNail Nov 15, 2022
ec10efe
changes peerDeps
stockiNail Nov 15, 2022
30446eb
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Nov 15, 2022
86f878a
Merge remote-tracking branch 'origin/master' into chartjs4
stockiNail Nov 15, 2022
3a7b092
changes peerDep
stockiNail Nov 15, 2022
63e01f8
Merge branch 'master' of https://github.com/chartjs/chartjs-plugin-an…
stockiNail Nov 15, 2022
6e08cff
Merge remote-tracking branch 'origin/master' into chartjs4
stockiNail Nov 15, 2022
8ecf68d
fixes transpiller of webpack for doc
stockiNail Nov 16, 2022
fe629a3
removes axis options no needed
stockiNail Nov 16, 2022
0a9fee4
apply review removing noDefaultScale fixtures for a unit test
stockiNail Nov 17, 2022
5a50735
acquiring a chart to test retrieveScaleID function
stockiNail Nov 17, 2022
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
11 changes: 11 additions & 0 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ module.exports = {
},
}],
],
chainWebpack(config) {
config.module
.rule('chart.js')
.include.add(path.resolve('node_modules/chart.js')).end()
.use('babel-loader')
.loader('babel-loader')
.options({
presets: ['@babel/preset-env']
})
.end();
},
markdown: {
extendMarkdown: md => {
md.use(require('markdown-it-include'), path.resolve(__dirname, '../'));
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ module.exports = function(karma) {
files: [
{pattern: 'test/fixtures/**/*.js', included: false},
{pattern: 'test/fixtures/**/*.png', included: false},
{pattern: 'node_modules/chart.js/dist/chart.js'},
{pattern: 'node_modules/chart.js/dist/chart.umd.js'},
{pattern: 'src/index.js', watched: false},
{pattern: 'test/index.js'},
{pattern: 'test/specs/**/**.js'}
Expand Down
3,199 changes: 1,605 additions & 1,594 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 17 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "chartjs-plugin-annotation",
"homepage": "https://www.chartjs.org/chartjs-plugin-annotation/index",
"description": "Annotations for Chart.js",
"version": "2.0.1",
"version": "2.1.0",
"author": "Evert Timberg <evert.timberg@gmail.com>",
"license": "MIT",
"main": "dist/chartjs-plugin-annotation.js",
Expand Down Expand Up @@ -33,14 +33,18 @@
"test-types-integration": "mocha --full-trace test/integration/*-test.js"
},
"devDependencies": {
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.0",
"@babel/core": "^7.20.2",
"@babel/preset-env": "^7.20.2",
"@rollup/plugin-json": "^5.0.1",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-terser": "^0.1.0",
"@simonbrunel/vuepress-plugin-versions": "^0.2.0",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"chart.js": "^3.7.0",
"babel-loader": "^8.3.0",
"chart.js": "^4.0.1",
"chartjs-plugin-autocolors": "^0.0.5",
"chartjs-test-utils": "^0.4.0",
"chartjs-test-utils": "^0.5.0",
"concurrently": "^7.0.0",
"cross-env": "^7.0.3",
"eslint": "^8.2.0",
Expand All @@ -53,25 +57,25 @@
"karma-chrome-launcher": "^3.1.0",
"karma-coverage": "^2.0.3",
"karma-firefox-launcher": "^2.1.0",
"karma-jasmine": "^4.0.1",
"karma-jasmine-html-reporter": "^1.5.4",
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"karma-rollup-preprocessor": "^7.0.7",
"markdown-it-include": "^2.0.0",
"mocha": "^9.1.3",
"pixelmatch": "^5.2.1",
"rollup": "^2.45.2",
"rollup-plugin-istanbul": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
"rollup": "^3.3.0",
"rollup-plugin-istanbul": "^4.0.0",
"typedoc": "^0.23.8",
"typedoc-plugin-markdown": "^3.13.3",
"typescript": "^4.2.4",
"vuepress": "^1.8.2",
"vuepress": "^1.9.7",
"vuepress-plugin-flexsearch": "^0.3.0",
"vuepress-plugin-redirect": "^1.2.5",
"vuepress-plugin-typedoc": "^0.10.0",
"vuepress-theme-chartjs": "^0.2.0"
"vuepress-theme-chartjs": "^0.2.0",
"webpack": "^4.46.0"
},
"peerDependencies": {
"chart.js": "^3.7.0"
"chart.js": ">=3.7.0"
}
}
2 changes: 1 addition & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const json = require('@rollup/plugin-json');
const resolve = require('@rollup/plugin-node-resolve').default;
const terser = require('rollup-plugin-terser').terser;
const terser = require('@rollup/plugin-terser').default;
const {name, version, homepage, main, module: _module} = require('./package.json');

const banner = `/*!
Expand Down
53 changes: 0 additions & 53 deletions test/fixtures/box/noDefaultScales.js

This file was deleted.

Binary file removed test/fixtures/box/noDefaultScales.png
Binary file not shown.
53 changes: 0 additions & 53 deletions test/fixtures/ellipse/noDefaultScales.js

This file was deleted.

Binary file removed test/fixtures/ellipse/noDefaultScales.png
Binary file not shown.
Binary file modified test/fixtures/label/clip-false.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 0 additions & 49 deletions test/fixtures/label/noDefaultScales.js

This file was deleted.

Binary file removed test/fixtures/label/noDefaultScales.png
Binary file not shown.
54 changes: 0 additions & 54 deletions test/fixtures/line/noDefaultScales.js

This file was deleted.

Binary file removed test/fixtures/line/noDefaultScales.png
Binary file not shown.
47 changes: 0 additions & 47 deletions test/fixtures/point/noDefaultScales.js

This file was deleted.

Binary file removed test/fixtures/point/noDefaultScales.png
Binary file not shown.
Loading