Merge branch 'dev'

sgratzl · Apr 21, 2021 · 009397f · 009397f
2 parents 17132af + 83248d9
commit 009397f
Show file tree

Hide file tree

Showing 5 changed files with 315 additions and 326 deletions.
diff --git a/.release-it.json b/.release-it.json
@@ -1,7 +1,7 @@
 {
   "hooks": {
     "before:init": "yarn clean && yarn test",
-    "before:release": "yarn build && yarn pack",
+    "before:release": "yarn clean && yarn build && yarn pack",
     "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}."
   },
   "git": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chartjs-chart-geo",
   "description": "Chart.js module for charting maps",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "author": {
     "name": "Samuel Gratzl",
     "email": "[email protected]",
@@ -36,12 +36,12 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "chart.js": "^3.0.2"
+    "chart.js": "^3.1.0"
   },
   "dependencies": {
     "@types/d3-geo": "^2.0.0",
     "@types/d3-scale-chromatic": "^2.0.0",
-    "@types/topojson-client": "^3.0.0",
+    "@types/topojson-client": "^3.1.0",
     "d3-geo": "^2.0.1",
     "d3-scale-chromatic": "^2.0.0",
     "topojson-client": "^3.1.0"
@@ -53,38 +53,38 @@
     "@rollup/plugin-typescript": "^8.2.1",
     "@types/jest": "^26.0.22",
     "@types/jest-image-snapshot": "^4.3.0",
-    "@types/node": "^14.14.37",
+    "@types/node": "^14.14.41",
     "@types/seedrandom": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.20.0",
-    "@typescript-eslint/parser": "^4.20.0",
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.22.0",
     "@yarnpkg/pnpify": "^2.4.0",
     "canvas": "^2.7.0",
     "canvas-5-polyfill": "^0.1.5",
     "chart.js": "3.0.0-rc.3",
-    "eslint": "^7.23.0",
+    "eslint": "^7.24.0",
     "eslint-config-airbnb-typescript": "^12.3.1",
-    "eslint-config-prettier": "^8.1.0",
+    "eslint-config-prettier": "^8.2.0",
     "eslint-config-react-app": "^6.0.0",
-    "eslint-plugin-flowtype": "^5.4.0",
+    "eslint-plugin-flowtype": "^5.7.1",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "jest": "^26.6.3",
     "jest-image-snapshot": "^4.4.1",
     "prettier": "^2.2.1",
-    "release-it": "^14.5.1",
+    "release-it": "^14.6.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.44.0",
+    "rollup": "^2.45.2",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-dts": "^3.0.1",
     "rollup-plugin-terser": "^7.0.2",
     "seedrandom": "^3.0.5",
-    "ts-jest": "^26.5.4",
-    "tslib": "^2.1.0",
+    "ts-jest": "^26.5.5",
+    "tslib": "^2.2.0",
     "typedoc": "^0.20.35",
-    "typescript": "^4.2.3",
+    "typescript": "^4.2.4",
     "us-atlas": "^3.0.0",
     "world-atlas": "^2.0.2"
   },

diff --git a/samples/bubbleMap.html b/samples/bubbleMap.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
-    <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
+    <script src="https://unpkg.com/chartjs-plugin-datalabels@next"></script>
     <script src="../build/index.umd.js"></script>
     <script src="https://unpkg.com/papaparse"></script>
   </head>
@@ -12,6 +12,7 @@
       <canvas id="canvas" style="border: 1px solid black"></canvas>
     </div>
     <script>
+      Chart.register(ChartDataLabels);
       Promise.all([
         fetch('https://unpkg.com/us-atlas/states-10m.json').then((r) => r.json()),
         fetch(
@@ -41,14 +42,14 @@
                 display: false,
               },
             },
-            // plugins: {
-            //   datalabels: {
-            //     align: 'top',
-            //     formatter: (v) => {
-            //       return v.description;
-            //     },
-            //   },
-            // },
+            plugins: {
+              datalabels: {
+                align: 'top',
+                formatter: (v) => {
+                  return v.description;
+                },
+              },
+            },
             scales: {
               xy: {
                 projection: 'albersUsa',

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,13 +1,13 @@
 {
   "compilerOptions": {
-    "skipLibCheck": true,
-    "target": "ES2020",
+    "target": "ES2018",
     "module": "ESNext",
     "lib": ["DOM", "ES2020"],
     "importHelpers": false,
     "declaration": false,
     "sourceMap": true,
     "strict": true,
+    "removeComments": true,
     "importsNotUsedAsValues": "error",
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
@@ -34,13 +34,10 @@
   "typedocOptions": {
     "name": "TSLibrary",
     "out": "./docs",
-    "mode": "library",
-    "theme": "minimal",
-    "excludeNotExported": true,
+    "theme": "default",
     "excludeExternals": true,
     "excludePrivate": true,
     "includeVersion": true,
-    "hideGenerator": true,
-    "entryPoint": "\"index\""
+    "hideGenerator": true
   }
 }