Skip to content

Commit c08bc7b

Browse files
authored
Merge pull request #224 from sgratzl/release/v4.3.0
Release v4.3.0
2 parents be39791 + 56537b2 commit c08bc7b

File tree

12 files changed

+2400
-2182
lines changed

12 files changed

+2400
-2182
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
12-
- uses: actions/setup-node@v3
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-node@v4
1313
with:
1414
node-version: 20
1515
- run: npm i -g yarn
1616
- run: yarn config set checksumBehavior ignore
1717
- name: Cache Node.js modules
18-
uses: actions/cache@v3
18+
uses: actions/cache@v4
1919
with:
2020
path: |
2121
./.yarn/cache
@@ -27,7 +27,7 @@ jobs:
2727
- run: yarn build
2828
- run: yarn lint
2929
- run: yarn test
30-
- uses: actions/upload-artifact@v2
30+
- uses: actions/upload-artifact@v4
3131
if: failure()
3232
with:
3333
name: diff outputs

.github/workflows/create_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Check out code
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
ref: main
2121
ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}

.github/workflows/deploy_website.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ jobs:
1414
name: github-pages
1515
url: ${{ steps.deployment.outputs.page_url }}
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
20-
- uses: actions/setup-node@v3
20+
- uses: actions/setup-node@v4
2121
with:
2222
node-version: 20
2323
cache: npm
2424
- run: npm i -g yarn
2525
- run: yarn config set checksumBehavior ignore
2626
- name: Cache Node.js modules
27-
uses: actions/cache@v3
27+
uses: actions/cache@v4
2828
with:
2929
path: |
3030
./.yarn/cache
@@ -34,10 +34,10 @@ jobs:
3434
${{ runner.os }}-yarn2-v5
3535
- run: yarn install
3636
- run: yarn docs:build
37-
- uses: actions/configure-pages@v2
38-
- uses: actions/upload-pages-artifact@v1
37+
- uses: actions/configure-pages@v4
38+
- uses: actions/upload-pages-artifact@v3
3939
with:
4040
path: docs/.vitepress/dist
4141
- name: Deploy
4242
id: deployment
43-
uses: actions/deploy-pages@v1
43+
uses: actions/deploy-pages@v4

.github/workflows/release_helper.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check out code
20-
uses: actions/checkout@v3
21-
- uses: actions/setup-node@v3
20+
uses: actions/checkout@v4
21+
- uses: actions/setup-node@v4
2222
with:
2323
node-version: 20
2424
- name: Extract version
@@ -51,14 +51,14 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Check out code
54-
uses: actions/checkout@v3
55-
- uses: actions/setup-node@v3
54+
uses: actions/checkout@v4
55+
- uses: actions/setup-node@v4
5656
with:
5757
node-version: 20
5858
- run: npm i -g yarn
5959
- run: yarn config set checksumBehavior ignore
6060
- name: Cache Node.js modules
61-
uses: actions/cache@v3
61+
uses: actions/cache@v4
6262
with:
6363
path: |
6464
./.yarn/cache
@@ -86,7 +86,7 @@ jobs:
8686
runs-on: ubuntu-latest
8787
steps:
8888
- name: Check out code
89-
uses: actions/checkout@v3
89+
uses: actions/checkout@v4
9090
with:
9191
ref: dev
9292
ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}

.yarn/releases/yarn-4.0.2.cjs renamed to .yarn/releases/yarn-4.1.1.cjs

Lines changed: 336 additions & 336 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-4.0.2.cjs
6+
yarnPath: .yarn/releases/yarn-4.1.1.cjs

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ CodePens
5050

5151
The option can be set globally or per dataset
5252

53-
see https://github.com/sgratzl/chartjs-chart-geo/blob/main/src/controllers/GeoController.ts#L221
53+
see [https://github.com/sgratzl/chartjs-chart-geo/blob/main/src/controllers/GeoController.ts#L221](https://github.com/sgratzl/chartjs-chart-geo/blob/be3979117f8ae9a249969593c108d9b92b7e07fa/src/controllers/GeoController.ts#L225-L254)
5454

5555
## Choropleth
5656

package.json

Lines changed: 22 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": "4.2.8",
4+
"version": "4.3.0",
55
"author": {
66
"name": "Samuel Gratzl",
77
"email": "sam@sgratzl.com",
@@ -55,9 +55,9 @@
5555
"@types/topojson-client": "^3.1.4",
5656
"d3-array": "^3.2.4",
5757
"d3-color": "^3.1.0",
58-
"d3-geo": "^3.1.0",
58+
"d3-geo": "^3.1.1",
5959
"d3-interpolate": "^3.0.1",
60-
"d3-scale-chromatic": "^3.0.0",
60+
"d3-scale-chromatic": "^3.1.0",
6161
"topojson-client": "^3.1.0"
6262
},
6363
"devDependencies": {
@@ -66,52 +66,52 @@
6666
"@rollup/plugin-node-resolve": "^15.2.3",
6767
"@rollup/plugin-replace": "^5.0.5",
6868
"@rollup/plugin-typescript": "^11.1.6",
69-
"@types/jest": "^29.5.11",
69+
"@types/jest": "^29.5.12",
7070
"@types/jest-image-snapshot": "^6.4.0",
71-
"@types/node": "^20.11.5",
71+
"@types/node": "^20.11.27",
7272
"@types/seedrandom": "^3.0.8",
73-
"@typescript-eslint/eslint-plugin": "^6.19.0",
74-
"@typescript-eslint/parser": "^6.19.0",
73+
"@typescript-eslint/eslint-plugin": "^7.2.0",
74+
"@typescript-eslint/parser": "^7.2.0",
7575
"@yarnpkg/pnpify": "^4.0.1",
7676
"@yarnpkg/sdks": "^3.1.0",
7777
"canvas": "^2.11.2",
7878
"canvas-5-polyfill": "^0.1.5",
79-
"chart.js": "^4.4.1",
79+
"chart.js": "^4.4.2",
8080
"chartjs-plugin-datalabels": "^2.2.0",
81-
"eslint": "^8.56.0",
82-
"eslint-config-airbnb-typescript": "^17.1.0",
81+
"eslint": "^8.57.0",
82+
"eslint-config-airbnb-typescript": "^18.0.0",
8383
"eslint-config-prettier": "^9.1.0",
8484
"eslint-config-react-app": "^7.0.1",
8585
"eslint-plugin-flowtype": "^8.0.3",
8686
"eslint-plugin-import": "^2.29.1",
8787
"eslint-plugin-jsx-a11y": "^6.8.0",
8888
"eslint-plugin-prettier": "^5.1.3",
89-
"eslint-plugin-react": "^7.33.2",
89+
"eslint-plugin-react": "^7.34.0",
9090
"eslint-plugin-react-hooks": "^4.6.0",
9191
"jest": "^29.7.0",
9292
"jest-environment-jsdom": "^29.7.0",
9393
"jest-image-snapshot": "^6.4.0",
94-
"prettier": "^3.2.4",
94+
"prettier": "^3.2.5",
9595
"rimraf": "^5.0.5",
96-
"rollup": "^4.9.6",
96+
"rollup": "^4.13.0",
9797
"rollup-plugin-cleanup": "^3.2.1",
9898
"rollup-plugin-dts": "^6.1.0",
9999
"seedrandom": "^3.0.5",
100-
"ts-jest": "^29.1.1",
100+
"ts-jest": "^29.1.2",
101101
"tslib": "^2.6.2",
102-
"typedoc": "^0.25.7",
102+
"typedoc": "^0.25.12",
103103
"typedoc-plugin-markdown": "^4.0.0-next.16",
104-
"typedoc-vitepress-theme": "^1.0.0-next.7",
105-
"typescript": "^5.3.3",
104+
"typedoc-vitepress-theme": "^1.0.0-next.9",
105+
"typescript": "^5.4.2",
106106
"us-atlas": "^3.0.1",
107-
"vitepress": "^1.0.0-rc.39",
108-
"vue": "^3.4.15",
107+
"vitepress": "^1.0.0-rc.45",
108+
"vue": "^3.4.21",
109109
"vue-chartjs": "^5.3.0",
110110
"world-atlas": "^2.0.2"
111111
},
112112
"resolutions": {
113-
"@typescript-eslint/eslint-plugin": "^6.7.0",
114-
"@typescript-eslint/parser": "^6.19.0"
113+
"@typescript-eslint/eslint-plugin": "^7.2.0",
114+
"@typescript-eslint/parser": "^7.2.0"
115115
},
116116
"scripts": {
117117
"clean": "rimraf --glob build node_modules \"*.tgz\" \"*.tsbuildinfo\"",
@@ -134,5 +134,5 @@
134134
"docs:build": "yarn run docs:api && vitepress build docs",
135135
"docs:preview": "vitepress preview docs"
136136
},
137-
"packageManager": "yarn@4.0.2"
137+
"packageManager": "yarn@4.1.1"
138138
}

src/elements/GeoFeature.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export class GeoFeature extends Element<IGeoFeatureProps, IGeoFeatureOptions> im
251251
if (!feature) {
252252
return;
253253
}
254-
if (!this.cache || this.cache.canvasKey !== this._optionsToKey()) {
254+
if ((!this.cache || this.cache.canvasKey !== this._optionsToKey()) && ctx.canvas.ownerDocument != null) {
255255
this._drawInCache(ctx.canvas.ownerDocument);
256256
}
257257
const bounds = this.getBounds();

tsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"noEmit": true,
2727
"paths": {
2828
"@": ["./src"],
29-
"*": ["*", "node_modules/*"],
30-
},
29+
"*": ["*", "node_modules/*"]
30+
}
3131
},
32-
"include": ["src/**/*.ts", "src/**/*.tsx", "docs/**/*.tsx"],
32+
"include": ["src/**/*.ts", "src/**/*.tsx", "docs/**/*.tsx"]
3333
}

typedoc.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
"$schema": "https://typedoc.org/schema.json",
33
"entryPoints": ["./src"],
44
"plugin": ["typedoc-plugin-markdown", "typedoc-vitepress-theme"],
5-
"name": "chartjs-chart-boxplot",
5+
"name": "chartjs-chart-geo",
66
"out": "./docs/api",
7+
"docsRoot": "./docs/",
8+
"readme": "none",
9+
"sidebar": {
10+
"pretty": true
11+
},
712
"theme": "default",
813
"excludeExternals": true,
914
"excludeInternal": true,

0 commit comments

Comments
 (0)