fix: update napi-rs(2.10.13) to resolve Electron 21+ create Buffer is…

…sues

Cargo.toml

@@ -36,8 +36,8 @@ resvg = { version = "0.25.0", default-features = false, features = [
 ] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-napi = { version = "2.10.0", features = ["serde-json", "async"] }
-napi-derive = "2.9.1"
+napi = { version = "2.10.13", features = ["serde-json", "async"] }
+napi-derive = "2.10.0"
 resvg = { version = "0.25.0", default-features = false, features = [
     "filter",
     "dump-svg",

__test__/index.spec.ts

@@ -10,9 +10,9 @@ import { Resvg, renderAsync } from '../index'
 import { jimpToRgbaPixels } from './helper'
 
 test('Use href to load a JPG image without alpha', async (t) => {
-  const imgUrl = 'http://tva2.sinaimg.cn/crop.0.0.250.250.80/534b48acjw8ehw72edguyj206y06yq32.jpg'
+  const imgUrl = 'https://himg.bdimg.com/sys/portrait/hotitem/wildkid/46'
   const svg = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <image href="${imgUrl}" width="80" height="80"/>
+  <image href="${imgUrl}" width="300" height="300"/>
 </svg>`
   const resvg = new Resvg(svg, {
     font: {
@@ -510,7 +510,7 @@ test('should throw (no input parameters)', (t) => {
   )
 
   t.is(error.code, 'InvalidArg')
-  t.is(error.message, 'Value is not either String or Vec<u8>')
+  t.is(error.message, 'Value is non of these types `String`, `Vec<u8>`, ')
 })
 
 test('should throw (SVG string is empty)', (t) => {

__test__/wasm.spec.ts

@@ -16,9 +16,9 @@ test.before(async () => {
 })
 
 test('Use href to load a JPG image without alpha', async (t) => {
-  const imgUrl = 'http://tva2.sinaimg.cn/crop.0.0.250.250.80/534b48acjw8ehw72edguyj206y06yq32.jpg'
+  const imgUrl = 'https://himg.bdimg.com/sys/portrait/hotitem/wildkid/46'
   const svg = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <image href="${imgUrl}" width="80" height="80"/>
+  <image href="${imgUrl}" width="300" height="300"/>
 </svg>`
   const resvg = new Resvg(svg)
   const resolved = await Promise.all(

js-binding.js

@@ -11,7 +11,8 @@ function isMusl() {
   // For Node 10
   if (!process.report || typeof process.report.getReport !== 'function') {
     try {
-      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+      const lddPath = require('child_process').execSync('which ldd').toString().trim();
+      return readFileSync(lddPath, 'utf8').includes('musl')
     } catch (e) {
       return true
     }
@@ -101,6 +102,15 @@ switch (platform) {
     }
     break
   case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'resvgjs.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./resvgjs.darwin-universal.node')
+      } else {
+        nativeBinding = require('@resvg/resvg-js-darwin-universal')
+      }
+      break
+    } catch {}
     switch (arch) {
       case 'x64':
         localFileExisted = existsSync(join(__dirname, 'resvgjs.darwin-x64.node'))

package.json

@@ -74,7 +74,7 @@
   },
   "devDependencies": {
     "@napi-rs/canvas": "^0.1.25",
-    "@napi-rs/cli": "^2.13.2",
+    "@napi-rs/cli": "^2.14.5",
     "@swc-node/register": "^1.5.1",
     "@types/node": "^18.0.0",
     "@types/sharp": "^0.31.0",

yarn.lock

@@ -344,12 +344,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@napi-rs/cli@npm:^2.13.2":
-  version: 2.13.2
-  resolution: "@napi-rs/cli@npm:2.13.2"
+"@napi-rs/cli@npm:^2.14.5":
+  version: 2.14.5
+  resolution: "@napi-rs/cli@npm:2.14.5"
   bin:
     napi: scripts/index.js
-  checksum: cf9b4d48031ff2981ceaac92afe3b17bc9e2af4e97ae414d469638280cb377f43bf60bd45ce974a756fc7ae7b33ba82c9fc26d0057cce5a028b3537a06824a58
+  checksum: 2b6b16f90fbf49d0200792fb5a9c41da5e287eb666759182fb9c80e4ce05abe4a40002d129096ec2c47a53b5969619bdf9092b424f18bd605dcda2ebaff98eee
   languageName: node
   linkType: hard
 
@@ -405,7 +405,7 @@ __metadata:
   resolution: "@resvg/resvg-js@workspace:."
   dependencies:
     "@napi-rs/canvas": ^0.1.25
-    "@napi-rs/cli": ^2.13.2
+    "@napi-rs/cli": ^2.14.5
     "@swc-node/register": ^1.5.1
     "@types/node": ^18.0.0
     "@types/sharp": ^0.31.0