diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 82d7877..5814c5b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -213,7 +213,7 @@ jobs: - uses: actions/checkout@v4 - name: Build id: build - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@v0.24.0 env: DEBUG: 'napi:*' RUSTUP_HOME: /home/runner/rustup diff --git a/package.json b/package.json index 88f739b..3714fcd 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@napi-rs/cli": "^3.0.0-alpha.41", "@taplo/cli": "^0.7.0", "@types/node": "^20.11.16", - "@types/sharp": "^0.31.1", + "@types/sharp": "^0.32.0", "ava": "^6.1.1", "blurhash": "^2.0.5", "chalk": "^5.3.0", diff --git a/packages/binding/Cargo.toml b/packages/binding/Cargo.toml index 56f0fdf..cfb1679 100644 --- a/packages/binding/Cargo.toml +++ b/packages/binding/Cargo.toml @@ -18,7 +18,7 @@ with_simd = ["mozjpeg-sys/nasm_simd_parallel_build"] [dependencies] fast_image_resize = "3" imagequant = "4.0.0" -image = { version = "0.24", default-features = false, features = [ +image = { version = "0.25", default-features = false, features = [ "jpeg", "ico", "png", @@ -28,11 +28,7 @@ image = { version = "0.24", default-features = false, features = [ "bmp", "webp", "hdr", - "dxt", - "dds", - "farbfeld", - "jpeg_rayon", - "openexr", + "dds" ] } jpeg-decoder = "0.3" libavif = { version = "0.13", default-features = false, features = [ @@ -50,8 +46,8 @@ once_cell = "1" png = "0.17" rexif = "0.7" rgb = "0.8" -resvg = "0.40" -svgtypes = "0.14" +resvg = "0.41" +svgtypes = "0.15" [dependencies.oxipng] default-features = false diff --git a/packages/binding/src/transformer.rs b/packages/binding/src/transformer.rs index 0dcea29..1ef2377 100644 --- a/packages/binding/src/transformer.rs +++ b/packages/binding/src/transformer.rs @@ -594,7 +594,7 @@ impl Task for EncodeTask { dynamic_image.as_bytes(), dynamic_image.width(), dynamic_image.height(), - dynamic_image.color(), + dynamic_image.color().into(), ) .map_err(|err| { Error::new( diff --git a/yarn.lock b/yarn.lock index acb7504..908b49c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -86,6 +86,15 @@ __metadata: languageName: node linkType: hard +"@emnapi/runtime@npm:^1.1.0": + version: 1.1.1 + resolution: "@emnapi/runtime@npm:1.1.1" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10c0/c11ee57abf0ec643e64ccdace4b4fcc0b0c7b1117a191f969e84ae3669841aa90d2c17fa35b73f5a66fc0c843c8caca7bf11187faaeaa526bcfb7dbfb9b85de9 + languageName: node + linkType: hard + "@headlessui/react@npm:^1.7.17": version: 1.7.18 resolution: "@headlessui/react@npm:1.7.18" @@ -118,6 +127,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-darwin-arm64@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-darwin-arm64@npm:0.33.3" + dependencies: + "@img/sharp-libvips-darwin-arm64": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-darwin-arm64": + optional: true + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@img/sharp-darwin-x64@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-darwin-x64@npm:0.33.2" @@ -130,6 +151,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-darwin-x64@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-darwin-x64@npm:0.33.3" + dependencies: + "@img/sharp-libvips-darwin-x64": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-darwin-x64": + optional: true + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@img/sharp-libvips-darwin-arm64@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.1" @@ -137,6 +170,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-darwin-arm64@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.2" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@img/sharp-libvips-darwin-x64@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.1" @@ -144,6 +184,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-darwin-x64@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.2" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@img/sharp-libvips-linux-arm64@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.1" @@ -151,6 +198,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-linux-arm64@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.2" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@img/sharp-libvips-linux-arm@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-linux-arm@npm:1.0.1" @@ -158,6 +212,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-linux-arm@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-linux-arm@npm:1.0.2" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + "@img/sharp-libvips-linux-s390x@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.1" @@ -165,6 +226,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-linux-s390x@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.2" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + "@img/sharp-libvips-linux-x64@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-linux-x64@npm:1.0.1" @@ -172,6 +240,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-linux-x64@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-linux-x64@npm:1.0.2" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.1" @@ -179,6 +254,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.2" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@img/sharp-libvips-linuxmusl-x64@npm:1.0.1": version: 1.0.1 resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.1" @@ -186,6 +268,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-libvips-linuxmusl-x64@npm:1.0.2": + version: 1.0.2 + resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.2" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@img/sharp-linux-arm64@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-linux-arm64@npm:0.33.2" @@ -198,6 +287,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-linux-arm64@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-linux-arm64@npm:0.33.3" + dependencies: + "@img/sharp-libvips-linux-arm64": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-linux-arm64": + optional: true + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@img/sharp-linux-arm@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-linux-arm@npm:0.33.2" @@ -210,6 +311,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-linux-arm@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-linux-arm@npm:0.33.3" + dependencies: + "@img/sharp-libvips-linux-arm": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-linux-arm": + optional: true + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + "@img/sharp-linux-s390x@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-linux-s390x@npm:0.33.2" @@ -222,6 +335,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-linux-s390x@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-linux-s390x@npm:0.33.3" + dependencies: + "@img/sharp-libvips-linux-s390x": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-linux-s390x": + optional: true + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + "@img/sharp-linux-x64@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-linux-x64@npm:0.33.2" @@ -234,6 +359,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-linux-x64@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-linux-x64@npm:0.33.3" + dependencies: + "@img/sharp-libvips-linux-x64": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-linux-x64": + optional: true + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@img/sharp-linuxmusl-arm64@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.2" @@ -246,6 +383,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-linuxmusl-arm64@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.3" + dependencies: + "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-linuxmusl-arm64": + optional: true + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@img/sharp-linuxmusl-x64@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-linuxmusl-x64@npm:0.33.2" @@ -258,6 +407,18 @@ __metadata: languageName: node linkType: hard +"@img/sharp-linuxmusl-x64@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-linuxmusl-x64@npm:0.33.3" + dependencies: + "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2" + dependenciesMeta: + "@img/sharp-libvips-linuxmusl-x64": + optional: true + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@img/sharp-wasm32@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-wasm32@npm:0.33.2" @@ -267,6 +428,15 @@ __metadata: languageName: node linkType: hard +"@img/sharp-wasm32@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-wasm32@npm:0.33.3" + dependencies: + "@emnapi/runtime": "npm:^1.1.0" + conditions: cpu=wasm32 + languageName: node + linkType: hard + "@img/sharp-win32-ia32@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-win32-ia32@npm:0.33.2" @@ -274,6 +444,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-win32-ia32@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-win32-ia32@npm:0.33.3" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@img/sharp-win32-x64@npm:0.33.2": version: 0.33.2 resolution: "@img/sharp-win32-x64@npm:0.33.2" @@ -281,6 +458,13 @@ __metadata: languageName: node linkType: hard +"@img/sharp-win32-x64@npm:0.33.3": + version: 0.33.3 + resolution: "@img/sharp-win32-x64@npm:0.33.3" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -2097,12 +2281,12 @@ __metadata: languageName: node linkType: hard -"@types/sharp@npm:^0.31.1": - version: 0.31.1 - resolution: "@types/sharp@npm:0.31.1" +"@types/sharp@npm:^0.32.0": + version: 0.32.0 + resolution: "@types/sharp@npm:0.32.0" dependencies: - "@types/node": "npm:*" - checksum: 10c0/62de067f3ab5e29bbc649178540d2eb9bda061481d56a30970e04d503434319d0ae288e3680c8ad359f344db2ef310a63a4222254954b70945372eb5305045ad + sharp: "npm:*" + checksum: 10c0/a101c5bf17220b51e339164fabf779993e1757fcae1610f2647d36a24d7f15bf857fd747ec559b8fef667c9ea38caab09dc3ba4d49095fef2a06e5ae1819e639 languageName: node linkType: hard @@ -4041,6 +4225,13 @@ __metadata: languageName: node linkType: hard +"detect-libc@npm:^2.0.3": + version: 2.0.3 + resolution: "detect-libc@npm:2.0.3" + checksum: 10c0/88095bda8f90220c95f162bf92cad70bd0e424913e655c20578600e35b91edc261af27531cf160a331e185c0ced93944bc7e09939143225f56312d7fd800fdb7 + languageName: node + linkType: hard + "detect-node@npm:^2.0.4": version: 2.1.0 resolution: "detect-node@npm:2.1.0" @@ -5546,7 +5737,7 @@ __metadata: "@napi-rs/cli": "npm:^3.0.0-alpha.41" "@taplo/cli": "npm:^0.7.0" "@types/node": "npm:^20.11.16" - "@types/sharp": "npm:^0.31.1" + "@types/sharp": "npm:^0.32.0" ava: "npm:^6.1.1" blurhash: "npm:^2.0.5" chalk: "npm:^5.3.0" @@ -9639,7 +9830,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4": +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0": version: 7.6.0 resolution: "semver@npm:7.6.0" dependencies: @@ -9689,6 +9880,75 @@ __metadata: languageName: node linkType: hard +"sharp@npm:*": + version: 0.33.3 + resolution: "sharp@npm:0.33.3" + dependencies: + "@img/sharp-darwin-arm64": "npm:0.33.3" + "@img/sharp-darwin-x64": "npm:0.33.3" + "@img/sharp-libvips-darwin-arm64": "npm:1.0.2" + "@img/sharp-libvips-darwin-x64": "npm:1.0.2" + "@img/sharp-libvips-linux-arm": "npm:1.0.2" + "@img/sharp-libvips-linux-arm64": "npm:1.0.2" + "@img/sharp-libvips-linux-s390x": "npm:1.0.2" + "@img/sharp-libvips-linux-x64": "npm:1.0.2" + "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2" + "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2" + "@img/sharp-linux-arm": "npm:0.33.3" + "@img/sharp-linux-arm64": "npm:0.33.3" + "@img/sharp-linux-s390x": "npm:0.33.3" + "@img/sharp-linux-x64": "npm:0.33.3" + "@img/sharp-linuxmusl-arm64": "npm:0.33.3" + "@img/sharp-linuxmusl-x64": "npm:0.33.3" + "@img/sharp-wasm32": "npm:0.33.3" + "@img/sharp-win32-ia32": "npm:0.33.3" + "@img/sharp-win32-x64": "npm:0.33.3" + color: "npm:^4.2.3" + detect-libc: "npm:^2.0.3" + semver: "npm:^7.6.0" + dependenciesMeta: + "@img/sharp-darwin-arm64": + optional: true + "@img/sharp-darwin-x64": + optional: true + "@img/sharp-libvips-darwin-arm64": + optional: true + "@img/sharp-libvips-darwin-x64": + optional: true + "@img/sharp-libvips-linux-arm": + optional: true + "@img/sharp-libvips-linux-arm64": + optional: true + "@img/sharp-libvips-linux-s390x": + optional: true + "@img/sharp-libvips-linux-x64": + optional: true + "@img/sharp-libvips-linuxmusl-arm64": + optional: true + "@img/sharp-libvips-linuxmusl-x64": + optional: true + "@img/sharp-linux-arm": + optional: true + "@img/sharp-linux-arm64": + optional: true + "@img/sharp-linux-s390x": + optional: true + "@img/sharp-linux-x64": + optional: true + "@img/sharp-linuxmusl-arm64": + optional: true + "@img/sharp-linuxmusl-x64": + optional: true + "@img/sharp-wasm32": + optional: true + "@img/sharp-win32-ia32": + optional: true + "@img/sharp-win32-x64": + optional: true + checksum: 10c0/12f5203426595b4e64c807162a6d52358b591d25fbb414a51fe38861584759fba38485be951ed98d15be3dfe21f2def5336f78ca35bf8bbd22d88cc78ca03f2a + languageName: node + linkType: hard + "sharp@npm:^0.33.2": version: 0.33.2 resolution: "sharp@npm:0.33.2"