Merge pull request #14 from sgratzl/release/v3.8.0

sgratzl · web-flow · commit ad91d2bb873e · 2022-06-10T21:28:39.000-04:00
Release v3.8.0
diff --git a/.yarn/releases/yarn-3.2.0.cjs b/.yarn/releases/yarn-3.2.0.cjs
diff --git a/.yarn/releases/yarn-3.2.1.cjs b/.yarn/releases/yarn-3.2.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -3,4 +3,4 @@ packageExtensions:
     dependencies:
       eslint-import-resolver-node: "*"
 
-yarnPath: .yarn/releases/yarn-3.2.0.cjs
+yarnPath: .yarn/releases/yarn-3.2.1.cjs
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chartjs-plugin-hierarchical",
   "description": "Chart.js module for hierarchical categories",
-  "version": "3.7.1",
+  "version": "3.8.0",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -34,7 +34,7 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "chart.js": "^3.7.1"
+    "chart.js": "^3.8.0"
   },
   "browserslist": [
     "Firefox ESR",
@@ -44,42 +44,42 @@
   "devDependencies": {
     "@chiogen/rollup-plugin-terser": "^7.0.2",
     "@rollup/plugin-commonjs": "^22.0.0",
-    "@rollup/plugin-node-resolve": "^13.2.1",
+    "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.3.2",
-    "@types/jest": "^27.4.1",
+    "@rollup/plugin-typescript": "^8.3.3",
+    "@types/jest": "^28.1.1",
     "@types/jest-image-snapshot": "^4.3.1",
-    "@types/node": "^17.0.31",
+    "@types/node": "^17.0.42",
     "@types/seedrandom": "^3.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.21.0",
-    "@typescript-eslint/parser": "^5.21.0",
-    "@yarnpkg/sdks": "^2.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
+    "@typescript-eslint/parser": "^5.27.1",
+    "@yarnpkg/sdks": "^2.6.2",
     "canvas": "^2.9.1",
     "canvas-5-polyfill": "^0.1.5",
-    "chart.js": "^3.7.1",
-    "eslint": "^8.14.0",
+    "chart.js": "^3.8.0",
+    "eslint": "^8.17.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.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.5.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react": "^7.30.0",
     "eslint-plugin-react-hooks": "^4.5.0",
-    "jest": "^27.5.1",
-    "jest-environment-jsdom": "^27.5.1",
-    "jest-image-snapshot": "^4.5.1",
+    "jest": "^28.1.1",
+    "jest-environment-jsdom": "^28.1.1",
+    "jest-image-snapshot": "^5.1.0",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.71.1",
+    "rollup": "~2.75.6",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-dts": "^4.2.1",
+    "rollup-plugin-dts": "^4.2.2",
     "seedrandom": "^3.0.5",
-    "ts-jest": "^27.1.4",
+    "ts-jest": "^28.0.4",
     "tslib": "^2.4.0",
-    "typedoc": "^0.22.15",
-    "typescript": "^4.6.4",
+    "typedoc": "^0.22.17",
+    "typescript": "^4.7.3",
     "us-atlas": "^3.0.0",
     "world-atlas": "^2.0.2"
   },
@@ -102,5 +102,5 @@
     "docs": "typedoc src/index.ts",
     "prepare": "yarn run build"
   },
-  "packageManager": "yarn@3.2.0"
+  "packageManager": "yarn@3.2.1"
 }
diff --git a/samples/backgroundColor.html b/samples/backgroundColor.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/boxplot.html b/samples/boxplot.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <script src="https://unpkg.com/@sgratzl/chartjs-chart-boxplot/build/index.umd.js" type="text/javascript"></script>
     <style>
diff --git a/samples/default.html b/samples/default.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/default_esm.html b/samples/default_esm.html
@@ -11,8 +11,8 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": "https://unpkg.com/chart.js@3.7.1?module",
-          "chart.js/helpers": "https://unpkg.com/chart.js@3.7.1/helpers/helpers.esm.js?module",
+          "chart.js": "https://unpkg.com/chart.js@3.8.0?module",
+          "chart.js/helpers": "https://unpkg.com/chart.js@3.8.0/helpers/helpers.esm.js?module",
           "chartjs-plugin-hierarchical": "../build/index.js"
         }
       }
diff --git a/samples/end_hierarchy.html b/samples/end_hierarchy.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/horizontal.html b/samples/horizontal.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Horizontal Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/lazy.html b/samples/lazy.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/line.html b/samples/line.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Line Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/scriptable.html b/samples/scriptable.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="https://unpkg.com/d3"></script>
     <script src="../build/index.umd.js"></script>
     <style>
diff --git a/samples/single.html b/samples/single.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/singleChild.html b/samples/singleChild.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/samples/static.html b/samples/static.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {
diff --git a/src/plugin/hierarchical.ts b/src/plugin/hierarchical.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { defaults, Plugin, Chart, Color } from 'chart.js';
+import { defaults, Plugin, Chart, Color, FontSpec } from 'chart.js';
 import { valueOrDefault, toFont } from 'chart.js/helpers';
 
 import {
@@ -353,7 +353,7 @@ const hierarchicalPlugin: Plugin = {
 
     const scaleLabel = scale.options.title;
     const scaleLabelFontColor = valueOrDefault(scaleLabel.color, defaults.color as Color);
-    const scaleLabelFont = toFont(scaleLabel.font);
+    const scaleLabelFont = toFont(scaleLabel.font as Partial<FontSpec>);
 
     function renderButton(type: 'expand' | 'collapse' | 'focus', vert: boolean, x: number, y: number) {
       if (isStatic) {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`<script type="importmap-shim">`
`12`	`12`	`{`
`13`	`13`	`"imports": {`
`14`		`- "chart.js": "https://unpkg.com/chart.js@3.7.1?module",`
`15`		`- "chart.js/helpers": "https://unpkg.com/chart.js@3.7.1/helpers/helpers.esm.js?module",`
	`14`	`+ "chart.js": "https://unpkg.com/chart.js@3.8.0?module",`
	`15`	`+ "chart.js/helpers": "https://unpkg.com/chart.js@3.8.0/helpers/helpers.esm.js?module",`
`16`	`16`	`"chartjs-plugin-hierarchical": "../build/index.js"`
`17`	`17`	`}`
`18`	`18`	`}`