From 0a5bc98a9cb9c8af4920daa978768f18c15057e2 Mon Sep 17 00:00:00 2001
From: uzlopak <aras.abbasi@googlemail.com>
Date: Tue, 31 Oct 2023 09:34:31 +0100
Subject: [PATCH] chore: drop node 19, add node 20 and 21 to workflows

---
 .github/workflows/browser-test.yml        |  6 ++----
 .github/workflows/delete-runs.yml         |  1 +
 .github/workflows/mocha.yml               | 14 +++++++-------
 .github/workflows/nightly-site-deploy.yml |  2 +-
 package-lock.json                         | 18 +++++++-----------
 package.json                              |  2 +-
 6 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/browser-test.yml b/.github/workflows/browser-test.yml
index 460684ce06..df0f7f90c4 100644
--- a/.github/workflows/browser-test.yml
+++ b/.github/workflows/browser-test.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -22,9 +22,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: '~/.npm'
-          key: "ubuntu-latest-node-full-v16-${{ hashFiles('**/package-lock.json') }}"
-          restore-keys: |
-            ubuntu-latest-node-full-v16-
+          key: "ubuntu-latest-node-full-lts-${{ hashFiles('**/package-lock.json') }}"
       - name: Install Dependencies
         run: npm ci
       - name: Run Browser Tests
diff --git a/.github/workflows/delete-runs.yml b/.github/workflows/delete-runs.yml
index ac0d26ebca..326f8424b7 100644
--- a/.github/workflows/delete-runs.yml
+++ b/.github/workflows/delete-runs.yml
@@ -4,6 +4,7 @@ on:
     inputs:
       days:
         description: 'Number of days'
+        type: number
         required: true
         default: 180
 
diff --git a/.github/workflows/mocha.yml b/.github/workflows/mocha.yml
index 4acb0f9d8f..54642c123a 100644
--- a/.github/workflows/mocha.yml
+++ b/.github/workflows/mocha.yml
@@ -45,7 +45,8 @@ jobs:
           - 14
           - 16
           - 18
-          - 19
+          - 20
+          - 21
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -61,15 +62,13 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - uses: actions/checkout@v3
       - name: 'Cache node_modules'
         uses: actions/cache@v3
         with:
           path: '~/.npm'
-          key: "ubuntu-latest-node-v16-${{ hashFiles('**/package-lock.json') }}"
-          restore-keys: |
-            ubuntu-latest-node-v16-
+          key: "ubuntu-latest-node-lts-${{ hashFiles('**/package-lock.json') }}"
       - name: Install Dependencies
         run: npm ci --ignore-scripts
       - name: 'Check lint'
@@ -90,7 +89,8 @@ jobs:
           - 14
           - 16
           - 18
-          - 19
+          - 20
+          - 21
         include:
           - os: ubuntu-latest
             node: 16
@@ -143,7 +143,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - uses: actions/checkout@v3
       - name: 'Cache node_modules'
         uses: actions/cache@v3
diff --git a/.github/workflows/nightly-site-deploy.yml b/.github/workflows/nightly-site-deploy.yml
index ee426ace2b..bd1ac0e3af 100644
--- a/.github/workflows/nightly-site-deploy.yml
+++ b/.github/workflows/nightly-site-deploy.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Webhook Action
-        uses: joelwmale/webhook-action@1.0.0
+        uses: joelwmale/webhook-action@2.3.2
         env:
           data: ''
           WEBHOOK_URL: ${{ secrets.NETLIFY_NIGHTLY_DEPLOY_URL }}
diff --git a/package-lock.json b/package-lock.json
index 730f5dcbe5..ffaab508c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
         "@rollup/plugin-node-resolve": "^13.1.3",
         "assetgraph-builder": "^9.0.0",
         "autoprefixer": "^9.8.6",
-        "canvas": "^2.9.0",
+        "canvas": "^2.11.2",
         "chai": "^4.3.4",
         "coffeescript": "^2.6.1",
         "coveralls": "^3.1.1",
@@ -109,10 +109,6 @@
       },
       "engines": {
         "node": ">= 14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
       }
     },
     "node_modules/@11ty/dependency-tree": {
@@ -4376,9 +4372,9 @@
       ]
     },
     "node_modules/canvas": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.0.tgz",
-      "integrity": "sha512-bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g==",
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -26320,9 +26316,9 @@
       "dev": true
     },
     "canvas": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.0.tgz",
-      "integrity": "sha512-bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g==",
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
       "dev": true,
       "requires": {
         "@mapbox/node-pre-gyp": "^1.0.0",
diff --git a/package.json b/package.json
index 3c19d70709..c571239f1b 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "@rollup/plugin-node-resolve": "^13.1.3",
     "assetgraph-builder": "^9.0.0",
     "autoprefixer": "^9.8.6",
-    "canvas": "^2.9.0",
+    "canvas": "^2.11.2",
     "chai": "^4.3.4",
     "coffeescript": "^2.6.1",
     "coveralls": "^3.1.1",