diff --git a/Cargo.lock b/Cargo.lock index d8a172c29..a5ca3ccb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -378,7 +378,7 @@ dependencies = [ "serde_repr", "thiserror 2.0.12", "tokio", - "tsify-next", + "tsify", "uniffi", "uuid", "wasm-bindgen", @@ -420,7 +420,7 @@ dependencies = [ "sha2", "subtle", "thiserror 2.0.12", - "tsify-next", + "tsify", "typenum", "uniffi", "uuid", @@ -437,7 +437,7 @@ dependencies = [ "js-sys", "serde", "trybuild", - "tsify-next", + "tsify", "wasm-bindgen", "wasm-bindgen-test", ] @@ -454,7 +454,7 @@ dependencies = [ "serde", "syn", "thiserror 2.0.12", - "tsify-next", + "tsify", "wasm-bindgen", ] @@ -475,7 +475,7 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.12", - "tsify-next", + "tsify", "uniffi", "uuid", "wasm-bindgen", @@ -520,7 +520,7 @@ dependencies = [ "serde_json", "thiserror 2.0.12", "tokio", - "tsify-next", + "tsify", "uniffi", "wasm-bindgen", "wiremock", @@ -538,7 +538,7 @@ dependencies = [ "serde_json", "thiserror 2.0.12", "tokio", - "tsify-next", + "tsify", "wasm-bindgen", "wasm-bindgen-futures", ] @@ -594,7 +594,7 @@ dependencies = [ "serde", "ssh-key", "thiserror 2.0.12", - "tsify-next", + "tsify", "uniffi", "wasm-bindgen", ] @@ -614,7 +614,7 @@ dependencies = [ "tokio", "tokio-test", "tokio-util", - "tsify-next", + "tsify", "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test", @@ -687,7 +687,7 @@ dependencies = [ "sha2", "thiserror 2.0.12", "tokio", - "tsify-next", + "tsify", "uniffi", "uuid", "wasm-bindgen", @@ -4327,22 +4327,22 @@ dependencies = [ ] [[package]] -name = "tsify-next" -version = "0.5.6" +name = "tsify" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0f2208feeb5f7a6edb15a2389c14cd42480ef6417318316bb866da5806a61d" +checksum = "b2ec91b85e6c6592ed28636cb1dd1fac377ecbbeb170ff1d79f97aac5e38926d" dependencies = [ "serde", "serde-wasm-bindgen", - "tsify-next-macros", + "tsify-macros", "wasm-bindgen", ] [[package]] -name = "tsify-next-macros" -version = "0.5.6" +name = "tsify-macros" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81253930d0d388a3ab8fa4ae56da9973ab171ef833d1be2e9080fc3ce502bd6" +checksum = "9a324606929ad11628a19206d7853807481dcaecd6c08be70a235930b8241955" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index bbda3dd09..df9adaca2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ serde_repr = ">=0.1.12, <0.2" syn = ">=2.0.87, <3" thiserror = ">=1.0.40, <3" tokio = { version = "1.36.0", features = ["macros"] } -tsify-next = { version = ">=0.5.4, <0.6", features = [ +tsify = { version = ">=0.5.5, <0.6", features = [ "js", ], default-features = false } uniffi = "=0.29.1" diff --git a/crates/bitwarden-core/Cargo.toml b/crates/bitwarden-core/Cargo.toml index db4f16e4b..87a3a0653 100644 --- a/crates/bitwarden-core/Cargo.toml +++ b/crates/bitwarden-core/Cargo.toml @@ -25,7 +25,7 @@ wasm = [ "bitwarden-error/wasm", "dep:wasm-bindgen", "dep:wasm-bindgen-futures", - "dep:tsify-next" + "dep:tsify" ] # WASM support [dependencies] @@ -47,7 +47,7 @@ serde_json = { workspace = true } serde_qs = { workspace = true } serde_repr = { workspace = true } thiserror = { workspace = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } uniffi = { workspace = true, optional = true, features = ["tokio"] } uuid = { workspace = true } wasm-bindgen = { workspace = true, optional = true } diff --git a/crates/bitwarden-core/src/client/client_settings.rs b/crates/bitwarden-core/src/client/client_settings.rs index d16928283..cc495ea91 100644 --- a/crates/bitwarden-core/src/client/client_settings.rs +++ b/crates/bitwarden-core/src/client/client_settings.rs @@ -21,7 +21,7 @@ use serde::{Deserialize, Serialize}; #[cfg_attr(feature = "uniffi", derive(uniffi::Record))] #[cfg_attr( feature = "wasm", - derive(tsify_next::Tsify), + derive(tsify::Tsify), tsify(into_wasm_abi, from_wasm_abi) )] pub struct ClientSettings { @@ -51,7 +51,7 @@ impl Default for ClientSettings { #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))] #[cfg_attr( feature = "wasm", - derive(tsify_next::Tsify), + derive(tsify::Tsify), tsify(into_wasm_abi, from_wasm_abi) )] pub enum DeviceType { diff --git a/crates/bitwarden-core/src/key_management/crypto.rs b/crates/bitwarden-core/src/key_management/crypto.rs index 3a1cd66a4..5e0f99fa6 100644 --- a/crates/bitwarden-core/src/key_management/crypto.rs +++ b/crates/bitwarden-core/src/key_management/crypto.rs @@ -16,7 +16,7 @@ use bitwarden_error::bitwarden_error; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use {tsify_next::Tsify, wasm_bindgen::prelude::*}; +use {tsify::Tsify, wasm_bindgen::prelude::*}; use crate::{ client::{encryption_settings::EncryptionSettingsError, LoginMethod, UserLoginMethod}, diff --git a/crates/bitwarden-crypto/Cargo.toml b/crates/bitwarden-crypto/Cargo.toml index 38623b463..3f279d143 100644 --- a/crates/bitwarden-crypto/Cargo.toml +++ b/crates/bitwarden-crypto/Cargo.toml @@ -16,7 +16,7 @@ keywords.workspace = true [features] default = [] -wasm = ["dep:tsify-next", "dep:wasm-bindgen"] # WASM support +wasm = ["dep:tsify", "dep:wasm-bindgen"] # WASM support uniffi = ["dep:uniffi"] # Uniffi bindings no-memory-hardening = [] # Disable memory hardening features @@ -52,7 +52,7 @@ sha1 = ">=0.10.5, <0.11" sha2 = ">=0.10.6, <0.11" subtle = ">=2.5.0, <3.0" thiserror = { workspace = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } typenum = ">=1.18.0, <1.19.0" uniffi = { workspace = true, optional = true } uuid = { workspace = true } diff --git a/crates/bitwarden-crypto/src/keys/kdf.rs b/crates/bitwarden-crypto/src/keys/kdf.rs index 5273c134f..8e6886879 100644 --- a/crates/bitwarden-crypto/src/keys/kdf.rs +++ b/crates/bitwarden-crypto/src/keys/kdf.rs @@ -5,7 +5,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use sha2::Digest; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use typenum::U32; use zeroize::Zeroize; diff --git a/crates/bitwarden-crypto/src/signing/mod.rs b/crates/bitwarden-crypto/src/signing/mod.rs index 89753263a..84e35c41d 100644 --- a/crates/bitwarden-crypto/src/signing/mod.rs +++ b/crates/bitwarden-crypto/src/signing/mod.rs @@ -44,7 +44,7 @@ pub use message::SerializedMessage; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use {tsify_next::Tsify, wasm_bindgen::prelude::*}; +use {tsify::Tsify, wasm_bindgen::prelude::*}; /// The type of key / signature scheme used for signing and verifying. #[derive(Serialize, Deserialize, Debug, JsonSchema, PartialEq)] diff --git a/crates/bitwarden-error-macro/Cargo.toml b/crates/bitwarden-error-macro/Cargo.toml index 3e9831abc..19d78f001 100644 --- a/crates/bitwarden-error-macro/Cargo.toml +++ b/crates/bitwarden-error-macro/Cargo.toml @@ -34,5 +34,5 @@ bitwarden-error = { workspace = true, features = ["wasm"] } js-sys.workspace = true serde.workspace = true thiserror.workspace = true -tsify-next.workspace = true +tsify.workspace = true wasm-bindgen.workspace = true diff --git a/crates/bitwarden-error-macro/src/full/attribute.rs b/crates/bitwarden-error-macro/src/full/attribute.rs index 88ad8d869..17cd9628f 100644 --- a/crates/bitwarden-error-macro/src/full/attribute.rs +++ b/crates/bitwarden-error-macro/src/full/attribute.rs @@ -14,7 +14,7 @@ pub(crate) fn bitwarden_error_full( let wasm_attributes = cfg!(feature = "wasm").then(|| { quote! { - #[derive(bitwarden_error::tsify_next::Tsify)] + #[derive(bitwarden_error::tsify::Tsify)] #[tsify(into_wasm_abi)] } }); diff --git a/crates/bitwarden-error-macro/src/lib.rs b/crates/bitwarden-error-macro/src/lib.rs index 9b9103f49..3dc7737a6 100644 --- a/crates/bitwarden-error-macro/src/lib.rs +++ b/crates/bitwarden-error-macro/src/lib.rs @@ -101,7 +101,7 @@ mod full; /// } /// ``` /// -/// will use tsify_next::Tsify to generate roughly the following TypeScript definition: +/// will use tsify::Tsify to generate roughly the following TypeScript definition: /// /// ```typescript /// export type CryptoError = diff --git a/crates/bitwarden-error/Cargo.toml b/crates/bitwarden-error/Cargo.toml index 867f5319c..9757669ed 100644 --- a/crates/bitwarden-error/Cargo.toml +++ b/crates/bitwarden-error/Cargo.toml @@ -18,14 +18,14 @@ keywords.workspace = true wasm = [ "bitwarden-error-macro/wasm", "dep:js-sys", - "dep:tsify-next", + "dep:tsify", "dep:wasm-bindgen" ] [dependencies] bitwarden-error-macro = { workspace = true } js-sys = { workspace = true, optional = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } wasm-bindgen = { workspace = true, optional = true } [lints] diff --git a/crates/bitwarden-error/src/lib.rs b/crates/bitwarden-error/src/lib.rs index ac8de0014..f9d2188db 100644 --- a/crates/bitwarden-error/src/lib.rs +++ b/crates/bitwarden-error/src/lib.rs @@ -11,10 +11,10 @@ pub mod wasm; #[cfg(feature = "wasm")] #[doc(hidden)] pub use ::js_sys; -/// Re-export the `tsify_next` crate since the proc macro depends on it. +/// Re-export the `tsify` crate since the proc macro depends on it. #[cfg(feature = "wasm")] #[doc(hidden)] -pub use ::tsify_next; +pub use ::tsify; /// Re-export the `wasm_bindgen` crate since the proc macro depends on it. #[cfg(feature = "wasm")] #[doc(hidden)] diff --git a/crates/bitwarden-exporters/Cargo.toml b/crates/bitwarden-exporters/Cargo.toml index 35eba3fae..84c2f4ea5 100644 --- a/crates/bitwarden-exporters/Cargo.toml +++ b/crates/bitwarden-exporters/Cargo.toml @@ -19,7 +19,7 @@ keywords.workspace = true uniffi = ["dep:uniffi", "bitwarden-core/uniffi"] # Uniffi bindings wasm = [ "bitwarden-vault/wasm", - "dep:tsify-next", + "dep:tsify", "dep:wasm-bindgen" ] # WebAssembly bindings @@ -37,7 +37,7 @@ num-traits = ">=0.2, <0.3" serde = { workspace = true } serde_json = { workspace = true } thiserror = { workspace = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } uniffi = { workspace = true, optional = true } uuid = { workspace = true } wasm-bindgen = { workspace = true, optional = true } diff --git a/crates/bitwarden-exporters/src/cxf/export.rs b/crates/bitwarden-exporters/src/cxf/export.rs index 2c60dec22..caa0e5185 100644 --- a/crates/bitwarden-exporters/src/cxf/export.rs +++ b/crates/bitwarden-exporters/src/cxf/export.rs @@ -4,7 +4,7 @@ use credential_exchange_format::{ }; use uuid::Uuid; #[cfg(feature = "wasm")] -use {tsify_next::Tsify, wasm_bindgen::prelude::*}; +use {tsify::Tsify, wasm_bindgen::prelude::*}; use crate::{cxf::CxfError, Cipher, CipherType, Login}; diff --git a/crates/bitwarden-exporters/src/lib.rs b/crates/bitwarden-exporters/src/lib.rs index 89cb243cc..7b83c92d2 100644 --- a/crates/bitwarden-exporters/src/lib.rs +++ b/crates/bitwarden-exporters/src/lib.rs @@ -29,7 +29,7 @@ pub use error::ExportError; #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))] #[cfg_attr( feature = "wasm", - derive(serde::Serialize, serde::Deserialize, tsify_next::Tsify), + derive(serde::Serialize, serde::Deserialize, tsify::Tsify), tsify(into_wasm_abi, from_wasm_abi) )] pub enum ExportFormat { diff --git a/crates/bitwarden-generators/Cargo.toml b/crates/bitwarden-generators/Cargo.toml index 3b4097ee3..ccee89a3b 100644 --- a/crates/bitwarden-generators/Cargo.toml +++ b/crates/bitwarden-generators/Cargo.toml @@ -18,7 +18,7 @@ keywords.workspace = true uniffi = ["dep:uniffi"] # Uniffi bindings wasm = [ "bitwarden-core/wasm", - "dep:tsify-next", + "dep:tsify", "dep:wasm-bindgen" ] # WebAssembly bindings @@ -32,7 +32,7 @@ schemars = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } thiserror = { workspace = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } uniffi = { workspace = true, optional = true } wasm-bindgen = { workspace = true, optional = true } diff --git a/crates/bitwarden-generators/src/passphrase.rs b/crates/bitwarden-generators/src/passphrase.rs index e88136169..c7921c437 100644 --- a/crates/bitwarden-generators/src/passphrase.rs +++ b/crates/bitwarden-generators/src/passphrase.rs @@ -5,7 +5,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use thiserror::Error; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use crate::util::capitalize_first_letter; diff --git a/crates/bitwarden-generators/src/password.rs b/crates/bitwarden-generators/src/password.rs index 5df777b2b..5e112b055 100644 --- a/crates/bitwarden-generators/src/password.rs +++ b/crates/bitwarden-generators/src/password.rs @@ -6,7 +6,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use thiserror::Error; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; #[allow(missing_docs)] #[bitwarden_error(flat)] diff --git a/crates/bitwarden-generators/src/username.rs b/crates/bitwarden-generators/src/username.rs index aa226242c..1cf61fbca 100644 --- a/crates/bitwarden-generators/src/username.rs +++ b/crates/bitwarden-generators/src/username.rs @@ -6,7 +6,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use thiserror::Error; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use crate::util::capitalize_first_letter; @@ -42,7 +42,7 @@ pub enum AppendType { #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))] #[cfg_attr( feature = "wasm", - derive(tsify_next::Tsify), + derive(tsify::Tsify), tsify(into_wasm_abi, from_wasm_abi) )] /// Configures the email forwarding service to use. @@ -81,7 +81,7 @@ pub enum ForwarderServiceType { #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))] #[cfg_attr( feature = "wasm", - derive(tsify_next::Tsify), + derive(tsify::Tsify), tsify(into_wasm_abi, from_wasm_abi) )] pub enum UsernameGeneratorRequest { diff --git a/crates/bitwarden-ipc/Cargo.toml b/crates/bitwarden-ipc/Cargo.toml index 054ceae46..e81396d30 100644 --- a/crates/bitwarden-ipc/Cargo.toml +++ b/crates/bitwarden-ipc/Cargo.toml @@ -11,7 +11,7 @@ keywords.workspace = true [features] wasm = [ - "dep:tsify-next", + "dep:tsify", "dep:wasm-bindgen", "dep:wasm-bindgen-futures", "dep:js-sys", @@ -28,7 +28,7 @@ serde = { workspace = true } serde_json = { workspace = true } thiserror = { workspace = true } tokio = { features = ["sync", "time", "rt"], workspace = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } wasm-bindgen = { workspace = true, optional = true } wasm-bindgen-futures = { workspace = true, optional = true } diff --git a/crates/bitwarden-ipc/src/endpoint.rs b/crates/bitwarden-ipc/src/endpoint.rs index 1823d7552..ce69c9fb6 100644 --- a/crates/bitwarden-ipc/src/endpoint.rs +++ b/crates/bitwarden-ipc/src/endpoint.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use {tsify_next::Tsify, wasm_bindgen::prelude::*}; +use {tsify::Tsify, wasm_bindgen::prelude::*}; #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, Hash)] #[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))] diff --git a/crates/bitwarden-ssh/Cargo.toml b/crates/bitwarden-ssh/Cargo.toml index 084d33969..594103eae 100644 --- a/crates/bitwarden-ssh/Cargo.toml +++ b/crates/bitwarden-ssh/Cargo.toml @@ -18,7 +18,7 @@ keywords.workspace = true [features] wasm = [ "bitwarden-error/wasm", - "dep:tsify-next", + "dep:tsify", "dep:wasm-bindgen" ] # WASM support uniffi = ["dep:uniffi"] # Uniffi bindings @@ -38,7 +38,7 @@ ssh-key = { version = ">=0.6.7, <0.7", features = [ "rsa", ], default-features = false } thiserror = { workspace = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } uniffi = { workspace = true, optional = true } wasm-bindgen = { workspace = true, optional = true } diff --git a/crates/bitwarden-ssh/src/generator.rs b/crates/bitwarden-ssh/src/generator.rs index 6101301a9..1a95b13bb 100644 --- a/crates/bitwarden-ssh/src/generator.rs +++ b/crates/bitwarden-ssh/src/generator.rs @@ -2,7 +2,7 @@ use bitwarden_vault::SshKeyView; use serde::{Deserialize, Serialize}; use ssh_key::{rand_core::CryptoRngCore, Algorithm}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use crate::{ error::{self, KeyGenerationError}, diff --git a/crates/bitwarden-threading/Cargo.toml b/crates/bitwarden-threading/Cargo.toml index 36e39458e..fd236f8bf 100644 --- a/crates/bitwarden-threading/Cargo.toml +++ b/crates/bitwarden-threading/Cargo.toml @@ -39,7 +39,7 @@ async-trait = "0.1.88" console_error_panic_hook = "0.1.7" js-sys = { workspace = true } tokio-test = "0.4.4" -tsify-next = { workspace = true } +tsify = { workspace = true } wasm-bindgen = { workspace = true } wasm-bindgen-futures = { workspace = true } wasm-bindgen-test = { workspace = true } diff --git a/crates/bitwarden-threading/tests/thread_bound_runner/wasm.rs b/crates/bitwarden-threading/tests/thread_bound_runner/wasm.rs index 91f38dd0f..96b8e1775 100644 --- a/crates/bitwarden-threading/tests/thread_bound_runner/wasm.rs +++ b/crates/bitwarden-threading/tests/thread_bound_runner/wasm.rs @@ -1,6 +1,6 @@ use bitwarden_threading::ThreadBoundRunner; use serde::{Deserialize, Serialize}; -use tsify_next::{serde_wasm_bindgen, Tsify}; +use tsify::{serde_wasm_bindgen, Tsify}; use wasm_bindgen::prelude::*; use wasm_bindgen_test::wasm_bindgen_test; diff --git a/crates/bitwarden-uuid-macro/src/lib.rs b/crates/bitwarden-uuid-macro/src/lib.rs index 401df700d..707ec5ec7 100644 --- a/crates/bitwarden-uuid-macro/src/lib.rs +++ b/crates/bitwarden-uuid-macro/src/lib.rs @@ -21,7 +21,7 @@ pub fn uuid(input: TokenStream) -> TokenStream { let expanded = quote! { #[doc = #doc_string] - #[cfg_attr(feature = "wasm", derive(::tsify_next::Tsify), tsify(into_wasm_abi, from_wasm_abi))] + #[cfg_attr(feature = "wasm", derive(::tsify::Tsify), tsify(into_wasm_abi, from_wasm_abi))] #[derive( ::serde::Serialize, ::serde::Deserialize, ::std::cmp::PartialEq, ::std::cmp::Eq, diff --git a/crates/bitwarden-vault/Cargo.toml b/crates/bitwarden-vault/Cargo.toml index 01d496d55..5c541b777 100644 --- a/crates/bitwarden-vault/Cargo.toml +++ b/crates/bitwarden-vault/Cargo.toml @@ -22,7 +22,7 @@ uniffi = [ ] # Uniffi bindings wasm = [ "bitwarden-core/wasm", - "dep:tsify-next", + "dep:tsify", "dep:wasm-bindgen" ] # WASM support @@ -43,7 +43,7 @@ serde_repr = { workspace = true } sha1 = ">=0.10.5, <0.11" sha2 = ">=0.10.6, <0.11" thiserror = { workspace = true } -tsify-next = { workspace = true, optional = true } +tsify = { workspace = true, optional = true } uniffi = { workspace = true, optional = true } uuid = { workspace = true } wasm-bindgen = { workspace = true, optional = true } diff --git a/crates/bitwarden-vault/src/cipher/attachment.rs b/crates/bitwarden-vault/src/cipher/attachment.rs index e37b6ad02..71bda741c 100644 --- a/crates/bitwarden-vault/src/cipher/attachment.rs +++ b/crates/bitwarden-vault/src/cipher/attachment.rs @@ -4,7 +4,7 @@ use bitwarden_crypto::{ }; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use super::Cipher; use crate::VaultParseError; diff --git a/crates/bitwarden-vault/src/cipher/card.rs b/crates/bitwarden-vault/src/cipher/card.rs index c51a287c7..5e4f1325c 100644 --- a/crates/bitwarden-vault/src/cipher/card.rs +++ b/crates/bitwarden-vault/src/cipher/card.rs @@ -3,7 +3,7 @@ use bitwarden_core::key_management::{KeyIds, SymmetricKeyId}; use bitwarden_crypto::{CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext}; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use super::cipher::CipherKind; use crate::{cipher::cipher::CopyableCipherFields, Cipher, VaultParseError}; diff --git a/crates/bitwarden-vault/src/cipher/cipher.rs b/crates/bitwarden-vault/src/cipher/cipher.rs index 0d4c515dd..f6e57448f 100644 --- a/crates/bitwarden-vault/src/cipher/cipher.rs +++ b/crates/bitwarden-vault/src/cipher/cipher.rs @@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; use thiserror::Error; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use uuid::Uuid; #[cfg(feature = "wasm")] use wasm_bindgen::prelude::wasm_bindgen; diff --git a/crates/bitwarden-vault/src/cipher/cipher_permissions.rs b/crates/bitwarden-vault/src/cipher/cipher_permissions.rs index 1274f3504..710987c6a 100644 --- a/crates/bitwarden-vault/src/cipher/cipher_permissions.rs +++ b/crates/bitwarden-vault/src/cipher/cipher_permissions.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; #[derive(Serialize, Copy, Deserialize, Debug, Clone, PartialEq)] #[serde(rename_all = "camelCase", deny_unknown_fields)] diff --git a/crates/bitwarden-vault/src/cipher/field.rs b/crates/bitwarden-vault/src/cipher/field.rs index fd77c1e16..a60d1e6e1 100644 --- a/crates/bitwarden-vault/src/cipher/field.rs +++ b/crates/bitwarden-vault/src/cipher/field.rs @@ -7,7 +7,7 @@ use bitwarden_crypto::{CryptoError, Decryptable, EncString, Encryptable, KeyStor use serde::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; #[cfg(feature = "wasm")] use wasm_bindgen::prelude::wasm_bindgen; diff --git a/crates/bitwarden-vault/src/cipher/identity.rs b/crates/bitwarden-vault/src/cipher/identity.rs index 2319e7557..76bf3bcfb 100644 --- a/crates/bitwarden-vault/src/cipher/identity.rs +++ b/crates/bitwarden-vault/src/cipher/identity.rs @@ -3,7 +3,7 @@ use bitwarden_core::key_management::{KeyIds, SymmetricKeyId}; use bitwarden_crypto::{CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext}; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use super::cipher::CipherKind; use crate::{cipher::cipher::CopyableCipherFields, Cipher, VaultParseError}; diff --git a/crates/bitwarden-vault/src/cipher/linked_id.rs b/crates/bitwarden-vault/src/cipher/linked_id.rs index 8e7732fd2..988b7c1a2 100644 --- a/crates/bitwarden-vault/src/cipher/linked_id.rs +++ b/crates/bitwarden-vault/src/cipher/linked_id.rs @@ -2,7 +2,7 @@ use bitwarden_core::MissingFieldError; use serde::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; #[cfg(feature = "wasm")] use wasm_bindgen::prelude::wasm_bindgen; diff --git a/crates/bitwarden-vault/src/cipher/local_data.rs b/crates/bitwarden-vault/src/cipher/local_data.rs index 63e822c37..0413251b8 100644 --- a/crates/bitwarden-vault/src/cipher/local_data.rs +++ b/crates/bitwarden-vault/src/cipher/local_data.rs @@ -3,7 +3,7 @@ use bitwarden_crypto::{CryptoError, Decryptable, Encryptable, KeyStoreContext}; use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; #[derive(Serialize, Deserialize, Debug, Clone)] #[serde(rename_all = "camelCase", deny_unknown_fields)] diff --git a/crates/bitwarden-vault/src/cipher/login.rs b/crates/bitwarden-vault/src/cipher/login.rs index fe04ea5c6..b34e489e6 100644 --- a/crates/bitwarden-vault/src/cipher/login.rs +++ b/crates/bitwarden-vault/src/cipher/login.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; #[cfg(feature = "wasm")] use wasm_bindgen::prelude::wasm_bindgen; diff --git a/crates/bitwarden-vault/src/cipher/secure_note.rs b/crates/bitwarden-vault/src/cipher/secure_note.rs index 0abbbe007..f533ee6f8 100644 --- a/crates/bitwarden-vault/src/cipher/secure_note.rs +++ b/crates/bitwarden-vault/src/cipher/secure_note.rs @@ -7,7 +7,7 @@ use bitwarden_crypto::{CryptoError, Decryptable, Encryptable, KeyStoreContext}; use serde::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; #[cfg(feature = "wasm")] use wasm_bindgen::prelude::wasm_bindgen; diff --git a/crates/bitwarden-vault/src/cipher/ssh_key.rs b/crates/bitwarden-vault/src/cipher/ssh_key.rs index 3e2cd659c..59982d06b 100644 --- a/crates/bitwarden-vault/src/cipher/ssh_key.rs +++ b/crates/bitwarden-vault/src/cipher/ssh_key.rs @@ -2,7 +2,7 @@ use bitwarden_core::key_management::{KeyIds, SymmetricKeyId}; use bitwarden_crypto::{CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext}; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use super::cipher::CipherKind; use crate::{cipher::cipher::CopyableCipherFields, Cipher}; diff --git a/crates/bitwarden-vault/src/collection.rs b/crates/bitwarden-vault/src/collection.rs index 91224c92d..d8f5b1a26 100644 --- a/crates/bitwarden-vault/src/collection.rs +++ b/crates/bitwarden-vault/src/collection.rs @@ -15,7 +15,7 @@ use crate::VaultParseError; #[cfg_attr(feature = "uniffi", derive(uniffi::Record))] #[cfg_attr( feature = "wasm", - derive(tsify_next::Tsify), + derive(tsify::Tsify), tsify(into_wasm_abi, from_wasm_abi) )] pub struct Collection { diff --git a/crates/bitwarden-vault/src/folder.rs b/crates/bitwarden-vault/src/folder.rs index 18083a5f5..3e23054b4 100644 --- a/crates/bitwarden-vault/src/folder.rs +++ b/crates/bitwarden-vault/src/folder.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use uuid::Uuid; #[cfg(feature = "wasm")] -use {tsify_next::Tsify, wasm_bindgen::prelude::*}; +use {tsify::Tsify, wasm_bindgen::prelude::*}; use crate::VaultParseError; diff --git a/crates/bitwarden-vault/src/password_history.rs b/crates/bitwarden-vault/src/password_history.rs index f0d63577a..12db1df38 100644 --- a/crates/bitwarden-vault/src/password_history.rs +++ b/crates/bitwarden-vault/src/password_history.rs @@ -6,7 +6,7 @@ use bitwarden_crypto::{ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use crate::VaultParseError; diff --git a/crates/bitwarden-vault/src/totp.rs b/crates/bitwarden-vault/src/totp.rs index b3194ead4..220785502 100644 --- a/crates/bitwarden-vault/src/totp.rs +++ b/crates/bitwarden-vault/src/totp.rs @@ -15,7 +15,7 @@ use reqwest::Url; use serde::{Deserialize, Serialize}; use thiserror::Error; #[cfg(feature = "wasm")] -use tsify_next::Tsify; +use tsify::Tsify; use crate::CipherListView;