Merge pull request #3225 from metabrainz/dependabot/npm_and_yarn/canvg-4.0.3

Bump canvg from 4.0.1 to 4.0.3

Author: MonkeyDo

frontend/js/src/explore/art-creator/utils.tsx

@@ -1,5 +1,6 @@
 import { Canvg, RenderingContext2D, presets } from "canvg";
 
+const offscreenPreset = presets.offscreen();
 export async function svgToBlob(
   width: number,
   height: number,
@@ -20,24 +21,29 @@ export async function svgToBlob(
   if (!ctx) {
     throw new Error("No canvas context");
   }
-  const v = await Canvg.fromString(
-    ctx as RenderingContext2D,
-    svgString,
-    presets.offscreen()
-  );
+  const v = Canvg.fromString(ctx as RenderingContext2D, svgString, {
+    ...offscreenPreset,
+    // Overwrite the Canvg typescript types here, replace once this Canvg ticket is resolved:
+    // https://github.com/canvg/canvg/issues/1754
+    createCanvas: offscreenPreset.createCanvas as () => OffscreenCanvas & {
+      getContext(contextId: "2d"): OffscreenCanvasRenderingContext2D;
+    },
+  });
 
   // Render only first frame, ignoring animations and mouse.
   await v.render();
 
   let blob;
   if ("OffscreenCanvas" in window) {
-    blob = await (canvas as OffscreenCanvas).convertToBlob({
+    canvas = canvas as OffscreenCanvas;
+    blob = await canvas.convertToBlob({
       type: encodeType,
     });
   } else {
     blob = await new Promise<Blob | null>((done, err) => {
       try {
-        (canvas as HTMLCanvasElement).toBlob(done, encodeType);
+        canvas = canvas as HTMLCanvasElement;
+        canvas.toBlob(done, encodeType);
       } catch (error) {
         err(error);
       }

package-lock.json

@@ -58,7 +58,7 @@
     "@tanstack/react-query-devtools": "^5.28.6",
     "@types/react-datetime-picker": "^3.4.1",
     "blobs": "^2.3.0-beta.2",
-    "canvg": "^4.0.1",
+    "canvg": "^4.0.3",
     "core-js": "^3.26.1",
     "d3-array": "~2.3.3",
     "d3-format": "^1.4.4",
@@ -133,6 +133,7 @@
     "@types/jest": "^29.5.3",
     "@types/less": "^3.0.3",
     "@types/lodash": "^4.14.149",
+    "@types/offscreencanvas": "^2019.7.3",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "@types/react-helmet": "^6.1.11",