Merge pull request #18922 from Snuffleupagus/node-canvas-3

[api-minor] Update the `canvas` package to version 3
mozilla · Oct 20, 2024 · 2a4630f · 2a4630f
2 parents 025c087 + 54e00b0
commit 2a4630f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 214 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18, lts/*]
+        node-version: [18, lts/*, 22]
 
     steps:
       - name: Checkout repository

diff --git a/gulpfile.mjs b/gulpfile.mjs
@@ -2244,7 +2244,7 @@ function packageJson() {
     bugs: DIST_BUGS_URL,
     license: DIST_LICENSE,
     optionalDependencies: {
-      canvas: "^2.11.2",
+      canvas: "^3.0.0-rc2",
       path2d: "^0.2.1",
     },
     browser: {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.2.1",
     "caniuse-lite": "^1.0.30001667",
-    "canvas": "^2.11.2",
+    "canvas": "^3.0.0-rc2",
     "core-js": "^3.38.1",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",

diff --git a/src/display/node_utils.js b/src/display/node_utils.js
@@ -83,7 +83,11 @@ if (isNodeJS) {
           applyPath2DToCanvasRenderingContext &&
           Path2D
         ) {
-          applyPath2DToCanvasRenderingContext(CanvasRenderingContext2D);
+          try {
+            applyPath2DToCanvasRenderingContext(CanvasRenderingContext2D);
+          } catch (ex) {
+            warn(`applyPath2DToCanvasRenderingContext: "${ex}".`);
+          }
           globalThis.Path2D = Path2D;
         } else {
           warn("Cannot polyfill `Path2D`, rendering may be broken.");