From 2fdc042c66a4b7eb451b110cd277948d69964e4d Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Mon, 28 Oct 2024 21:41:39 -0500
Subject: [PATCH] Add node 22.x to the test matrix

Needed to upgrade canvas to a git rev due to https://github.com/Automattic/node-canvas/issues/2377
---
 .github/workflows/node.js.yml | 2 +-
 package.json                  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 5842dfe25..8efeabf2b 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/package.json b/package.json
index 63bba22e8..2b83f2b82 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "babel-plugin-macros": "^3.0.1",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "bundlewatch": "^0.4.0",
-    "canvas": "^2.11.0",
+    "canvas": "3.0.0-rc2",
     "chalk": "^4.1.0",
     "core-js": "^3.21.1",
     "eslint": "^8.11.0",
@@ -136,6 +136,9 @@
     "webpack-cli": "^5.0.0",
     "webpack-dev-server": "^4.7.4"
   },
+  "overrides": {
+    "canvas": "3.0.0-rc2"
+  },
   "peerDependencies": {
     "react": "^18.0.0",
     "react-dom": "^18.0.0"