@napi-rs/canvas 0.1.71 → 0.1.73

package/index.js

@@ -59,6 +59,37 @@ CanvasRenderingContext2D.prototype.getTransform = function getTransform() {
   return new DOMMatrix([a, b, c, d, e, f])
 }
 
+// Workaround for webpack bundling issue with drawImage
+// Store the original drawImage method
+const _drawImage = CanvasRenderingContext2D.prototype.drawImage
+
+// Override drawImage to ensure proper type recognition in bundled environments
+CanvasRenderingContext2D.prototype.drawImage = function drawImage(image, ...args) {
+  // If the image is a Canvas-like object but not recognized due to bundling,
+  // we need to ensure it's properly identified
+  if (image && typeof image === 'object') {
+    // First check if it's a wrapped canvas object
+    if (image.canvas instanceof CanvasElement || image.canvas instanceof SVGCanvas) {
+      image = image.canvas
+    } else if (image._canvas instanceof CanvasElement || image._canvas instanceof SVGCanvas) {
+      image = image._canvas
+    }
+    // Then check if it's a Canvas-like object by checking for getContext method
+    else if (typeof image.getContext === 'function' && image.width && image.height) {
+      // If it has canvas properties but isn't recognized as CanvasElement or SVGCanvas,
+      // try to correct the prototype chain
+      if (!(image instanceof CanvasElement) && !(image instanceof SVGCanvas)) {
+        // Try to create a proper CanvasElement from the canvas-like object
+        // This helps when webpack has transformed the prototype chain
+        Object.setPrototypeOf(image, CanvasElement.prototype)
+      }
+    }
+  }
+  
+  // Call the original drawImage with the potentially corrected image
+  return _drawImage.apply(this, [image, ...args])
+}
+
 function createCanvas(width, height, flag) {
   const isSvgBackend = typeof flag !== 'undefined'
   return isSvgBackend ? new SVGCanvas(width, height, flag) : new CanvasElement(width, height)
@@ -111,4 +142,7 @@ module.exports = {
   DOMRect,
   loadImage,
   FontKey,
+  // Export these for better webpack compatibility
+  CanvasElement,
+  SVGCanvas,
 }

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@napi-rs/canvas",
-  "version": "0.1.71",
+  "version": "0.1.73",
   "description": "Canvas for Node.js with skia backend",
   "main": "index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Brooooooklyn/canvas.git"
   },
+  "workspaces": [
+    "e2e/*"
+  ],
   "license": "MIT",
   "keywords": [
     "napi-rs",
@@ -64,6 +67,7 @@
     "postpublish": "pinst --enable",
     "test:ci": "ava -c 1",
     "test": "ava",
+    "e2e": "yarn workspace @napi-rs/canvas-e2e-webpack test",
     "version": "napi version && conventional-changelog -p angular -i CHANGELOG.md -s && git add ."
   },
   "devDependencies": {
@@ -71,7 +75,7 @@
     "@jimp/custom": "^0.22.12",
     "@jimp/jpeg": "^0.22.12",
     "@jimp/png": "^0.22.12",
-    "@napi-rs/cli": "^3.0.0-alpha.88",
+    "@napi-rs/cli": "^3.0.0-alpha.91",
     "@octokit/rest": "^22.0.0",
     "@swc-node/register": "^1.10.10",
     "@swc/core": "^1.11.31",
@@ -86,11 +90,12 @@
     "conventional-changelog-cli": "^5.0.0",
     "core-js": "^3.42.0",
     "echarts": "^5.6.0",
+    "electron": "^37.1.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.1.0",
     "lodash": "^4.17.21",
     "npm-run-all2": "^8.0.4",
-    "oxlint": "^0.18.0",
+    "oxlint": "^1.0.0",
     "pinst": "^3.0.0",
     "png.js": "^0.2.1",
     "prettier": "^3.5.3",
@@ -138,15 +143,15 @@
   },
   "packageManager": "yarn@4.9.2",
   "optionalDependencies": {
-    "@napi-rs/canvas-linux-x64-gnu": "0.1.71",
-    "@napi-rs/canvas-darwin-x64": "0.1.71",
-    "@napi-rs/canvas-win32-x64-msvc": "0.1.71",
-    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.71",
-    "@napi-rs/canvas-linux-x64-musl": "0.1.71",
-    "@napi-rs/canvas-linux-arm64-gnu": "0.1.71",
-    "@napi-rs/canvas-linux-arm64-musl": "0.1.71",
-    "@napi-rs/canvas-darwin-arm64": "0.1.71",
-    "@napi-rs/canvas-android-arm64": "0.1.71",
-    "@napi-rs/canvas-linux-riscv64-gnu": "0.1.71"
+    "@napi-rs/canvas-linux-x64-gnu": "0.1.73",
+    "@napi-rs/canvas-darwin-x64": "0.1.73",
+    "@napi-rs/canvas-win32-x64-msvc": "0.1.73",
+    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.73",
+    "@napi-rs/canvas-linux-x64-musl": "0.1.73",
+    "@napi-rs/canvas-linux-arm64-gnu": "0.1.73",
+    "@napi-rs/canvas-linux-arm64-musl": "0.1.73",
+    "@napi-rs/canvas-darwin-arm64": "0.1.73",
+    "@napi-rs/canvas-android-arm64": "0.1.73",
+    "@napi-rs/canvas-linux-riscv64-gnu": "0.1.73"
   }
 }