feat: upgrade dependencies

.gitignore

@@ -22,3 +22,4 @@ output-exif.*
 !output-exif.image.webp
 nasa-small.*
 output-overlay-png.png
+output-debian.jpeg

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.6.4.cjs
+yarnPath: .yarn/releases/yarn-4.1.0.cjs

Cargo.toml

@@ -5,4 +5,3 @@ resolver = "2"
 [profile.release]
 lto = 'fat'
 codegen-units = 1
-strip = 'symbols'

bench/bench.mjs

@@ -1,6 +1,6 @@
-import { promises as fs } from 'fs'
-import { cpus } from 'os'
-import { hrtime } from 'process'
+import { promises as fs } from 'node:fs'
+import { cpus } from 'node:os'
+import { hrtime } from 'node:process'
 
 import { from, timer, lastValueFrom, Subject } from 'rxjs'
 import { mergeMap, takeUntil } from 'rxjs/operators'

example.mjs

@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync } from 'fs'
+import { readFileSync, writeFileSync } from 'node:fs'
 
 import {
   losslessCompressPng,

package.json

@@ -12,20 +12,20 @@
     "website"
   ],
   "devDependencies": {
-    "@napi-rs/cli": "^2.16.3",
-    "@taplo/cli": "^0.5.2",
-    "@types/node": "^20.7.0",
+    "@napi-rs/cli": "^2.18.0",
+    "@taplo/cli": "^0.7.0",
+    "@types/node": "^20.11.16",
     "@types/sharp": "^0.31.1",
-    "ava": "^5.3.1",
+    "ava": "^6.1.1",
     "blurhash": "^2.0.5",
     "chalk": "^5.3.0",
-    "electron": "^26.2.2",
-    "lerna": "^7.3.0",
+    "electron": "^28.2.1",
+    "lerna": "^8.1.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.0.3",
+    "prettier": "^3.2.5",
     "rxjs": "^7.8.1",
-    "sharp": "^0.32.6",
-    "typescript": "^5.2.2"
+    "sharp": "^0.33.2",
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "artifacts": "lerna run artifacts",
@@ -70,6 +70,6 @@
       "pre-commit": "lint-staged && cargo fmt --all"
     }
   },
-  "packageManager": "yarn@3.6.4",
+  "packageManager": "yarn@4.1.0",
   "repository": "git@github.com:Brooooooklyn/Image.git"
 }

packages/binding/Cargo.toml

@@ -16,7 +16,7 @@ oxipng_libdeflater = ["oxipng/zopfli", "oxipng/parallel"]
 with_simd = ["mozjpeg-sys/nasm_simd_parallel_build"]
 
 [dependencies]
-fast_image_resize = "2"
+fast_image_resize = "3"
 imagequant = "4.0.0"
 image = { version = "0.24", default-features = false, features = [
   "jpeg",
@@ -35,11 +35,10 @@ image = { version = "0.24", default-features = false, features = [
   "openexr",
 ] }
 jpeg-decoder = "0.3"
-libavif = { version = "0.11", default-features = false, features = [
+libavif = { version = "0.12", default-features = false, features = [
   "codec-aom",
 ] }
 libc = "0.2"
-libwebp-sys = { version = "0.9", features = ["avx2", "sse41", "neon"] }
 lodepng = "3"
 napi = { version = "2", default-features = false, features = ["napi3"] }
 napi-derive = { version = "2", default-features = false, features = [
@@ -51,16 +50,22 @@ once_cell = "1"
 png = "0.17"
 rexif = "0.7"
 rgb = "0.8"
-resvg = "0.36"
-svgtypes = "0.12"
+resvg = "0.39"
+svgtypes = "0.14"
 
 [dependencies.oxipng]
 default-features = false
-version = "8"
+version = "9"
 
 [dependencies.mozjpeg-sys]
 default-features = false
 version = "2"
 
+[target.'cfg(not(all(target_os = "macos", target_arch = "x86_64")))'.dependencies]
+libwebp-sys = { version = "0.9", default-features = false, features = ["std", "parallel", "avx2", "sse41", "neon"] }
+
+[target.'cfg(all(target_os = "macos", target_arch = "x86_64"))'.dependencies]
+libwebp-sys = { version = "0.9", default-features = false, features = ["std", "parallel"] }
+
 [build-dependencies]
 napi-build = "2"

packages/binding/index.js

@@ -237,6 +237,49 @@ switch (platform) {
           loadError = e
         }
         break
+      case 'riscv64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'image.linux-riscv64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./image.linux-riscv64-musl.node')
+            } else {
+              nativeBinding = require('@napi-rs/image-linux-riscv64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'image.linux-riscv64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./image.linux-riscv64-gnu.node')
+            } else {
+              nativeBinding = require('@napi-rs/image-linux-riscv64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 's390x':
+        localFileExisted = existsSync(
+          join(__dirname, 'image.linux-s390x-gnu.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./image.linux-s390x-gnu.node')
+          } else {
+            nativeBinding = require('@napi-rs/image-linux-s390x-gnu')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
       default:
         throw new Error(`Unsupported architecture on Linux: ${arch}`)
     }

packages/binding/package.json

@@ -37,8 +37,7 @@
         "armv7-unknown-linux-gnueabihf",
         "x86_64-unknown-linux-musl",
         "x86_64-unknown-freebsd",
-        "i686-pc-windows-msvc",
-        "armv7-linux-androideabi"
+        "i686-pc-windows-msvc"
       ]
     }
   },
@@ -62,6 +61,6 @@
   },
   "repository": "git@github.com:Brooooooklyn/Image.git",
   "devDependencies": {
-    "@napi-rs/cli": "^2.16.2"
+    "@napi-rs/cli": "^2.18.0"
   }
 }

packages/binding/src/avif.rs

@@ -102,8 +102,8 @@ pub(crate) fn encode_avif_inner(
 ) -> Result<AvifData<'static>> {
   let mut encoder = libavif::Encoder::new();
   let config: Config = config.unwrap_or_default().into();
-  encoder.set_quantizer((63.0 * (1.0 - config.quality as f32 / 100.0)) as u8);
-  encoder.set_quantizer_alpha((63.0 * (1.0 - config.alpha_quality as f32 / 100.0)) as u8);
+  encoder.set_quality((63.0 * (1.0 - config.quality as f32 / 100.0)) as u8);
+  encoder.set_alpha_quality((63.0 * (1.0 - config.alpha_quality as f32 / 100.0)) as u8);
   encoder.set_speed(config.speed);
   encoder.set_max_threads(config.threads);
   let (width, height) = input_image.dimensions();

packages/binding/src/png.rs

@@ -157,12 +157,12 @@ fn to_oxipng_options(opt: &PNGLosslessOptions) -> oxipng::Options {
       .strip
       .map(|s| {
         if s {
-          oxipng::Headers::All
+          oxipng::StripChunks::All
         } else {
-          oxipng::Headers::None
+          oxipng::StripChunks::None
         }
       })
-      .unwrap_or(oxipng::Headers::All),
+      .unwrap_or(oxipng::StripChunks::Safe),
     #[cfg(target_arch = "arm")]
     deflate: oxipng::Deflaters::Libdeflater { compression: 12 },
     ..Default::default()

packages/binding/src/transformer.rs

@@ -11,8 +11,7 @@ use napi::{bindgen_prelude::*, JsBuffer};
 use napi_derive::napi;
 use resvg::{
   tiny_skia,
-  usvg::fontdb::Database,
-  usvg::{self, Options, TreeParsing, TreeTextToPath},
+  usvg::{self, fontdb::Database, Options},
 };
 
 use crate::{
@@ -646,7 +645,9 @@ impl Task for EncodeTask {
         let len = avif_data.len();
         let data_ptr = avif_data.as_slice().as_ptr();
         unsafe {
-          env.create_buffer_with_borrowed_data(data_ptr, len, avif_data, |data, _env| drop(data))
+          env.create_buffer_with_borrowed_data(data_ptr.cast_mut(), len, avif_data, |data, _env| {
+            drop(data)
+          })
         }
         .map(|b| b.into_raw())
       }
@@ -683,7 +684,7 @@ impl Transformer {
       Either::B(b) => usvg::Tree::from_data(b.as_ref(), &options),
     }
     .map_err(|err| Error::from_reason(format!("{err}")))?;
-    tree.convert_text(&FONT_DB);
+    tree.postprocess(Default::default(), &FONT_DB);
     let mut size = tree.size.to_int_size();
     let min_svg_size = 1000;
     while size.width() < min_svg_size || size.height() < min_svg_size {
@@ -700,7 +701,11 @@ impl Transformer {
       let color = tiny_skia::Color::from_rgba8(bg.red, bg.green, bg.blue, bg.alpha);
       pix_map.fill(color);
     }
-    resvg::Tree::from_usvg(&tree).render(tiny_skia::Transform::identity(), &mut pix_map.as_mut());
+    resvg::render(
+      &tree,
+      tiny_skia::Transform::identity(),
+      &mut pix_map.as_mut(),
+    );
 
     let width = pix_map.width();
     let height = pix_map.height();

website/package.json

@@ -4,17 +4,17 @@
   "version": "0.0.0",
   "type": "module",
   "dependencies": {
-    "@napi-rs/canvas": "^0.1.41",
-    "@napi-rs/image": "^1.6.1",
+    "@napi-rs/canvas": "^0.1.45",
+    "@napi-rs/image": "^1.7.0",
     "chalk": "^5.3.0",
     "next": "canary",
     "next-mdx-remote": "^4.4.1",
-    "nextra": "^2.10.0",
-    "nextra-theme-docs": "^2.10.0",
+    "nextra": "^2.13.3",
+    "nextra-theme-docs": "^2.13.3",
     "node-fetch": "^3.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "sharp": "^0.32.4"
+    "sharp": "^0.33.2"
   },
   "scripts": {
     "build": "node generate-img.js && next build",

website/public/img/example.mjs

@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync } from 'fs'
+import { readFileSync, writeFileSync } from 'node:fs'
 
 import {
   losslessCompressPng,