Skip to content

Commit a39ef49

Browse files
authored
Merge pull request #194 from sgratzl/release/v4.2.5
Release v4.2.5
2 parents 7bb0bef + 5e06cc9 commit a39ef49

File tree

7 files changed

+2374
-1839
lines changed

7 files changed

+2374
-1839
lines changed

.yarn/releases/yarn-3.6.1.cjs renamed to .yarn/releases/yarn-3.6.3.cjs

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

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ packageExtensions:
33
dependencies:
44
eslint-import-resolver-node: "*"
55

6-
yarnPath: .yarn/releases/yarn-3.6.1.cjs
6+
yarnPath: .yarn/releases/yarn-3.6.3.cjs

package.json

Lines changed: 35 additions & 31 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": "4.2.4",
4+
"version": "4.2.5",
55
"author": {
66
"name": "Samuel Gratzl",
77
"email": "sam@sgratzl.com",
@@ -50,9 +50,9 @@
5050
"chart.js": "^4.1.0"
5151
},
5252
"dependencies": {
53-
"@types/d3-geo": "^3.0.3",
53+
"@types/d3-geo": "^3.0.4",
5454
"@types/d3-scale-chromatic": "^3.0.0",
55-
"@types/topojson-client": "^3.1.1",
55+
"@types/topojson-client": "^3.1.2",
5656
"d3-array": "^3.2.4",
5757
"d3-color": "^3.1.0",
5858
"d3-geo": "^3.1.0",
@@ -62,55 +62,59 @@
6262
},
6363
"devDependencies": {
6464
"@chiogen/rollup-plugin-terser": "^7.1.3",
65-
"@rollup/plugin-commonjs": "^25.0.2",
66-
"@rollup/plugin-node-resolve": "^15.1.0",
65+
"@rollup/plugin-commonjs": "^25.0.4",
66+
"@rollup/plugin-node-resolve": "^15.2.1",
6767
"@rollup/plugin-replace": "^5.0.2",
68-
"@rollup/plugin-typescript": "^11.1.2",
69-
"@types/jest": "^29.5.2",
70-
"@types/jest-image-snapshot": "^6.1.0",
71-
"@types/node": "^20.3.3",
68+
"@rollup/plugin-typescript": "^11.1.3",
69+
"@types/jest": "^29.5.5",
70+
"@types/jest-image-snapshot": "^6.2.1",
71+
"@types/node": "^20.6.2",
7272
"@types/seedrandom": "^3.0.5",
73-
"@typescript-eslint/eslint-plugin": "^5.61.0",
74-
"@typescript-eslint/parser": "^5.61.0",
73+
"@typescript-eslint/eslint-plugin": "^6.7.0",
74+
"@typescript-eslint/parser": "^6.7.0",
7575
"@yarnpkg/pnpify": "^3.1.6",
7676
"@yarnpkg/sdks": "^2.7.1",
7777
"canvas": "^2.11.2",
7878
"canvas-5-polyfill": "^0.1.5",
79-
"chart.js": "^4.3.0",
79+
"chart.js": "^4.4.0",
8080
"chartjs-plugin-datalabels": "^2.2.0",
81-
"eslint": "^8.44.0",
82-
"eslint-config-airbnb-typescript": "^17.0.0",
83-
"eslint-config-prettier": "^8.8.0",
81+
"eslint": "^8.49.0",
82+
"eslint-config-airbnb-typescript": "^17.1.0",
83+
"eslint-config-prettier": "^9.0.0",
8484
"eslint-config-react-app": "^7.0.1",
8585
"eslint-plugin-flowtype": "^8.0.3",
86-
"eslint-plugin-import": "^2.27.5",
86+
"eslint-plugin-import": "^2.28.1",
8787
"eslint-plugin-jsx-a11y": "^6.7.1",
88-
"eslint-plugin-prettier": "^4.2.1",
89-
"eslint-plugin-react": "^7.32.2",
88+
"eslint-plugin-prettier": "^5.0.0",
89+
"eslint-plugin-react": "^7.33.2",
9090
"eslint-plugin-react-hooks": "^4.6.0",
91-
"jest": "^29.6.0",
92-
"jest-environment-jsdom": "^29.6.0",
93-
"jest-image-snapshot": "^6.1.0",
94-
"prettier": "^2.8.8",
91+
"jest": "^29.7.0",
92+
"jest-environment-jsdom": "^29.7.0",
93+
"jest-image-snapshot": "^6.2.0",
94+
"prettier": "^3.0.3",
9595
"rimraf": "^5.0.1",
96-
"rollup": "^3.26.0",
96+
"rollup": "^3.29.2",
9797
"rollup-plugin-cleanup": "^3.2.1",
98-
"rollup-plugin-dts": "^5.3.0",
98+
"rollup-plugin-dts": "^6.0.2",
9999
"seedrandom": "^3.0.5",
100100
"ts-jest": "^29.1.1",
101-
"tslib": "^2.6.0",
102-
"typedoc": "^0.24.8",
101+
"tslib": "^2.6.2",
102+
"typedoc": "^0.25.1",
103103
"typedoc-plugin-markdown": "^4.0.0-next.16",
104-
"typedoc-vitepress-theme": "^1.0.0-next.2",
105-
"typescript": "^5.1.6",
104+
"typedoc-vitepress-theme": "^1.0.0-next.3",
105+
"typescript": "^5.2.2",
106106
"us-atlas": "^3.0.1",
107-
"vitepress": "^1.0.0-beta.5",
107+
"vitepress": "^1.0.0-rc.14",
108108
"vue": "^3.3.4",
109109
"vue-chartjs": "^5.2.0",
110110
"world-atlas": "^2.0.2"
111111
},
112+
"resolutions": {
113+
"@typescript-eslint/eslint-plugin": "^6.7.0",
114+
"@typescript-eslint/parser": "^6.7.0"
115+
},
112116
"scripts": {
113-
"clean": "rimraf --glob build docs node_modules \"*.tgz\" \"*.tsbuildinfo\"",
117+
"clean": "rimraf --glob build node_modules \"*.tgz\" \"*.tsbuildinfo\"",
114118
"compile": "tsc -b tsconfig.c.json",
115119
"start": "yarn run watch",
116120
"watch": "rollup -c -w",
@@ -130,5 +134,5 @@
130134
"docs:build": "yarn run docs:api && vitepress build docs",
131135
"docs:preview": "vitepress preview docs"
132136
},
133-
"packageManager": "yarn@3.6.1"
137+
"packageManager": "yarn@3.6.3"
134138
}

src/__tests__/createChart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export interface ChartHelper<TYPE extends ChartType, DATA extends unknown[] = De
3333
export default function createChart<
3434
TYPE extends ChartType,
3535
DATA extends unknown[] = DefaultDataPoint<TYPE>,
36-
LABEL = string
36+
LABEL = string,
3737
>(config: ChartConfiguration<TYPE, DATA, LABEL>, width = 800, height = 600): ChartHelper<TYPE, DATA, LABEL> {
3838
const canvas = document.createElement('canvas');
3939
canvas.width = width;

src/controllers/GeoController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function patchDatasetElementOptions(options: any) {
5353

5454
export class GeoController<
5555
TYPE extends keyof ChartTypeRegistry,
56-
TElement extends Element & VisualElement
56+
TElement extends Element & VisualElement,
5757
> extends DatasetController<TYPE, TElement, GeoFeature> {
5858
getGeoDataset(): ChartDataset<'choropleth' | 'bubbleMap'> & IGeoControllerDatasetOptions {
5959
return super.getDataset() as unknown as ChartDataset<'choropleth' | 'bubbleMap'> & IGeoControllerDatasetOptions;

src/scales/LegendScale.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ export class LegendScale<O extends ILegendScaleOptions & LinearScaleOptions> ext
267267
}
268268

269269
export class LogarithmicLegendScale<
270-
O extends ILegendScaleOptions & LogarithmicScaleOptions
270+
O extends ILegendScaleOptions & LogarithmicScaleOptions,
271271
> extends LogarithmicScale<O> {
272272
/**
273273
* @hidden

0 commit comments

Comments
 (0)