Merge pull request #180 from noahbald/fix/179-fix-napi-ci-error

fix: #179 resolve napi ci error

Author: noahbald

Cargo.lock

@@ -31,10 +31,11 @@ oxvg_path = { path = "crates/oxvg_path", version = ">=0.0" }
 anyhow = "1.0"
 bitflags = { version = "2.7.0" }
 cfg-if = { version = "1.0" }
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5", features = ["derive"] }
 # NOTE: Out of date version used for compatibility with selectors
 # https://github.com/servo/stylo/blob/main/Cargo.toml#L35
 cssparser = "0.34.0"
+dashmap = "6.1"
 derive_more = "2.0"
 derive-where = "1.2"
 getrandom = { version = "0.2", features = ["js"] }
@@ -47,10 +48,12 @@ lightningcss = { version = "1.0.0-alpha.63", default-features = false, features
 ] }
 log = "0.4"
 markup5ever = "0.14"
-napi = { version = "3.0.0-alpha.33", default-features = false, features = [
-  "napi4",
+napi = { version = "3.4", default-features = false, features = [
+  "serde-json",
+  "napi7",
 ] }
-napi-derive = "3.0.0-alpha.29"
+napi-build = { version = "2.2", default-features = false }
+napi-derive = { version = "3.3" }
 phf = { version = "0.11", features = ["macros"] }
 precomputed-hash = "0.1"
 rcdom = { package = "markup5ever_rcdom", version = "=0.5.0-unofficial" }
@@ -60,7 +63,7 @@ selectors = "0.26"
 serde = "1.0"
 serde_json = "1.0"
 serde-wasm-bindgen = "0.6"
-serde_with = "3.12"
+serde_with = "3.15"
 string_cache = "0.8"
 tendril = "0.4"
 tsify = { version = "0.5", default-features = false, features = ["js"] }

Cargo.toml

@@ -36,6 +36,7 @@ oxvg_collections = { workspace = true }
 
 anyhow = { workspace = true }
 clap = { workspace = true, optional = true }
+dashmap = { workspace = true }
 derive_more = { workspace = true }
 derive-where = { workspace = true }
 itertools = { workspace = true }

crates/oxvg_optimiser/Cargo.toml

@@ -31,6 +31,11 @@ use tsify::Tsify;
 pub enum ConvertCase {
     Upper,
     Lower,
+    #[doc(hidden)]
+    #[cfg(feature = "napi")]
+    /// Compatibility option for NAPI
+    // FIXME: force discriminated union to prevent NAPI from failing CI
+    Napi(),
 }
 
 #[cfg_attr(feature = "wasm", derive(Tsify))]

crates/oxvg_optimiser/src/jobs/convert_colors.rs

@@ -30,6 +30,11 @@ pub enum RemoveUnused {
     #[default]
     True,
     Force,
+    #[doc(hidden)]
+    #[cfg(feature = "napi")]
+    /// Compatibility option for NAPI
+    // FIXME: force discriminated union to prevent NAPI from failing CI
+    Napi(),
 }
 
 #[cfg_attr(feature = "wasm", derive(Tsify))]
@@ -280,6 +285,8 @@ impl Serialize for RemoveUnused {
             RemoveUnused::True => true.serialize(serializer),
             RemoveUnused::False => false.serialize(serializer),
             RemoveUnused::Force => "force".serialize(serializer),
+            #[cfg(feature = "napi")]
+            Self::Napi() => panic!("Napi variant is not allowed!"),
         }
     }
 }

crates/oxvg_optimiser/src/jobs/minify_styles.rs

@@ -7,8 +7,6 @@ use oxvg_ast::{
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 
-pub use prefix_ids::PrefixGenerator;
-
 #[cfg(feature = "wasm")]
 use tsify::Tsify;