From 9204daa872d8dae6bdbc158672a9c62753060108 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 1 Apr 2024 11:56:19 +0800 Subject: [PATCH] chore: using patch yrs --- frontend/appflowy_tauri/src-tauri/Cargo.lock | 39 +++++++++---------- frontend/appflowy_tauri/src-tauri/Cargo.toml | 16 ++++---- frontend/appflowy_web/wasm-libs/Cargo.lock | 35 ++++++++--------- frontend/appflowy_web/wasm-libs/Cargo.toml | 16 ++++---- frontend/rust-lib/Cargo.lock | 40 ++++++++++---------- frontend/rust-lib/Cargo.toml | 18 +++++---- frontend/rust-lib/dart-ffi/Cargo.toml | 6 ++- frontend/rust-lib/flowy-core/Cargo.toml | 3 +- frontend/rust-lib/flowy-document/Cargo.toml | 2 +- frontend/rust-lib/flowy-server/Cargo.toml | 3 +- 10 files changed, 93 insertions(+), 85 deletions(-) diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index a004673c502eb..251eeb6248abf 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -156,7 +156,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", @@ -710,7 +710,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "again", "anyhow", @@ -758,7 +758,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "futures-channel", "futures-util", @@ -832,7 +832,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-trait", @@ -856,7 +856,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-trait", @@ -886,7 +886,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "collab", @@ -905,7 +905,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "bytes", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "chrono", @@ -958,7 +958,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-stream", @@ -997,7 +997,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", @@ -1022,20 +1022,21 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", "collab", "serde", "thiserror", + "tracing", "yrs", ] [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "collab", @@ -1258,7 +1259,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.6", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1369,7 +1370,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -2670,7 +2671,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "futures-util", @@ -2687,7 +2688,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -3138,7 +3139,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "reqwest", @@ -5571,7 +5572,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -7534,7 +7535,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index 4c20268d7a3b8..207d15070050c 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -85,7 +85,7 @@ custom-protocol = ["tauri/custom-protocol"] # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0821c052f996b56ec42b86c9462f065e4639d735" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "a0e951571497803295b4754726cf85f1ab33b078" } # Please use the following script to update collab. # Working directory: frontend # @@ -95,10 +95,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "082 # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock index 23ea54cd7f5b5..31c570e2a4a21 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=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", @@ -539,7 +539,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "again", "anyhow", @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "futures-channel", "futures-util", @@ -630,7 +630,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-trait", @@ -654,7 +654,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "collab", @@ -673,7 +673,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "bytes", @@ -688,7 +688,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "chrono", @@ -726,7 +726,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-stream", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", @@ -789,20 +789,21 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", "collab", "serde", "thiserror", + "tracing", "yrs", ] [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "collab", @@ -999,7 +1000,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -1754,7 +1755,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "futures-util", @@ -1771,7 +1772,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -2101,7 +2102,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "reqwest", @@ -3776,7 +3777,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -5008,4 +5009,4 @@ dependencies = [ [[patch.unused]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml index f3490d69e60ab..6d3689ef9cc89 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 = "0821c052f996b56ec42b86c9462f065e4639d735" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "a0e951571497803295b4754726cf85f1ab33b078" } # Please use the following script to update collab. # Working directory: frontend # @@ -65,10 +65,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "082 # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 6669ea24dc69e..7f3442b07979d 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -157,7 +157,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", @@ -667,7 +667,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "again", "anyhow", @@ -715,7 +715,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "futures-channel", "futures-util", @@ -758,7 +758,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-trait", @@ -782,7 +782,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-trait", @@ -812,7 +812,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "collab", @@ -831,7 +831,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "bytes", @@ -846,7 +846,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "chrono", @@ -884,7 +884,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "async-stream", @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", @@ -948,20 +948,21 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "bincode", "collab", "serde", "thiserror", + "tracing", "yrs", ] [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ab468ea96a15863d1e792ea4bed3a8769f3ea8a7#ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0679ebd1510fd539924cd240225adc0ef06ac241#0679ebd1510fd539924cd240225adc0ef06ac241" dependencies = [ "anyhow", "collab", @@ -1291,7 +1292,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -2465,7 +2466,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "futures-util", @@ -2482,7 +2483,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -2872,7 +2873,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "reqwest", @@ -4925,7 +4926,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "app-error", @@ -6338,7 +6339,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0821c052f996b56ec42b86c9462f065e4639d735#0821c052f996b56ec42b86c9462f065e4639d735" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=a0e951571497803295b4754726cf85f1ab33b078#a0e951571497803295b4754726cf85f1ab33b078" dependencies = [ "anyhow", "async-trait", @@ -6368,8 +6369,7 @@ dependencies = [ [[package]] name = "yrs" version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68aea14c6c33f2edd8a5ff9415360cfa5b98d90cce30c5ee3be59a8419fb15a9" +source = "git+https://github.com/appflowy/y-crdt?rev=3f25bb510ca5274e7657d3713fbed41fb46b4487#3f25bb510ca5274e7657d3713fbed41fb46b4487" dependencies = [ "atomic_refcell", "rand 0.7.3", diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index 13a1f8c6d4e4c..5af34204b20c6 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -74,6 +74,7 @@ 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" } [profile.dev] opt-level = 0 @@ -99,6 +100,7 @@ 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. @@ -109,7 +111,7 @@ rocksdb = { git = "https://github.com/LucasXu0/rust-rocksdb", rev = "21cf4a23ec1 # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0821c052f996b56ec42b86c9462f065e4639d735" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "a0e951571497803295b4754726cf85f1ab33b078" } # Please use the following script to update collab. # Working directory: frontend # @@ -119,10 +121,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "082 # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ab468ea96a15863d1e792ea4bed3a8769f3ea8a7" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0679ebd1510fd539924cd240225adc0ef06ac241" } diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.toml index 97142f8e00894..97e7034a6d1d6 100644 --- a/frontend/rust-lib/dart-ffi/Cargo.toml +++ b/frontend/rust-lib/dart-ffi/Cargo.toml @@ -27,8 +27,12 @@ tracing.workspace = true # workspace lib-dispatch = { workspace = true } + +# Core #flowy-core = { workspace = true, features = ["profiling"] } -flowy-core = { workspace = true } +flowy-core = { workspace = true, features = ["verbose_log"] } +#flowy-core = { workspace = true } + flowy-notification = { workspace = true, features = ["dart"] } flowy-document = { workspace = true, features = ["dart"] } flowy-config = { workspace = true, features = ["dart"] } diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml index 1798e1fefb324..2e40e817eb511 100644 --- a/frontend/rust-lib/flowy-core/Cargo.toml +++ b/frontend/rust-lib/flowy-core/Cargo.toml @@ -66,4 +66,5 @@ ts = [ "flowy-config/tauri_ts", ] rev-sqlite = ["flowy-user/rev-sqlite"] -openssl_vendored = ["flowy-sqlite/openssl_vendored"] \ No newline at end of file +openssl_vendored = ["flowy-sqlite/openssl_vendored"] +verbose_log = ["flowy-document/verbose_log", "client-api/sync_verbose_log"] \ 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 a6c31fa7b1a91..b787d6e52761e 100644 --- a/frontend/rust-lib/flowy-document/Cargo.toml +++ b/frontend/rust-lib/flowy-document/Cargo.toml @@ -55,4 +55,4 @@ tauri_ts = ["flowy-codegen/ts"] web_ts = [ "flowy-codegen/ts", ] - +verbose_log = ["collab-document/verbose_log"] diff --git a/frontend/rust-lib/flowy-server/Cargo.toml b/frontend/rust-lib/flowy-server/Cargo.toml index 17cdd84d805b3..dfd47a167f259 100644 --- a/frontend/rust-lib/flowy-server/Cargo.toml +++ b/frontend/rust-lib/flowy-server/Cargo.toml @@ -46,7 +46,7 @@ url = "2.4" tokio-util = "0.7" tokio-stream = { workspace = true, features = ["sync"] } lib-dispatch = { workspace = true } -yrs = "0.17.1" +yrs.workspace = true rand = "0.8.5" @@ -63,7 +63,6 @@ features = [ uuid.workspace = true tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } dotenv = "0.15.0" -yrs = "0.17.1" assert-json-diff = "2.0.2" serde_json.workspace = true client-api = { version = "0.1.0" }