Skip to content

Commit

Permalink
Merge pull request #194 from sgratzl/release/v4.2.5
Browse files Browse the repository at this point in the history
Release v4.2.5
  • Loading branch information
sgratzl authored Sep 16, 2023
2 parents 7bb0bef + 5e06cc9 commit a39ef49
Show file tree
Hide file tree
Showing 7 changed files with 2,374 additions and 1,839 deletions.
402 changes: 201 additions & 201 deletions .yarn/releases/yarn-3.6.1.cjs → .yarn/releases/yarn-3.6.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ packageExtensions:
dependencies:
eslint-import-resolver-node: "*"

yarnPath: .yarn/releases/yarn-3.6.1.cjs
yarnPath: .yarn/releases/yarn-3.6.3.cjs
66 changes: 35 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "chartjs-chart-geo",
"description": "Chart.js module for charting maps",
"version": "4.2.4",
"version": "4.2.5",
"author": {
"name": "Samuel Gratzl",
"email": "[email protected]",
Expand Down Expand Up @@ -50,9 +50,9 @@
"chart.js": "^4.1.0"
},
"dependencies": {
"@types/d3-geo": "^3.0.3",
"@types/d3-geo": "^3.0.4",
"@types/d3-scale-chromatic": "^3.0.0",
"@types/topojson-client": "^3.1.1",
"@types/topojson-client": "^3.1.2",
"d3-array": "^3.2.4",
"d3-color": "^3.1.0",
"d3-geo": "^3.1.0",
Expand All @@ -62,55 +62,59 @@
},
"devDependencies": {
"@chiogen/rollup-plugin-terser": "^7.1.3",
"@rollup/plugin-commonjs": "^25.0.2",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-typescript": "^11.1.2",
"@types/jest": "^29.5.2",
"@types/jest-image-snapshot": "^6.1.0",
"@types/node": "^20.3.3",
"@rollup/plugin-typescript": "^11.1.3",
"@types/jest": "^29.5.5",
"@types/jest-image-snapshot": "^6.2.1",
"@types/node": "^20.6.2",
"@types/seedrandom": "^3.0.5",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"@yarnpkg/pnpify": "^3.1.6",
"@yarnpkg/sdks": "^2.7.1",
"canvas": "^2.11.2",
"canvas-5-polyfill": "^0.1.5",
"chart.js": "^4.3.0",
"chart.js": "^4.4.0",
"chartjs-plugin-datalabels": "^2.2.0",
"eslint": "^8.44.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.8.0",
"eslint": "^8.49.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^29.6.0",
"jest-environment-jsdom": "^29.6.0",
"jest-image-snapshot": "^6.1.0",
"prettier": "^2.8.8",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-image-snapshot": "^6.2.0",
"prettier": "^3.0.3",
"rimraf": "^5.0.1",
"rollup": "^3.26.0",
"rollup": "^3.29.2",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-dts": "^5.3.0",
"rollup-plugin-dts": "^6.0.2",
"seedrandom": "^3.0.5",
"ts-jest": "^29.1.1",
"tslib": "^2.6.0",
"typedoc": "^0.24.8",
"tslib": "^2.6.2",
"typedoc": "^0.25.1",
"typedoc-plugin-markdown": "^4.0.0-next.16",
"typedoc-vitepress-theme": "^1.0.0-next.2",
"typescript": "^5.1.6",
"typedoc-vitepress-theme": "^1.0.0-next.3",
"typescript": "^5.2.2",
"us-atlas": "^3.0.1",
"vitepress": "^1.0.0-beta.5",
"vitepress": "^1.0.0-rc.14",
"vue": "^3.3.4",
"vue-chartjs": "^5.2.0",
"world-atlas": "^2.0.2"
},
"resolutions": {
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0"
},
"scripts": {
"clean": "rimraf --glob build docs node_modules \"*.tgz\" \"*.tsbuildinfo\"",
"clean": "rimraf --glob build node_modules \"*.tgz\" \"*.tsbuildinfo\"",
"compile": "tsc -b tsconfig.c.json",
"start": "yarn run watch",
"watch": "rollup -c -w",
Expand All @@ -130,5 +134,5 @@
"docs:build": "yarn run docs:api && vitepress build docs",
"docs:preview": "vitepress preview docs"
},
"packageManager": "[email protected].1"
"packageManager": "[email protected].3"
}
2 changes: 1 addition & 1 deletion src/__tests__/createChart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export interface ChartHelper<TYPE extends ChartType, DATA extends unknown[] = De
export default function createChart<
TYPE extends ChartType,
DATA extends unknown[] = DefaultDataPoint<TYPE>,
LABEL = string
LABEL = string,
>(config: ChartConfiguration<TYPE, DATA, LABEL>, width = 800, height = 600): ChartHelper<TYPE, DATA, LABEL> {
const canvas = document.createElement('canvas');
canvas.width = width;
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/GeoController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function patchDatasetElementOptions(options: any) {

export class GeoController<
TYPE extends keyof ChartTypeRegistry,
TElement extends Element & VisualElement
TElement extends Element & VisualElement,
> extends DatasetController<TYPE, TElement, GeoFeature> {
getGeoDataset(): ChartDataset<'choropleth' | 'bubbleMap'> & IGeoControllerDatasetOptions {
return super.getDataset() as unknown as ChartDataset<'choropleth' | 'bubbleMap'> & IGeoControllerDatasetOptions;
Expand Down
2 changes: 1 addition & 1 deletion src/scales/LegendScale.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export class LegendScale<O extends ILegendScaleOptions & LinearScaleOptions> ext
}

export class LogarithmicLegendScale<
O extends ILegendScaleOptions & LogarithmicScaleOptions
O extends ILegendScaleOptions & LogarithmicScaleOptions,
> extends LogarithmicScale<O> {
/**
* @hidden
Expand Down
Loading

0 comments on commit a39ef49

Please sign in to comment.