Skip to content

Commit 8e7669a

Browse files
sgratzlsgratzl
authored
Merge pull request #92 from sgratzl/release/v3.6.0
Release v3.6.0
2 parents 0c817ce + ca2630b commit 8e7669a

19 files changed

+1810
-1873
lines changed

‎.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/.pnp.cjs
1+
/.pnp*
22
/.yarnrc.yml
33
/.yarn
44
/build

‎.yarn/releases/yarn-3.0.2.cjs

Lines changed: 0 additions & 631 deletions
This file was deleted.

‎.yarn/releases/yarn-3.1.0.cjs

Lines changed: 768 additions & 0 deletions
Large diffs are not rendered by default.

‎.yarnrc.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@ packageExtensions:
22
eslint-module-utils@*:
33
dependencies:
44
eslint-import-resolver-node: "*"
5-
eslint-config-airbnb-typescript@*:
6-
dependencies:
7-
eslint-config-airbnb-base: '*'
85

9-
yarnPath: .yarn/releases/yarn-3.0.2.cjs
6+
yarnPath: .yarn/releases/yarn-3.1.0.cjs

‎package.json

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "chartjs-chart-geo",
33
"description": "Chart.js module for charting maps",
4-
"version": "3.5.2",
4+
"version": "3.6.0",
55
"author": {
66
"name": "Samuel Gratzl",
77
"email": "sam@sgratzl.com",
@@ -36,7 +36,7 @@
3636
"src/**/*.ts"
3737
],
3838
"peerDependencies": {
39-
"chart.js": "^3.5.1"
39+
"chart.js": "^3.6.0"
4040
},
4141
"dependencies": {
4242
"@types/d3-geo": "^3.0.2",
@@ -48,45 +48,44 @@
4848
"topojson-client": "^3.1.0"
4949
},
5050
"devDependencies": {
51-
"@rollup/plugin-commonjs": "^21.0.0",
52-
"@rollup/plugin-node-resolve": "^13.0.5",
51+
"@rollup/plugin-commonjs": "^21.0.1",
52+
"@rollup/plugin-node-resolve": "^13.0.6",
5353
"@rollup/plugin-replace": "^3.0.0",
54-
"@rollup/plugin-typescript": "^8.2.5",
54+
"@rollup/plugin-typescript": "^8.3.0",
5555
"@types/jest": "^27.0.2",
5656
"@types/jest-image-snapshot": "^4.3.1",
57-
"@types/node": "^16.10.3",
58-
"@types/offscreencanvas": "^2019.6.4",
57+
"@types/node": "^16.11.6",
5958
"@types/seedrandom": "^3.0.1",
60-
"@typescript-eslint/eslint-plugin": "^4.33.0",
61-
"@typescript-eslint/parser": "^4.33.0",
62-
"@yarnpkg/pnpify": "^3.0.1",
63-
"@yarnpkg/sdks": "^2.4.2-rc.8",
59+
"@typescript-eslint/eslint-plugin": "^5.3.0",
60+
"@typescript-eslint/parser": "^5.3.0",
61+
"@yarnpkg/pnpify": "^3.1.0",
62+
"@yarnpkg/sdks": "^2.5.0",
6463
"canvas": "^2.8.0",
6564
"canvas-5-polyfill": "^0.1.5",
66-
"chart.js": "3.5.1",
67-
"eslint": "^7.32.0",
65+
"chart.js": "^3.6.0",
66+
"eslint": "^8.1.0",
6867
"eslint-config-airbnb-typescript": "^14.0.1",
6968
"eslint-config-prettier": "^8.3.0",
7069
"eslint-config-react-app": "^6.0.0",
71-
"eslint-plugin-flowtype": "^6.1.0",
72-
"eslint-plugin-import": "^2.24.2",
70+
"eslint-plugin-flowtype": "^8.0.3",
71+
"eslint-plugin-import": "^2.25.2",
7372
"eslint-plugin-jsx-a11y": "^6.4.1",
7473
"eslint-plugin-prettier": "^4.0.0",
7574
"eslint-plugin-react": "^7.26.1",
7675
"eslint-plugin-react-hooks": "^4.2.0",
77-
"jest": "^27.2.5",
76+
"jest": "^27.3.1",
7877
"jest-image-snapshot": "^4.5.1",
7978
"prettier": "^2.4.1",
8079
"rimraf": "^3.0.2",
81-
"rollup": "^2.58.0",
80+
"rollup": "^2.59.0",
8281
"rollup-plugin-cleanup": "^3.2.1",
8382
"rollup-plugin-dts": "^4.0.0",
8483
"rollup-plugin-terser": "^7.0.2",
8584
"seedrandom": "^3.0.5",
86-
"ts-jest": "^27.0.5",
85+
"ts-jest": "^27.0.7",
8786
"tslib": "^2.3.1",
88-
"typedoc": "^0.22.5",
89-
"typescript": "^4.4.3",
87+
"typedoc": "^0.22.7",
88+
"typescript": "^4.4.4",
9089
"us-atlas": "^3.0.0",
9190
"world-atlas": "^2.0.2"
9291
},
@@ -112,9 +111,9 @@
112111
"docs": "typedoc src/index.ts",
113112
"prepare": "yarn run build"
114113
},
115-
"packageManager": "yarn@3.0.2",
114+
"packageManager": "yarn@3.1.0",
116115
"dependenciesMeta": {
117-
"chart.js@3.5.0": {
116+
"chart.js@3.6.0": {
118117
"unplugged": true
119118
}
120119
}

‎samples/albers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="../build/index.umd.js"></script>
66
</head>
77

‎samples/albersCustom.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="../build/index.umd.js"></script>
66
</head>
77

‎samples/albersLegend.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="../build/index.umd.js"></script>
66
</head>
77

‎samples/albersLog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="../build/index.umd.js"></script>
66
</head>
77

‎samples/bubbleMap.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="https://unpkg.com/chartjs-plugin-datalabels@next"></script>
66
<script src="../build/index.umd.js"></script>
77
<script src="https://unpkg.com/papaparse"></script>

‎samples/bubbleMapArea.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
66
<script src="../build/index.umd.js"></script>
77
<script src="https://unpkg.com/papaparse"></script>

‎samples/bubbleMapLog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
66
<script src="../build/index.umd.js"></script>
77
<script src="https://unpkg.com/papaparse"></script>

‎samples/default_esm.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap-shim">
1212
{
1313
"imports": {
14-
"chart.js": "https://unpkg.com/chart.js@3.5.1?module",
15-
"chart.js/helpers": "https://unpkg.com/chart.js@3.5.1/helpers/helpers.esm.js?module",
14+
"chart.js": "https://unpkg.com/chart.js@3.6.0?module",
15+
"chart.js/helpers": "https://unpkg.com/chart.js@3.6.0/helpers/helpers.esm.js?module",
1616
"chartjs-chart-geo": "../build/index.js",
1717
"d3-geo": "https://unpkg.com/d3-geo?module",
1818
"d3-scale-chromatic": "https://unpkg.com/d3-scale-chromatic?module",

‎samples/earth.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="../build/index.umd.js"></script>
66
</head>
77

‎samples/earth_click.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="../build/index.umd.js"></script>
66
</head>
77

‎samples/germany.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://unpkg.com/chart.js@3.5.1/dist/chart.js"></script>
4+
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
55
<script src="../build/index.umd.js"></script>
66
</head>
77

‎src/__tests__/createChart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default function createChart<
3838
const canvas = document.createElement('canvas');
3939
canvas.width = width;
4040
canvas.height = height;
41-
defaults.font.family = 'Courier New';
41+
Object.assign(defaults.font, { family: 'Courier New' });
4242
// defaults.color = 'transparent';
4343
// eslint-disable-next-line no-param-reassign
4444
config.options = {

‎src/scales/SizeScale.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
import {
2-
defaults,
3-
LinearScale,
4-
LogarithmicScale,
5-
PointOptions,
6-
LinearScaleOptions,
7-
LogarithmicScaleOptions,
8-
} from 'chart.js';
1+
import { LinearScale, LogarithmicScale, PointOptions, LinearScaleOptions, LogarithmicScaleOptions } from 'chart.js';
92
import { merge, drawPoint } from 'chart.js/helpers';
103
import { baseDefaults, ILegendScaleOptions, LegendScale, LogarithmicLegendScale } from './LegendScale';
114

@@ -123,9 +116,9 @@ export class SizeScale extends LegendScale<ISizeScaleOptions & LinearScaleOption
123116

124117
if (this._model) {
125118
const props = this._model;
126-
ctx.strokeStyle = props.borderColor || defaults.color;
119+
ctx.strokeStyle = props.borderColor;
127120
ctx.lineWidth = props.borderWidth || 0;
128-
ctx.fillStyle = props.backgroundColor || defaults.color;
121+
ctx.fillStyle = props.backgroundColor;
129122
} else {
130123
ctx.fillStyle = 'blue';
131124
}

0 commit comments

Comments
 (0)