diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index 814b6a86ce..3b71a05b94 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -162,7 +162,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -191,7 +191,6 @@ dependencies = [ "flowy-document", "flowy-error", "flowy-notification", - "flowy-search", "flowy-user", "lib-dispatch", "serde", @@ -206,9 +205,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" @@ -740,7 +739,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "again", "anyhow", @@ -775,6 +774,7 @@ dependencies = [ "tokio", "tokio-retry", "tokio-stream", + "tokio-util", "tracing", "url", "uuid", @@ -785,7 +785,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "futures-channel", "futures-util", @@ -1024,7 +1024,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -1049,7 +1049,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -1292,7 +1292,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.6", - "phf 0.11.2", + "phf 0.8.0", "smallvec", ] @@ -1403,7 +1403,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -1583,9 +1583,9 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dtoa" @@ -1721,9 +1721,9 @@ dependencies = [ [[package]] name = "fastdivide" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" +checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" [[package]] name = "fastrand" @@ -2134,8 +2134,8 @@ dependencies = [ "protobuf", "serde", "serde_json", - "strsim 0.11.0", - "strum_macros 0.26.1", + "strsim 0.11.1", + "strum_macros 0.26.2", "tantivy", "tempfile", "tokio", @@ -2769,7 +2769,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "futures-util", @@ -2786,7 +2786,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -3218,7 +3218,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "reqwest", @@ -3493,9 +3493,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -3608,9 +3608,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" [[package]] name = "mac" @@ -3838,9 +3838,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "murmurhash32" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9380db4c04d219ac5c51d14996bbf2c2e9a15229771b53f8671eb6c83cf44df" +checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "nanoid" @@ -5046,15 +5046,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_users" version = "0.4.3" @@ -5294,9 +5285,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "e3cc72858054fcff6d7dea32df2aeaee6a7c24227366d7ea429aada2f26b16ad" dependencies = [ "bitflags 2.4.0", "errno", @@ -5706,7 +5697,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -5924,9 +5915,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -5961,9 +5952,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -6495,13 +6486,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", "rustix", "windows-sys 0.52.0", ] diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index dcab388d01..f634fd0543 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -60,7 +60,6 @@ flowy-error = { path = "../../rust-lib/flowy-error", features = [ "impl_from_serde", "tauri_ts", ] } -flowy-search = { path = "../../rust-lib/flowy-search", features = ["tauri_ts"] } flowy-document = { path = "../../rust-lib/flowy-document", features = [ "tauri_ts", ] } @@ -88,7 +87,7 @@ yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3901356e8ac7c68d1e77128729bf7669b30278ec" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "842e3d14e541b94f2fa6329e8a4651e9bae7fc99" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock index 1bd03bad8c..45476b3170 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.lock +++ b/frontend/appflowy_web/wasm-libs/Cargo.lock @@ -215,7 +215,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -541,7 +541,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "again", "anyhow", @@ -576,6 +576,7 @@ dependencies = [ "tokio", "tokio-retry", "tokio-stream", + "tokio-util", "tracing", "url", "uuid", @@ -586,7 +587,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "futures-channel", "futures-util", @@ -630,7 +631,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f7bc378af0ee5ca4e25e4746acaa66fab6df79f#3f7bc378af0ee5ca4e25e4746acaa66fab6df79f" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5e32057ac8e6939368a8e75df91bcbce2ac143e7#5e32057ac8e6939368a8e75df91bcbce2ac143e7" dependencies = [ "anyhow", "async-trait", @@ -654,7 +655,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f7bc378af0ee5ca4e25e4746acaa66fab6df79f#3f7bc378af0ee5ca4e25e4746acaa66fab6df79f" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5e32057ac8e6939368a8e75df91bcbce2ac143e7#5e32057ac8e6939368a8e75df91bcbce2ac143e7" dependencies = [ "anyhow", "collab", @@ -673,7 +674,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f7bc378af0ee5ca4e25e4746acaa66fab6df79f#3f7bc378af0ee5ca4e25e4746acaa66fab6df79f" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5e32057ac8e6939368a8e75df91bcbce2ac143e7#5e32057ac8e6939368a8e75df91bcbce2ac143e7" dependencies = [ "anyhow", "bytes", @@ -688,7 +689,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f7bc378af0ee5ca4e25e4746acaa66fab6df79f#3f7bc378af0ee5ca4e25e4746acaa66fab6df79f" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5e32057ac8e6939368a8e75df91bcbce2ac143e7#5e32057ac8e6939368a8e75df91bcbce2ac143e7" dependencies = [ "anyhow", "chrono", @@ -726,7 +727,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f7bc378af0ee5ca4e25e4746acaa66fab6df79f#3f7bc378af0ee5ca4e25e4746acaa66fab6df79f" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5e32057ac8e6939368a8e75df91bcbce2ac143e7#5e32057ac8e6939368a8e75df91bcbce2ac143e7" dependencies = [ "anyhow", "async-stream", @@ -764,7 +765,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -789,7 +790,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -803,7 +804,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f7bc378af0ee5ca4e25e4746acaa66fab6df79f#3f7bc378af0ee5ca4e25e4746acaa66fab6df79f" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5e32057ac8e6939368a8e75df91bcbce2ac143e7#5e32057ac8e6939368a8e75df91bcbce2ac143e7" dependencies = [ "anyhow", "collab", @@ -1000,7 +1001,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -1773,7 +1774,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "futures-util", @@ -1790,7 +1791,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -2091,7 +2092,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "reqwest", @@ -3717,7 +3718,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -4979,4 +4980,4 @@ dependencies = [ [[patch.unused]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f7bc378af0ee5ca4e25e4746acaa66fab6df79f#3f7bc378af0ee5ca4e25e4746acaa66fab6df79f" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5e32057ac8e6939368a8e75df91bcbce2ac143e7#5e32057ac8e6939368a8e75df91bcbce2ac143e7" diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml index 86497f2df6..fadd237463 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.toml +++ b/frontend/appflowy_web/wasm-libs/Cargo.toml @@ -55,7 +55,7 @@ codegen-units = 1 # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3901356e8ac7c68d1e77128729bf7669b30278ec" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "842e3d14e541b94f2fa6329e8a4651e9bae7fc99" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lock index 6ee41e8a7b..0df5a216c0 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.lock +++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock @@ -153,7 +153,7 @@ checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -714,7 +714,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "again", "anyhow", @@ -749,6 +749,7 @@ dependencies = [ "tokio", "tokio-retry", "tokio-stream", + "tokio-util", "tracing", "url", "uuid", @@ -759,7 +760,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "futures-channel", "futures-util", @@ -1007,7 +1008,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -1032,7 +1033,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -1279,7 +1280,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.10", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1390,7 +1391,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -2843,7 +2844,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "futures-util", @@ -2860,7 +2861,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -3297,7 +3298,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "reqwest", @@ -4802,7 +4803,7 @@ checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck 0.4.1", - "itertools 0.11.0", + "itertools 0.10.5", "log", "multimap", "once_cell", @@ -4823,7 +4824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.55", @@ -5801,7 +5802,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml index b0575358d2..f634fd0543 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.toml +++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml @@ -87,7 +87,7 @@ yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3901356e8ac7c68d1e77128729bf7669b30278ec" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "842e3d14e541b94f2fa6329e8a4651e9bae7fc99" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 74decab098..53883e5bbb 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -163,7 +163,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" @@ -696,7 +696,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "again", "anyhow", @@ -731,6 +731,7 @@ dependencies = [ "tokio", "tokio-retry", "tokio-stream", + "tokio-util", "tracing", "url", "uuid", @@ -741,7 +742,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "futures-channel", "futures-util", @@ -949,7 +950,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -974,7 +975,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "bincode", @@ -1325,7 +1326,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -1431,12 +1432,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95203a6a50906215a502507c0f879a0ce7ff205a6111e2db2a5ef8e4bb92e43" -[[package]] -name = "deunicode" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" - [[package]] name = "diesel" version = "2.1.4" @@ -1501,9 +1496,9 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dtoa" @@ -1652,12 +1647,12 @@ dependencies = [ [[package]] name = "fake" -version = "2.9.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c25829bde82205da46e1823b2259db6273379f626fc211f126f65654a2669be" +checksum = "9af7b0c58ac9d03169e27f080616ce9f64004edca3d2ef4147a811c21b23b319" dependencies = [ - "deunicode 1.4.3", "rand 0.8.5", + "unidecode", ] [[package]] @@ -1700,15 +1695,15 @@ dependencies = [ [[package]] name = "fastdivide" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" +checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "finl_unicode" @@ -2107,8 +2102,8 @@ dependencies = [ "protobuf", "serde", "serde_json", - "strsim 0.11.0", - "strum_macros 0.26.1", + "strsim 0.11.1", + "strum_macros 0.26.2", "tantivy", "tempfile", "tokio", @@ -2594,7 +2589,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "futures-util", @@ -2611,7 +2606,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -2982,7 +2977,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "reqwest", @@ -3161,9 +3156,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -3264,9 +3259,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" [[package]] name = "mac" @@ -3470,9 +3465,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "murmurhash32" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9380db4c04d219ac5c51d14996bbf2c2e9a15229771b53f8671eb6c83cf44df" +checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "nanoid" @@ -4760,9 +4755,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "e3cc72858054fcff6d7dea32df2aeaee6a7c24227366d7ea429aada2f26b16ad" dependencies = [ "bitflags 2.4.0", "errno", @@ -5108,7 +5103,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3901356e8ac7c68d1e77128729bf7669b30278ec#3901356e8ac7c68d1e77128729bf7669b30278ec" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=842e3d14e541b94f2fa6329e8a4651e9bae7fc99#842e3d14e541b94f2fa6329e8a4651e9bae7fc99" dependencies = [ "anyhow", "app-error", @@ -5199,7 +5194,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" dependencies = [ - "deunicode 0.4.4", + "deunicode", ] [[package]] @@ -5294,9 +5289,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -5331,9 +5326,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -5570,9 +5565,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -6229,6 +6224,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unidecode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402bb19d8e03f1d1a7450e2bd613980869438e0666331be3e073089124aa1adc" + [[package]] name = "universal-hash" version = "0.5.1" diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index 47722c1864..603642ff70 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -1,35 +1,35 @@ [workspace] members = [ - "lib-dispatch", - "lib-log", - "flowy-core", - "dart-ffi", - "flowy-user", - "flowy-user-pub", - "event-integration", - "flowy-sqlite", - "flowy-folder", - "flowy-folder-pub", - "flowy-notification", - "flowy-document", - "flowy-document-pub", - "flowy-error", - "flowy-database2", - "flowy-database-pub", - "flowy-server", - "flowy-server-pub", - "flowy-config", - "flowy-encrypt", - "flowy-storage", - "collab-integrate", - "flowy-ai", - "flowy-date", - "flowy-search", - "lib-infra", - "build-tool/flowy-ast", - "build-tool/flowy-codegen", - "build-tool/flowy-derive", - "flowy-search-pub", + "lib-dispatch", + "lib-log", + "flowy-core", + "dart-ffi", + "flowy-user", + "flowy-user-pub", + "event-integration", + "flowy-sqlite", + "flowy-folder", + "flowy-folder-pub", + "flowy-notification", + "flowy-document", + "flowy-document-pub", + "flowy-error", + "flowy-database2", + "flowy-database-pub", + "flowy-server", + "flowy-server-pub", + "flowy-config", + "flowy-encrypt", + "flowy-storage", + "collab-integrate", + "flowy-ai", + "flowy-date", + "flowy-search", + "lib-infra", + "build-tool/flowy-ast", + "build-tool/flowy-codegen", + "build-tool/flowy-derive", + "flowy-search-pub", ] resolver = "2" @@ -115,7 +115,7 @@ rocksdb = { git = "https://github.com/LucasXu0/rust-rocksdb", rev = "21cf4a23ec1 # Run the script.add_workspace_members: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = " https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3901356e8ac7c68d1e77128729bf7669b30278ec" } +client-api = { git = " https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "842e3d14e541b94f2fa6329e8a4651e9bae7fc99" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.toml index 9fe161c6f3..faae54dac4 100644 --- a/frontend/rust-lib/dart-ffi/Cargo.toml +++ b/frontend/rust-lib/dart-ffi/Cargo.toml @@ -40,7 +40,7 @@ flowy-config = { workspace = true, features = ["dart"] } flowy-user = { workspace = true, features = ["dart"] } flowy-date = { workspace = true, features = ["dart"] } flowy-server = { workspace = true } -flowy-server-pub = { workspace = true} +flowy-server-pub = { workspace = true } collab-integrate = { workspace = true } flowy-derive.workspace = true serde_yaml = "0.9.27" diff --git a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs index c521c2fe9f..2d1bec045e 100644 --- a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs +++ b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs @@ -349,7 +349,7 @@ impl CollabCloudPluginProvider for ServerProvider { // If the user is local, we don't need to create a sync plugin. match server.collab_ws_channel(&collab_object.object_id) { - Ok(Some((channel, ws_connect_state, is_connected))) => { + Ok(Some((channel, ws_connect_state, _is_connected))) => { let origin = CollabOrigin::Client(CollabClient::new( collab_object.uid, collab_object.device_id.clone(), @@ -365,7 +365,6 @@ impl CollabCloudPluginProvider for ServerProvider { sink_config, stream, Some(channel), - !is_connected, ws_connect_state, ); plugins.push(Box::new(sync_plugin));