Skip to content

Commit

Permalink
Merge pull request #161 from sgratzl/release/v4.1.2
Browse files Browse the repository at this point in the history
Release v4.1.2
  • Loading branch information
sgratzl authored Jan 14, 2023
2 parents d260233 + 16cb4a8 commit 4036bdf
Show file tree
Hide file tree
Showing 21 changed files with 1,086 additions and 854 deletions.
1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ module.exports = {
// '@typescript-eslint/no-non-null-assertion': 'off',
'max-classes-per-file': 'off',
'no-underscore-dangle': 'off',
'import/extensions': 'off',
},
};
510 changes: 263 additions & 247 deletions .yarn/releases/yarn-3.3.0.cjs → .yarn/releases/yarn-3.3.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-3.3.0.cjs
yarnPath: .yarn/releases/yarn-3.3.1.cjs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ A data point has to have a `.feature` property containing the feature to render
- topojson collection: https://github.com/deldersveld/topojson (untested)

```js
const us = await fetch('https://unpkg.com/us-atlas/states-10m.json').then((r) => r.json());
const us = await fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json').then((r) => r.json());

// whole US for the outline
const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
Expand Down
50 changes: 25 additions & 25 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.1.1",
"version": "4.1.2",
"author": {
"name": "Samuel Gratzl",
"email": "[email protected]",
Expand Down Expand Up @@ -50,56 +50,56 @@
"chart.js": "^4.1.0"
},
"dependencies": {
"@types/d3-geo": "^3.0.2",
"@types/d3-geo": "^3.0.3",
"@types/d3-scale-chromatic": "^3.0.0",
"@types/topojson-client": "^3.1.1",
"d3-array": "^3.2.1",
"d3-color": "^3.1.0",
"d3-geo": "^3.0.1",
"d3-geo": "^3.1.0",
"d3-interpolate": "^3.0.1",
"d3-scale-chromatic": "^3.0.0",
"topojson-client": "^3.1.0"
},
"devDependencies": {
"@chiogen/rollup-plugin-terser": "^7.1.3",
"@rollup/plugin-commonjs": "^23.0.7",
"@rollup/plugin-commonjs": "^24.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-typescript": "^10.0.1",
"@types/jest": "^29.2.4",
"@rollup/plugin-typescript": "^11.0.0",
"@types/jest": "^29.2.5",
"@types/jest-image-snapshot": "^6.1.0",
"@types/node": "^18.11.16",
"@types/seedrandom": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^5.46.1",
"@typescript-eslint/parser": "^5.46.1",
"@types/node": "^18.11.18",
"@types/seedrandom": "^3.0.4",
"@typescript-eslint/eslint-plugin": "^5.48.1",
"@typescript-eslint/parser": "^5.48.1",
"@yarnpkg/pnpify": "^3.1.6",
"@yarnpkg/sdks": "^2.6.3",
"canvas": "^2.10.2",
"canvas": "^2.11.0",
"canvas-5-polyfill": "^0.1.5",
"chart.js": "^4.1.1",
"eslint": "^8.30.0",
"chart.js": "^4.1.2",
"eslint": "^8.31.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-prettier": "^8.6.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-import": "^2.27.4",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react": "^7.32.0",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"jest-image-snapshot": "^6.1.0",
"prettier": "^2.8.1",
"rimraf": "^3.0.2",
"rollup": "^3.7.5",
"prettier": "^2.8.3",
"rimraf": "^4.0.5",
"rollup": "^3.10.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-dts": "^5.0.0",
"rollup-plugin-dts": "^5.1.1",
"seedrandom": "^3.0.5",
"ts-jest": "^29.0.3",
"ts-jest": "^29.0.5",
"tslib": "^2.4.1",
"typedoc": "^0.23.22",
"typescript": "4.9.3",
"typedoc": "^0.23.24",
"typescript": "^4.9.4",
"us-atlas": "^3.0.0",
"world-atlas": "^2.0.2"
},
Expand All @@ -123,5 +123,5 @@
"docs": "typedoc src/index.ts",
"prepare": "yarn run build"
},
"packageManager": "[email protected].0"
"packageManager": "[email protected].1"
}
4 changes: 2 additions & 2 deletions samples/albers.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/us-atlas/states-10m.json')
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json')
.then((r) => r.json())
.then((us) => {
const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
Expand Down
4 changes: 2 additions & 2 deletions samples/albersCustom.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/us-atlas/states-10m.json')
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json')
.then((r) => r.json())
.then((us) => {
const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
Expand Down
4 changes: 2 additions & 2 deletions samples/albersLegend.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/us-atlas/states-10m.json')
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json')
.then((r) => r.json())
.then((us) => {
const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
Expand Down
4 changes: 2 additions & 2 deletions samples/albersLog.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/us-atlas/states-10m.json')
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json')
.then((r) => r.json())
.then((us) => {
const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
Expand Down
4 changes: 2 additions & 2 deletions samples/albersProjection.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/us-atlas/states-10m.json')
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json')
.then((r) => r.json())
.then((us) => {
const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
Expand Down
8 changes: 4 additions & 4 deletions samples/bubbleMap.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src="https://unpkg.com/chartjs-plugin-datalabels@next"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@next"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/papaparse"></script>
<script src=" https://cdn.jsdelivr.net/npm/papaparse"></script>
</head>

<body>
Expand All @@ -14,7 +14,7 @@
<script>
Chart.register(ChartDataLabels);
Promise.all([
fetch('https://unpkg.com/us-atlas/states-10m.json').then((r) => r.json()),
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json').then((r) => r.json()),
fetch(
'https://gist.githubusercontent.com/mbostock/9535021/raw/928a5f81f170b767162f8f52dbad05985eae9cac/us-state-capitals.csv'
)
Expand Down
8 changes: 4 additions & 4 deletions samples/bubbleMapArea.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<!-- <script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels"></script> -->
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/papaparse"></script>
<script src=" https://cdn.jsdelivr.net/npm/papaparse"></script>
</head>

<body>
Expand All @@ -13,7 +13,7 @@
</div>
<script>
Promise.all([
fetch('https://unpkg.com/us-atlas/states-10m.json').then((r) => r.json()),
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json').then((r) => r.json()),
fetch(
'https://gist.githubusercontent.com/mbostock/9535021/raw/928a5f81f170b767162f8f52dbad05985eae9cac/us-state-capitals.csv'
)
Expand Down
8 changes: 4 additions & 4 deletions samples/bubbleMapLog.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<!-- <script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels"></script> -->
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/papaparse"></script>
<script src=" https://cdn.jsdelivr.net/npm/papaparse"></script>
</head>

<body>
Expand All @@ -13,7 +13,7 @@
</div>
<script>
Promise.all([
fetch('https://unpkg.com/us-atlas/states-10m.json').then((r) => r.json()),
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json').then((r) => r.json()),
fetch(
'https://gist.githubusercontent.com/mbostock/9535021/raw/928a5f81f170b767162f8f52dbad05985eae9cac/us-state-capitals.csv'
)
Expand Down
4 changes: 2 additions & 2 deletions samples/changing.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/us-atlas/states-10m.json')
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json')
.then((r) => r.json())
.then((us) => {
const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
Expand Down
14 changes: 7 additions & 7 deletions samples/default_esm.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
<div id="container" style="width: 75%">
<canvas id="canvas"></canvas>
</div>
<script defer src="https://unpkg.com/es-module-shims"></script>
<script defer src=" https://cdn.jsdelivr.net/npm/es-module-shims"></script>
<script type="importmap-shim">
{
"imports": {
"chart.js": "https://unpkg.com/chart.js@~4.1.1?module",
"chart.js/helpers": "https://unpkg.com/chart.js@~4.1.1/helpers/helpers.esm.js?module",
"chart.js": " https://cdn.jsdelivr.net/npm/chart.js@~4.1.1?module",
"chart.js/helpers": " https://cdn.jsdelivr.net/npm/chart.js@~4.1.1/helpers/helpers.esm.js?module",
"chartjs-chart-geo": "../build/index.js",
"d3-geo": "https://unpkg.com/d3-geo?module",
"d3-scale-chromatic": "https://unpkg.com/d3-scale-chromatic?module",
"topojson-client": "https://unpkg.com/topojson-client?module"
"d3-geo": " https://cdn.jsdelivr.net/npm/d3-geo?module",
"d3-scale-chromatic": " https://cdn.jsdelivr.net/npm/d3-scale-chromatic?module",
"topojson-client": " https://cdn.jsdelivr.net/npm/topojson-client?module"
}
}
</script>
<script type="module-shim">
import { ChoroplethChart } from 'chartjs-chart-geo';
import { feature } from 'topojson-client';

fetch('https://unpkg.com/us-atlas/states-10m.json')
fetch(' https://cdn.jsdelivr.net/npm/us-atlas/states-10m.json')
.then((r) => r.json())
.then((us) => {
const nation = feature(us, us.objects.nation).features[0];
Expand Down
4 changes: 2 additions & 2 deletions samples/earth.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/world-atlas/countries-50m.json')
fetch(' https://cdn.jsdelivr.net/npm/world-atlas/countries-50m.json')
.then((r) => r.json())
.then((data) => {
const countries = ChartGeo.topojson.feature(data, data.objects.countries).features;
Expand Down
4 changes: 2 additions & 2 deletions samples/earth_click.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand All @@ -10,7 +10,7 @@
<canvas id="canvas"></canvas>
</div>
<script>
fetch('https://unpkg.com/world-atlas/countries-50m.json')
fetch(' https://cdn.jsdelivr.net/npm/world-atlas/countries-50m.json')
.then((r) => r.json())
.then((data) => {
const countries = ChartGeo.topojson.feature(data, data.objects.countries).features;
Expand Down
6 changes: 3 additions & 3 deletions samples/france.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src="https://unpkg.com/d3@v6"></script>
<script src="https://unpkg.com/d3-composite-projections"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/d3@v6"></script>
<script src=" https://cdn.jsdelivr.net/npm/d3-composite-projections"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion samples/germany.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/chart.js@~4.1.1"></script>
<script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
Loading

0 comments on commit 4036bdf

Please sign in to comment.