Release v3.6.0

.github/workflows/ci.yml

@@ -7,20 +7,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2
         with:
           node-version: 14
       - run: npm i -g yarn
-      - run: yarn set version 2
-      - run: cat .yarnrc_patch.yml >> .yarnrc.yml
       - run: yarn config set checksumBehavior ignore
       - name: Cache Node.js modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
-          path: ./.yarn
-          key: ${{ runner.os }}-yarn2-${{ hashFiles('**/yarn.lock') }}
+          path: |
+            ./.yarn/cache
+            ./.yarn/unplugged
+          key: ${{ runner.os }}-yarn2-v4-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn2-
+            ${{ runner.os }}-yarn2-v4
       - run: yarn install
       - run: yarn build
       - run: yarn lint

.github/workflows/release_helper.yml

@@ -43,20 +43,20 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2
         with:
           node-version: 14
       - run: npm i -g yarn
-      - run: yarn set version 2
-      - run: cat .yarnrc_patch.yml >> .yarnrc.yml
       - run: yarn config set checksumBehavior ignore
       - name: Cache Node.js modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
-          path: ./.yarn
-          key: ${{ runner.os }}-yarn2-${{ hashFiles('**/yarn.lock') }}
+          path: |
+            ./.yarn/cache
+            ./.yarn/unplugged
+          key: ${{ runner.os }}-yarn2-v4-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn2-
+            ${{ runner.os }}-yarn2-v4
       - run: yarn install
       - run: yarn build
       - run: yarn pack

.gitignore

@@ -6,9 +6,12 @@ npm-debug.log*
 /coverage
 /node_modules
 .npm
-/.yarnrc.yml
-/.yarn
-/.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/versions
+.pnp.*
 
 # Build files
 /.tmp

.prettierignore

@@ -1,4 +1,4 @@
-/.pnp.cjs
+/.pnp*
 /.yarnrc.yml
 /.yarn
 /build

.yarnrc.yml

@@ -0,0 +1,6 @@
+packageExtensions:
+  eslint-module-utils@*:
+    dependencies:
+      eslint-import-resolver-node: "*"
+
+yarnPath: .yarn/releases/yarn-3.1.0.cjs

README.md

@@ -136,10 +136,8 @@ Chart.register(HierarchicalScale);
 
 ```sh
 npm i -g yarn
-yarn set version berry
-cat .yarnrc_patch.yml >> .yarnrc.yml
 yarn install
-yarn pnpify --sdk vscode
+yarn sdks vscode
 ```
 
 ### Common commands

package.json

@@ -1,7 +1,7 @@
 {
   "name": "chartjs-plugin-hierarchical",
   "description": "Chart.js module for hierarchical categories",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "author": {
     "name": "Samuel Gratzl",
     "email": "[email protected]",
@@ -34,51 +34,51 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "chart.js": "^3.5.0"
+    "chart.js": "^3.6.0"
   },
   "browserslist": [
     "Firefox ESR",
     "last 2 Chrome versions",
     "last 2 Firefox versions"
   ],
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^20.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.4",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-node-resolve": "^13.0.6",
     "@rollup/plugin-replace": "^3.0.0",
-    "@rollup/plugin-typescript": "^8.2.5",
-    "@types/jest": "^26.0.24",
+    "@rollup/plugin-typescript": "^8.3.0",
+    "@types/jest": "^27.0.2",
     "@types/jest-image-snapshot": "^4.3.1",
-    "@types/node": "^16.4.13",
+    "@types/node": "^16.11.6",
     "@types/seedrandom": "^3.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.29.0",
-    "@typescript-eslint/parser": "^4.29.0",
-    "@yarnpkg/pnpify": "^2.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.3.0",
+    "@typescript-eslint/parser": "^5.3.0",
+    "@yarnpkg/sdks": "^2.5.0",
     "canvas": "^2.8.0",
     "canvas-5-polyfill": "^0.1.5",
-    "chart.js": "^3.5.0",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-typescript": "^12.3.1",
+    "chart.js": "^3.6.0",
+    "eslint": "^8.1.0",
+    "eslint-config-airbnb-typescript": "^14.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-react-app": "^6.0.0",
-    "eslint-plugin-flowtype": "^5.9.0",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-flowtype": "^8.0.3",
+    "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-react": "^7.24.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "jest": "^27.0.6",
+    "jest": "^27.3.1",
     "jest-image-snapshot": "^4.5.1",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.56.0",
+    "rollup": "^2.59.0",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-dts": "^3.0.2",
+    "rollup-plugin-dts": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "seedrandom": "^3.0.5",
-    "ts-jest": "^27.0.4",
-    "tslib": "^2.3.0",
-    "typedoc": "^0.21.5",
-    "typescript": "^4.3.5",
+    "ts-jest": "^27.0.7",
+    "tslib": "^2.3.1",
+    "typedoc": "^0.22.7",
+    "typescript": "^4.4.4",
     "us-atlas": "^3.0.0",
     "world-atlas": "^2.0.2"
   },
@@ -101,5 +101,5 @@
     "docs": "typedoc src/index.ts",
     "prepare": "yarn run build"
   },
-  "packageManager": "yarn@3.0.0"
+  "packageManager": "yarn@3.1.0"
 }

samples/backgroundColor.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/boxplot.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.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>

samples/default.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/default_esm.html

@@ -11,8 +11,8 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": "https://unpkg.com/chart.js@3.5.0?module",
-          "chart.js/helpers": "https://unpkg.com/chart.js@3.5.0/helpers/helpers.esm.js?module",
+          "chart.js": "https://unpkg.com/chart.js@3.6.0?module",
+          "chart.js/helpers": "https://unpkg.com/chart.js@3.6.0/helpers/helpers.esm.js?module",
           "chartjs-plugin-hierarchical": "../build/index.js"
         }
       }

samples/end_hierarchy.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/horizontal.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Horizontal Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/lazy.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/line.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Line Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/scriptable.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="https://unpkg.com/d3"></script>
     <script src="../build/index.umd.js"></script>
     <style>

samples/single.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/singleChild.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {

samples/static.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Hierarchical Bar Chart</title>
-    <script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       canvas {