Flatten changes to support matrix-sdk-ffi with wasm

Author: Daniel Salinas

Cargo.lock

@@ -3,6 +3,7 @@ members = [
     "benchmarks",
     "bindings/matrix-sdk-crypto-ffi",
     "bindings/matrix-sdk-ffi",
+    "bindings/matrix-sdk-ffi-web",
     "crates/*",
     "examples/*",
     "labs/*",

Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "matrix-sdk-ffi-web"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+matrix-sdk-ffi = { path = "../matrix-sdk-ffi/", features = ["js"] }
+uniffi = { workspace = true }
+
+[build-dependencies]
+uniffi = { workspace = true, features = ["build"] }
+
+[dev-dependencies]
+uniffi = { workspace = true, features = ["bindgen-tests"] }
+
+[lib]
+crate-type = ["lib", "staticlib", "cdylib"]

bindings/matrix-sdk-ffi-web/Cargo.toml

@@ -0,0 +1 @@
+pub use matrix_sdk_ffi;

bindings/matrix-sdk-ffi-web/src/lib.rs

@@ -14,18 +14,17 @@ publish = false
 release = true
 
 [lib]
-crate-type = ["cdylib", "staticlib"]
+crate-type = ["lib", "cdylib", "staticlib"]
 
 [features]
 default = ["bundled-sqlite", "unstable-msc4274"]
 bundled-sqlite = ["matrix-sdk/bundled-sqlite"]
 unstable-msc4274 = ["matrix-sdk-ui/unstable-msc4274"]
-wasm = []
+js = []
 
 [dependencies]
 anyhow.workspace = true
 as_variant.workspace = true
-async-compat.workspace = true
 extension-trait = "1.0.1"
 eyeball-im.workspace = true
 futures-util.workspace = true
@@ -38,15 +37,13 @@ matrix-sdk-ui = { workspace = true, features = ["uniffi"] }
 mime = "0.3.16"
 once_cell.workspace = true
 ruma = { workspace = true, features = ["html", "unstable-unspecified", "unstable-msc3488", "compat-unset-avatar", "unstable-msc3245-v1-compat", "unstable-msc4278"] }
-sentry-tracing = "0.36.0"
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 tracing-appender = { version = "0.2.2" }
 tracing-core.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-uniffi = { workspace = true, features = ["tokio"] }
 url.workspace = true
 uuid = { version = "1.4.1", features = ["v4"] }
 zeroize.workspace = true
@@ -68,10 +65,13 @@ features = [
 paranoid-android = "0.2.1"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
+console_error_panic_hook = "0.1.7"
 tokio = { workspace = true, features = ["sync", "macros"] }
-uniffi = { workspace = true, features = ["tokio", "wasm-unstable-single-threaded"] }
+uniffi = { workspace = true, features = ["wasm-unstable-single-threaded"] }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
+async-compat.workspace = true
+sentry-tracing = "0.36.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 uniffi = { workspace = true, features = ["tokio"] }
 
@@ -108,11 +108,11 @@ workspace = true
 features = [
     "anyhow",
     "e2e-encryption",
-    "experimental-widgets",
+    "experimental-widgets", 
     "markdown",
-    "native-tls", # note: differ from block below
+    "rustls-tls",
     "socks",
-    "indexeddb",  # note: differ from block below
+    "indexeddb",
     "uniffi",
 ]