Skip to content

Commit

Permalink
Merge pull request #224 from sgratzl/release/v4.3.0
Browse files Browse the repository at this point in the history
Release v4.3.0
  • Loading branch information
sgratzl committed Mar 14, 2024
2 parents be39791 + 56537b2 commit c08bc7b
Show file tree
Hide file tree
Showing 12 changed files with 2,400 additions and 2,182 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- run: npm i -g yarn
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.yarn/cache
Expand All @@ -27,7 +27,7 @@ jobs:
- run: yarn build
- run: yarn lint
- run: yarn test
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: failure()
with:
name: diff outputs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: main
ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy_website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
- run: npm i -g yarn
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.yarn/cache
Expand All @@ -34,10 +34,10 @@ jobs:
${{ runner.os }}-yarn2-v5
- run: yarn install
- run: yarn docs:build
- uses: actions/configure-pages@v2
- uses: actions/upload-pages-artifact@v1
- uses: actions/configure-pages@v4
- uses: actions/upload-pages-artifact@v3
with:
path: docs/.vitepress/dist
- name: Deploy
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
12 changes: 6 additions & 6 deletions .github/workflows/release_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
- uses: actions/setup-node@v3
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- name: Extract version
Expand Down Expand Up @@ -51,14 +51,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
- uses: actions/setup-node@v3
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- run: npm i -g yarn
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.yarn/cache
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: dev
ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
Expand Down
672 changes: 336 additions & 336 deletions .yarn/releases/yarn-4.0.2.cjs → .yarn/releases/yarn-4.1.1.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-4.0.2.cjs
yarnPath: .yarn/releases/yarn-4.1.1.cjs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ CodePens

The option can be set globally or per dataset

see https://github.com/sgratzl/chartjs-chart-geo/blob/main/src/controllers/GeoController.ts#L221
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)

## Choropleth

Expand Down
44 changes: 22 additions & 22 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.8",
"version": "4.3.0",
"author": {
"name": "Samuel Gratzl",
"email": "sam@sgratzl.com",
Expand Down Expand Up @@ -55,9 +55,9 @@
"@types/topojson-client": "^3.1.4",
"d3-array": "^3.2.4",
"d3-color": "^3.1.0",
"d3-geo": "^3.1.0",
"d3-geo": "^3.1.1",
"d3-interpolate": "^3.0.1",
"d3-scale-chromatic": "^3.0.0",
"d3-scale-chromatic": "^3.1.0",
"topojson-client": "^3.1.0"
},
"devDependencies": {
Expand All @@ -66,52 +66,52 @@
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.5",
"@rollup/plugin-typescript": "^11.1.6",
"@types/jest": "^29.5.11",
"@types/jest": "^29.5.12",
"@types/jest-image-snapshot": "^6.4.0",
"@types/node": "^20.11.5",
"@types/node": "^20.11.27",
"@types/seedrandom": "^3.0.8",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@yarnpkg/pnpify": "^4.0.1",
"@yarnpkg/sdks": "^3.1.0",
"canvas": "^2.11.2",
"canvas-5-polyfill": "^0.1.5",
"chart.js": "^4.4.1",
"chart.js": "^4.4.2",
"chartjs-plugin-datalabels": "^2.2.0",
"eslint": "^8.56.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint": "^8.57.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-image-snapshot": "^6.4.0",
"prettier": "^3.2.4",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"rollup": "^4.9.6",
"rollup": "^4.13.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-dts": "^6.1.0",
"seedrandom": "^3.0.5",
"ts-jest": "^29.1.1",
"ts-jest": "^29.1.2",
"tslib": "^2.6.2",
"typedoc": "^0.25.7",
"typedoc": "^0.25.12",
"typedoc-plugin-markdown": "^4.0.0-next.16",
"typedoc-vitepress-theme": "^1.0.0-next.7",
"typescript": "^5.3.3",
"typedoc-vitepress-theme": "^1.0.0-next.9",
"typescript": "^5.4.2",
"us-atlas": "^3.0.1",
"vitepress": "^1.0.0-rc.39",
"vue": "^3.4.15",
"vitepress": "^1.0.0-rc.45",
"vue": "^3.4.21",
"vue-chartjs": "^5.3.0",
"world-atlas": "^2.0.2"
},
"resolutions": {
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.19.0"
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0"
},
"scripts": {
"clean": "rimraf --glob build node_modules \"*.tgz\" \"*.tsbuildinfo\"",
Expand All @@ -134,5 +134,5 @@
"docs:build": "yarn run docs:api && vitepress build docs",
"docs:preview": "vitepress preview docs"
},
"packageManager": "yarn@4.0.2"
"packageManager": "yarn@4.1.1"
}
2 changes: 1 addition & 1 deletion src/elements/GeoFeature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ export class GeoFeature extends Element<IGeoFeatureProps, IGeoFeatureOptions> im
if (!feature) {
return;
}
if (!this.cache || this.cache.canvasKey !== this._optionsToKey()) {
if ((!this.cache || this.cache.canvasKey !== this._optionsToKey()) && ctx.canvas.ownerDocument != null) {
this._drawInCache(ctx.canvas.ownerDocument);
}
const bounds = this.getBounds();
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"noEmit": true,
"paths": {
"@": ["./src"],
"*": ["*", "node_modules/*"],
},
"*": ["*", "node_modules/*"]
}
},
"include": ["src/**/*.ts", "src/**/*.tsx", "docs/**/*.tsx"],
"include": ["src/**/*.ts", "src/**/*.tsx", "docs/**/*.tsx"]
}
7 changes: 6 additions & 1 deletion typedoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@
"$schema": "https://typedoc.org/schema.json",
"entryPoints": ["./src"],
"plugin": ["typedoc-plugin-markdown", "typedoc-vitepress-theme"],
"name": "chartjs-chart-boxplot",
"name": "chartjs-chart-geo",
"out": "./docs/api",
"docsRoot": "./docs/",
"readme": "none",
"sidebar": {
"pretty": true
},
"theme": "default",
"excludeExternals": true,
"excludeInternal": true,
Expand Down

0 comments on commit c08bc7b

Please sign in to comment.