diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index 7fb0797ccb..a08f7418ca 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -162,7 +162,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "bincode", @@ -206,9 +206,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 +740,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "again", "anyhow", @@ -786,7 +786,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "futures-channel", "futures-util", @@ -859,8 +859,8 @@ dependencies = [ [[package]] name = "collab" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-trait", @@ -883,8 +883,8 @@ dependencies = [ [[package]] name = "collab-database" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-trait", @@ -913,8 +913,8 @@ dependencies = [ [[package]] name = "collab-document" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "collab", @@ -932,8 +932,8 @@ dependencies = [ [[package]] name = "collab-entity" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "bytes", @@ -947,8 +947,8 @@ dependencies = [ [[package]] name = "collab-folder" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "chrono", @@ -985,8 +985,8 @@ dependencies = [ [[package]] name = "collab-plugins" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-stream", @@ -1025,7 +1025,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "bincode", @@ -1050,21 +1050,24 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", + "async-trait", "bincode", "collab", + "collab-entity", "serde", "thiserror", + "tokio", "tracing", "yrs", ] [[package]] name = "collab-user" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "collab", @@ -1404,7 +1407,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -1731,6 +1734,9 @@ name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +dependencies = [ + "getrandom 0.2.10", +] [[package]] name = "fdeflate" @@ -2606,10 +2612,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -2773,7 +2777,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "futures-util", @@ -2790,7 +2794,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -3222,7 +3226,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "reqwest", @@ -5710,7 +5714,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -5821,9 +5825,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -7964,11 +7968,13 @@ dependencies = [ [[package]] name = "yrs" -version = "0.17.2" -source = "git+https://github.com/appflowy/y-crdt?rev=3f25bb510ca5274e7657d3713fbed41fb46b4487#3f25bb510ca5274e7657d3713fbed41fb46b4487" +version = "0.18.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d58fbc807677598fedfab76f99f6e1aa5c644411255002b5438ea0ab14672398" dependencies = [ + "arc-swap", "atomic_refcell", - "rand 0.7.3", + "fastrand", "serde", "serde_json", "smallstr", diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index caeccf20b3..37ba9e2a5d 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -29,6 +29,23 @@ tokio = "1.34.0" tokio-stream = "0.1.14" async-trait = "0.1.74" chrono = { version = "0.4.31", default-features = false, features = ["clock"] } +yrs = "0.18.7" +# Please use the following script to update collab. +# Working directory: frontend +# +# To update the commit ID, run: +# scripts/tool/update_collab_rev.sh new_rev_id +# +# To switch to the local path, run: +# scripts/tool/update_collab_source.sh +# ⚠️⚠️⚠️️ +collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } [dependencies] serde_json.workspace = true @@ -80,27 +97,9 @@ default = ["custom-protocol"] custom-protocol = ["tauri/custom-protocol"] [patch.crates-io] -yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d3713fbed41fb46b4487" } - # Please using the following command to update the revision id # Current directory: frontend # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" } -# Please use the following script to update collab. -# Working directory: frontend -# -# To update the commit ID, run: -# scripts/tool/update_collab_rev.sh new_rev_id -# -# To switch to the local path, run: -# scripts/tool/update_collab_source.sh -# ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "c2fd29" } diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock index fd0e21c358..7af5617ef6 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.lock +++ b/frontend/appflowy_web/wasm-libs/Cargo.lock @@ -216,7 +216,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "bincode", @@ -233,6 +233,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + [[package]] name = "async-stream" version = "0.3.5" @@ -542,7 +548,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "again", "anyhow", @@ -588,7 +594,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "futures-channel", "futures-util", @@ -631,8 +637,8 @@ dependencies = [ [[package]] name = "collab" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-trait", @@ -655,8 +661,8 @@ dependencies = [ [[package]] name = "collab-document" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "collab", @@ -674,8 +680,8 @@ dependencies = [ [[package]] name = "collab-entity" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "bytes", @@ -689,8 +695,8 @@ dependencies = [ [[package]] name = "collab-folder" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "chrono", @@ -727,8 +733,8 @@ dependencies = [ [[package]] name = "collab-plugins" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-stream", @@ -766,7 +772,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "bincode", @@ -791,21 +797,24 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", + "async-trait", "bincode", "collab", + "collab-entity", "serde", "thiserror", + "tokio", "tracing", "yrs", ] [[package]] name = "collab-user" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "collab", @@ -957,7 +966,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1002,7 +1011,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -1203,6 +1212,9 @@ name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +dependencies = [ + "getrandom 0.2.12", +] [[package]] name = "fixedbitset" @@ -1697,10 +1709,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1778,7 +1788,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "futures-util", @@ -1795,7 +1805,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -2096,7 +2106,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "reqwest", @@ -2780,7 +2790,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_macros", + "phf_macros 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", ] @@ -2800,6 +2810,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ + "phf_macros 0.11.2", "phf_shared 0.11.2", ] @@ -2867,6 +2878,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -3722,7 +3746,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -4899,12 +4923,13 @@ dependencies = [ [[package]] name = "yrs" -version = "0.17.4" +version = "0.18.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4830316bfee4bec0044fe34a001cda783506d5c4c0852f8433c6041dfbfce51" +checksum = "d58fbc807677598fedfab76f99f6e1aa5c644411255002b5438ea0ab14672398" dependencies = [ + "arc-swap", "atomic_refcell", - "rand 0.7.3", + "fastrand", "serde", "serde_json", "smallstr", @@ -4980,8 +5005,3 @@ dependencies = [ "cc", "pkg-config", ] - -[[patch.unused]] -name = "collab-database" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml index c862da05f2..586d09fe43 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.toml +++ b/frontend/appflowy_web/wasm-libs/Cargo.toml @@ -5,7 +5,6 @@ resolver = "2" [workspace.dependencies] af-user = { path = "af-user" } af-persistence = { path = "af-persistence" } - lib-dispatch = { path = "../../rust-lib/lib-dispatch" } parking_lot = { version = "0.12.1" } tracing = { version = "0.1.22" } @@ -23,9 +22,6 @@ flowy-document = { path = "../../rust-lib/flowy-document" } flowy-folder = { path = "../../rust-lib/flowy-folder" } flowy-storage = { path = "../../rust-lib/flowy-storage" } lib-infra = { path = "../../rust-lib/lib-infra" } -collab = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } -collab-user = { version = "0.1.0" } bytes = { version = "1.5" } protobuf = { version = "2.28.0" } thiserror = "1.0" @@ -36,6 +32,24 @@ tokio-stream = "0.1" tokio = { version = "1.35", features = ["sync"] } wasm-bindgen-futures = "0.4.40" serde-wasm-bindgen = "0.4" +# Please use the following script to update collab. +# Working directory: frontend +# +# To update the commit ID, run: +# scripts/tool/update_collab_rev.sh new_rev_id +# +# To switch to the local path, run: +# scripts/tool/update_collab_source.sh +# ⚠️⚠️⚠️️ +collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +yrs = "0.18.7" + [profile.dev] @@ -55,20 +69,4 @@ 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 = "af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" } -# Please use the following script to update collab. -# Working directory: frontend -# -# To update the commit ID, run: -# scripts/tool/update_collab_rev.sh new_rev_id -# -# To switch to the local path, run: -# scripts/tool/update_collab_source.sh -# ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "c2fd29" } diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml index 4b79460edd..e98c1cdb69 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.toml +++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml @@ -29,6 +29,23 @@ tokio = "1.34.0" tokio-stream = "0.1.14" async-trait = "0.1.74" chrono = { version = "0.4.31", default-features = false, features = ["clock"] } +yrs = "0.18.7" +# Please use the following script to update collab. +# Working directory: frontend +# +# To update the commit ID, run: +# scripts/tool/update_collab_rev.sh new_rev_id +# +# To switch to the local path, run: +# scripts/tool/update_collab_source.sh +# ⚠️⚠️⚠️️ +collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } [dependencies] serde_json.workspace = true @@ -79,27 +96,9 @@ default = ["custom-protocol"] custom-protocol = ["tauri/custom-protocol"] [patch.crates-io] -yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d3713fbed41fb46b4487" } - # Please using the following command to update the revision id # Current directory: frontend # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" } -# Please use the following script to update collab. -# Working directory: frontend -# -# To update the commit ID, run: -# scripts/tool/update_collab_rev.sh new_rev_id -# -# To switch to the local path, run: -# scripts/tool/update_collab_source.sh -# ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "c2fd29" } diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 498014d8f3..362da32947 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -163,7 +163,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" 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" @@ -650,7 +650,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "again", "anyhow", @@ -696,7 +696,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "futures-channel", "futures-util", @@ -738,8 +738,8 @@ dependencies = [ [[package]] name = "collab" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-trait", @@ -762,8 +762,8 @@ dependencies = [ [[package]] name = "collab-database" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-trait", @@ -792,8 +792,8 @@ dependencies = [ [[package]] name = "collab-document" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "collab", @@ -811,8 +811,8 @@ dependencies = [ [[package]] name = "collab-entity" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "bytes", @@ -826,8 +826,8 @@ dependencies = [ [[package]] name = "collab-folder" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "chrono", @@ -864,8 +864,8 @@ dependencies = [ [[package]] name = "collab-plugins" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "async-stream", @@ -904,7 +904,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "bincode", @@ -929,21 +929,24 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", + "async-trait", "bincode", "collab", + "collab-entity", "serde", "thiserror", + "tokio", "tracing", "yrs", ] [[package]] name = "collab-user" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff#29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" +version = "0.2.0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b32271b0#b32271b036e25f8b0279d93e96659bdac656f00a" dependencies = [ "anyhow", "collab", @@ -1245,7 +1248,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -1589,6 +1592,9 @@ name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +dependencies = [ + "getrandom 0.2.10", +] [[package]] name = "finl_unicode" @@ -2376,10 +2382,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -2457,7 +2461,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "futures-util", @@ -2474,7 +2478,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -2839,7 +2843,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "reqwest", @@ -4018,7 +4022,7 @@ checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck 0.4.1", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -4039,7 +4043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.47", @@ -4936,7 +4940,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d#af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c2fd29#c2fd295295aba4851bde79b193a7f46a2b471472" dependencies = [ "anyhow", "app-error", @@ -5041,9 +5045,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -6552,11 +6556,13 @@ dependencies = [ [[package]] name = "yrs" -version = "0.17.2" -source = "git+https://github.com/appflowy/y-crdt?rev=3f25bb510ca5274e7657d3713fbed41fb46b4487#3f25bb510ca5274e7657d3713fbed41fb46b4487" +version = "0.18.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d58fbc807677598fedfab76f99f6e1aa5c644411255002b5438ea0ab14672398" dependencies = [ + "arc-swap", "atomic_refcell", - "rand 0.7.3", + "fastrand", "serde", "serde_json", "smallstr", diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index e58e59b0fd..284f33ebdb 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -76,7 +76,23 @@ tokio = "1.34.0" tokio-stream = "0.1.14" async-trait = "0.1.74" chrono = { version = "0.4.31", default-features = false, features = ["clock"] } -yrs = { version = "0.17.2" } +# Please use the following script to update collab. +# Working directory: frontend +# +# To update the commit ID, run: +# scripts/tool/update_collab_rev.sh new_rev_id +# +# To switch to the local path, run: +# scripts/tool/update_collab_source.sh +# ⚠️⚠️⚠️️ +collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b32271b0" } +yrs = "0.18.7" [profile.dev] opt-level = 1 @@ -103,8 +119,6 @@ lto = false incremental = false [patch.crates-io] -yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d3713fbed41fb46b4487" } - # TODO(Lucas.Xu) Upgrade to the latest version of RocksDB once PR(https://github.com/rust-rocksdb/rust-rocksdb/pull/869) is merged. # Currently, using the following revision id. This commit is patched to fix the 32-bit build issue and it's checked out from 0.21.0, not 0.22.0. rocksdb = { git = "https://github.com/LucasXu0/rust-rocksdb", rev = "21cf4a23ec131b9d82dc94e178fe8efc0c147b09" } @@ -114,20 +128,4 @@ 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 = "af75e8a2c00d9f8f2dd444bb50c30dd5ba490e3d" } -# Please use the following script to update collab. -# Working directory: frontend -# -# To update the commit ID, run: -# scripts/tool/update_collab_rev.sh new_rev_id -# -# To switch to the local path, run: -# scripts/tool/update_collab_source.sh -# ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "29475f0ec00dc06b42da68bc54efa5b7c1bcd0ff" } +client-api = { git = " https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "c2fd29" } \ No newline at end of file diff --git a/frontend/rust-lib/collab-integrate/Cargo.toml b/frontend/rust-lib/collab-integrate/Cargo.toml index 49b6bfda93..ffddb6a911 100644 --- a/frontend/rust-lib/collab-integrate/Cargo.toml +++ b/frontend/rust-lib/collab-integrate/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -collab = { version = "0.1.0" } -collab-plugins = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } +collab = { workspace = true } +collab-plugins = { workspace = true } +collab-entity = { workspace = true } serde.workspace = true serde_json.workspace = true anyhow.workspace = true diff --git a/frontend/rust-lib/event-integration-test/Cargo.toml b/frontend/rust-lib/event-integration-test/Cargo.toml index 93e7ff2600..26d561e993 100644 --- a/frontend/rust-lib/event-integration-test/Cargo.toml +++ b/frontend/rust-lib/event-integration-test/Cargo.toml @@ -36,12 +36,12 @@ nanoid = "0.4.0" tracing.workspace = true parking_lot.workspace = true uuid.workspace = true -collab = { version = "0.1.0" } -collab-document = { version = "0.1.0" } -collab-folder = { version = "0.1.0" } -collab-database = { version = "0.1.0" } -collab-plugins = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } +collab = { workspace = true } +collab-document = { workspace = true } +collab-folder = { workspace = true } +collab-database = { workspace = true } +collab-plugins = { workspace = true } +collab-entity = { workspace = true } rand = { version = "0.8.5", features = [] } strum = "0.25.0" diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml index 075356e22c..7c67351f6b 100644 --- a/frontend/rust-lib/flowy-core/Cargo.toml +++ b/frontend/rust-lib/flowy-core/Cargo.toml @@ -24,9 +24,9 @@ flowy-config = { workspace = true } flowy-date = { workspace = true } collab-integrate = { workspace = true } flowy-search = { workspace = true } -collab-entity = { version = "0.1.0" } -collab-plugins = { version = "0.1.0" } -collab = { version = "0.1.0" } +collab-entity = { workspace = true } +collab-plugins = { workspace = true } +collab = { workspace = true } diesel.workspace = true uuid.workspace = true flowy-storage = { workspace = true } diff --git a/frontend/rust-lib/flowy-database-pub/Cargo.toml b/frontend/rust-lib/flowy-database-pub/Cargo.toml index 2592795a13..eb6358cb8c 100644 --- a/frontend/rust-lib/flowy-database-pub/Cargo.toml +++ b/frontend/rust-lib/flowy-database-pub/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] lib-infra = { workspace = true } -collab-entity = { version = "0.1.0" } -collab = { version = "0.1.0" } +collab-entity = { workspace = true } +collab = { workspace = true } anyhow.workspace = true \ No newline at end of file diff --git a/frontend/rust-lib/flowy-database2/Cargo.toml b/frontend/rust-lib/flowy-database2/Cargo.toml index ff5c70e048..97a11f3064 100644 --- a/frontend/rust-lib/flowy-database2/Cargo.toml +++ b/frontend/rust-lib/flowy-database2/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -collab = { version = "0.1.0" } -collab-database = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } -collab-plugins = { version = "0.1.0" } +collab = { workspace = true } +collab-database = { workspace = true } +collab-entity = { workspace = true } +collab-plugins = { workspace = true } collab-integrate = { workspace = true } flowy-database-pub = { workspace = true } diff --git a/frontend/rust-lib/flowy-document-pub/Cargo.toml b/frontend/rust-lib/flowy-document-pub/Cargo.toml index 0573d4339f..93a282f5cc 100644 --- a/frontend/rust-lib/flowy-document-pub/Cargo.toml +++ b/frontend/rust-lib/flowy-document-pub/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] lib-infra = { workspace = true } -flowy-error = { workspace = true } -collab-document = { version = "0.1.0" } +flowy-error = { workspace = true } +collab-document = { workspace = true } anyhow.workspace = true -collab = { version = "0.1.0" } \ No newline at end of file +collab = { workspace = true } \ No newline at end of file diff --git a/frontend/rust-lib/flowy-document/Cargo.toml b/frontend/rust-lib/flowy-document/Cargo.toml index 0fb12cf180..813d87d589 100644 --- a/frontend/rust-lib/flowy-document/Cargo.toml +++ b/frontend/rust-lib/flowy-document/Cargo.toml @@ -8,15 +8,15 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -collab = { version = "0.1.0" } -collab-document = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } -collab-plugins = { version = "0.1.0" } +collab = { workspace = true } +collab-document = { workspace = true } +collab-entity = { workspace = true } +collab-plugins = { workspace = true } collab-integrate = { workspace = true } flowy-document-pub = { workspace = true } flowy-storage = { workspace = true } flowy-derive.workspace = true -flowy-notification = { workspace = true } +flowy-notification = { workspace = true } flowy-error = { path = "../flowy-error", features = ["impl_from_serde", "impl_from_dispatch_error", "impl_from_collab_document", "impl_from_collab_persistence"] } lib-dispatch = { workspace = true } lib-infra = { workspace = true } @@ -31,7 +31,7 @@ serde_json.workspace = true tracing.workspace = true tokio = { workspace = true, features = ["rt"] } anyhow.workspace = true -indexmap = {version = "2.1.0", features = ["serde"]} +indexmap = { version = "2.1.0", features = ["serde"] } uuid.workspace = true futures.workspace = true tokio-stream = { workspace = true, features = ["sync"] } @@ -39,7 +39,7 @@ dashmap = "5" scraper = "0.18.0" [target.'cfg(target_arch = "wasm32")'.dependencies] -getrandom = { version = "0.2", features = ["js"]} +getrandom = { version = "0.2", features = ["js"] } [dev-dependencies] tempfile = "3.4.0" diff --git a/frontend/rust-lib/flowy-error/Cargo.toml b/frontend/rust-lib/flowy-error/Cargo.toml index 5b17b59118..bf40eac0ec 100644 --- a/frontend/rust-lib/flowy-error/Cargo.toml +++ b/frontend/rust-lib/flowy-error/Cargo.toml @@ -27,10 +27,10 @@ reqwest = { version = "0.11.14", optional = true, features = [ flowy-sqlite = { workspace = true, optional = true } r2d2 = { version = "0.8", optional = true } url = { version = "2.2", optional = true } -collab-database = { version = "0.1.0", optional = true } -collab-document = { version = "0.1.0", optional = true } -collab-plugins = { version = "0.1.0", optional = true } -collab-folder = { version = "0.1.0", optional = true } +collab-database = { workspace = true, optional = true } +collab-document = { workspace = true, optional = true } +collab-plugins = { workspace = true, optional = true } +collab-folder = { workspace = true, optional = true } client-api = { version = "0.1.0", optional = true } tantivy = { version = "0.21.1", optional = true } diff --git a/frontend/rust-lib/flowy-folder-pub/Cargo.toml b/frontend/rust-lib/flowy-folder-pub/Cargo.toml index 6b6e960e7c..13f13935f7 100644 --- a/frontend/rust-lib/flowy-folder-pub/Cargo.toml +++ b/frontend/rust-lib/flowy-folder-pub/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] lib-infra = { workspace = true } -collab-folder = { version = "0.1.0" } -collab = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } +collab-folder = { workspace = true } +collab = { workspace = true } +collab-entity = { workspace = true } uuid.workspace = true anyhow.workspace = true diff --git a/frontend/rust-lib/flowy-folder/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.toml index 0bbc78bc6b..ba4a2e3481 100644 --- a/frontend/rust-lib/flowy-folder/Cargo.toml +++ b/frontend/rust-lib/flowy-folder/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -collab = { version = "0.1.0" } -collab-folder = { version = "0.1.0" } -collab-document = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } -collab-plugins = { version = "0.1.0" } +collab = { workspace = true } +collab-folder = { workspace = true } +collab-document = { workspace = true } +collab-entity = { workspace = true } +collab-plugins = { workspace = true } collab-integrate = { workspace = true } flowy-folder-pub = { workspace = true } flowy-search-pub = { workspace = true } diff --git a/frontend/rust-lib/flowy-search-pub/Cargo.toml b/frontend/rust-lib/flowy-search-pub/Cargo.toml index 19f784771e..1a534d16b3 100644 --- a/frontend/rust-lib/flowy-search-pub/Cargo.toml +++ b/frontend/rust-lib/flowy-search-pub/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -collab = { version = "0.1.0" } -collab-folder = { version = "0.1.0" } +collab = { workspace = true } +collab-folder = { workspace = true } flowy-error = { workspace = true } diff --git a/frontend/rust-lib/flowy-search/Cargo.toml b/frontend/rust-lib/flowy-search/Cargo.toml index d558df1c78..ac015fb324 100644 --- a/frontend/rust-lib/flowy-search/Cargo.toml +++ b/frontend/rust-lib/flowy-search/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -collab = { version = "0.1.0" } -collab-folder = { version = "0.1.0" } +collab = { workspace = true } +collab-folder = { workspace = true } flowy-derive.workspace = true flowy-error = { workspace = true, features = [ diff --git a/frontend/rust-lib/flowy-server/Cargo.toml b/frontend/rust-lib/flowy-server/Cargo.toml index ce6b7b9356..eb8cfde5b2 100644 --- a/frontend/rust-lib/flowy-server/Cargo.toml +++ b/frontend/rust-lib/flowy-server/Cargo.toml @@ -17,19 +17,19 @@ hyper = "0.14" serde.workspace = true serde_json.workspace = true thiserror = "1.0" -tokio = { workspace = true, features = ["sync"]} +tokio = { workspace = true, features = ["sync"] } parking_lot.workspace = true lazy_static = "1.4.0" bytes = { workspace = true, features = ["serde"] } tokio-retry = "0.3" anyhow.workspace = true uuid.workspace = true -chrono = { workspace = true, default-features = false, features = ["clock", "serde"] } -collab = { version = "0.1.0" } -collab-plugins = { version = "0.1.0"} -collab-document = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } -collab-folder = { version = "0.1.0" } +chrono = { workspace = true, default-features = false, features = ["clock", "serde"] } +collab = { workspace = true } +collab-plugins = { workspace = true } +collab-document = { workspace = true } +collab-entity = { workspace = true } +collab-folder = { workspace = true } hex = "0.4.3" postgrest = "1.0" lib-infra = { workspace = true } diff --git a/frontend/rust-lib/flowy-user-pub/Cargo.toml b/frontend/rust-lib/flowy-user-pub/Cargo.toml index 9d29234b34..f70e53c248 100644 --- a/frontend/rust-lib/flowy-user-pub/Cargo.toml +++ b/frontend/rust-lib/flowy-user-pub/Cargo.toml @@ -7,14 +7,14 @@ edition = "2021" [dependencies] lib-infra = { workspace = true } -flowy-error = { workspace = true } +flowy-error = { workspace = true } uuid.workspace = true serde.workspace = true -collab = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } +collab = { workspace = true } +collab-entity = { workspace = true } serde_json.workspace = true serde_repr.workspace = true -chrono = { workspace = true, default-features = false, features = ["clock", "serde"] } +chrono = { workspace = true, default-features = false, features = ["clock", "serde"] } anyhow.workspace = true tokio = { workspace = true, features = ["sync"] } tokio-stream = "0.1.14" diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.toml index 426275e470..f206e8d4a8 100644 --- a/frontend/rust-lib/flowy-user/Cargo.toml +++ b/frontend/rust-lib/flowy-user/Cargo.toml @@ -16,13 +16,13 @@ flowy-notification = { workspace = true } flowy-server-pub = { workspace = true } lib-dispatch = { workspace = true } collab-integrate = { workspace = true } -collab = { version = "0.1.0" } -collab-folder = { version = "0.1.0" } -collab-document = { version = "0.1.0" } -collab-database = { version = "0.1.0" } -collab-user = { version = "0.1.0" } -collab-entity = { version = "0.1.0" } -collab-plugins = { version = "0.1.0" } +collab = { workspace = true } +collab-folder = { workspace = true } +collab-document = { workspace = true } +collab-database = { workspace = true } +collab-user = { workspace = true } +collab-entity = { workspace = true } +collab-plugins = { workspace = true } flowy-user-pub = { workspace = true } anyhow.workspace = true tracing.workspace = true