diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index b400a83a22..2207d6a0af 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=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -740,7 +740,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" 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=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "futures-channel", "futures-util", @@ -860,7 +860,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-trait", @@ -884,7 +884,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-trait", @@ -914,7 +914,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -933,7 +933,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "bytes", @@ -948,7 +948,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "chrono", @@ -986,7 +986,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" 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=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -1064,7 +1064,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -1293,7 +1293,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.6", - "phf 0.11.2", + "phf 0.8.0", "smallvec", ] @@ -1404,7 +1404,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -2770,7 +2770,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "futures-util", @@ -2787,7 +2787,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -3219,7 +3219,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "reqwest", @@ -4722,7 +4722,7 @@ checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck 0.4.1", - "itertools 0.11.0", + "itertools 0.10.5", "log", "multimap", "once_cell", @@ -4743,7 +4743,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.47", @@ -5707,7 +5707,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index 8bcbe641bd..5577fe10ba 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/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 = "54dfeb552752eb0e4d887af3a0affaa80863943d" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" } # Please use the following script to update collab. # Working directory: frontend # @@ -97,10 +97,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "54d # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock index 56c6b50760..4650e864b1 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=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "again", "anyhow", @@ -588,7 +588,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "futures-channel", "futures-util", @@ -632,7 +632,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-trait", @@ -656,7 +656,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "bytes", @@ -690,7 +690,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "chrono", @@ -728,7 +728,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-stream", @@ -766,7 +766,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -791,7 +791,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -805,7 +805,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -1002,7 +1002,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -1775,7 +1775,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "futures-util", @@ -1792,7 +1792,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -2093,7 +2093,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "reqwest", @@ -3719,7 +3719,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -4981,4 +4981,4 @@ dependencies = [ [[patch.unused]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml index a5ba5391cc..803ada04a4 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 = "54dfeb552752eb0e4d887af3a0affaa80863943d" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" } # 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 = "54d # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lock index 8f08c7659c..ac8a37bd70 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=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" 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=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "again", "anyhow", @@ -760,7 +760,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "futures-channel", "futures-util", @@ -843,7 +843,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-trait", @@ -867,7 +867,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-trait", @@ -897,7 +897,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -916,7 +916,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "bytes", @@ -931,7 +931,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "chrono", @@ -969,7 +969,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-stream", @@ -1008,7 +1008,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -1033,7 +1033,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -1047,7 +1047,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -1391,7 +1391,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -2844,7 +2844,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "futures-util", @@ -2861,7 +2861,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "reqwest", @@ -5802,7 +5802,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" 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 320ab126d0..bf5ca9463b 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.toml +++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml @@ -86,7 +86,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 = "54dfeb552752eb0e4d887af3a0affaa80863943d" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" } # Please use the following script to update collab. # Working directory: frontend # @@ -96,10 +96,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "54d # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 52193e8f29..31073a6810 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=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -696,7 +696,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "again", "anyhow", @@ -742,7 +742,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "futures-channel", "futures-util", @@ -785,7 +785,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-trait", @@ -809,7 +809,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-trait", @@ -839,7 +839,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -858,7 +858,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "bytes", @@ -873,7 +873,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "chrono", @@ -911,7 +911,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "async-stream", @@ -950,7 +950,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -975,7 +975,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "bincode", @@ -989,7 +989,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86#9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7dadc5ac7da58b862e856797583f5e40cb709bd1#7dadc5ac7da58b862e856797583f5e40cb709bd1" dependencies = [ "anyhow", "collab", @@ -1326,7 +1326,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -1581,7 +1581,7 @@ dependencies = [ ] [[package]] -name = "event-integration" +name = "event-integration-test" version = "0.1.0" dependencies = [ "anyhow", @@ -1870,7 +1870,7 @@ dependencies = [ "collab-plugins", "csv", "dashmap", - "event-integration", + "event-integration-test", "fancy-regex 0.11.0", "flowy-codegen", "flowy-database-pub", @@ -2596,7 +2596,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "futures-util", @@ -2613,7 +2613,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", @@ -2984,7 +2984,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "reqwest", @@ -5110,7 +5110,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=54dfeb552752eb0e4d887af3a0affaa80863943d#54dfeb552752eb0e4d887af3a0affaa80863943d" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7#7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" dependencies = [ "anyhow", "app-error", diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index dd444e468d..df74f16214 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -6,7 +6,7 @@ members = [ "dart-ffi", "flowy-user", "flowy-user-pub", - "event-integration", + "event-integration-test", "flowy-sqlite", "flowy-folder", "flowy-folder-pub", @@ -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 = "54dfeb552752eb0e4d887af3a0affaa80863943d" } +client-api = { git = " https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "7b4b9d0c10cb2c8bbbff8fcb288ddc1b84371be7" } # Please use the following script to update collab. # Working directory: frontend # @@ -125,10 +125,10 @@ client-api = { git = " https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "54 # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9efc5d6e13aca7d8ed3763bf57646bf2ddf1ff86" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7dadc5ac7da58b862e856797583f5e40cb709bd1" } diff --git a/frontend/rust-lib/event-integration/Cargo.toml b/frontend/rust-lib/event-integration-test/Cargo.toml similarity index 97% rename from frontend/rust-lib/event-integration/Cargo.toml rename to frontend/rust-lib/event-integration-test/Cargo.toml index f0d0e58752..d3c8a15635 100644 --- a/frontend/rust-lib/event-integration/Cargo.toml +++ b/frontend/rust-lib/event-integration-test/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "event-integration" +name = "event-integration-test" version = "0.1.0" edition = "2018" diff --git a/frontend/rust-lib/event-integration/src/database_event.rs b/frontend/rust-lib/event-integration-test/src/database_event.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/database_event.rs rename to frontend/rust-lib/event-integration-test/src/database_event.rs diff --git a/frontend/rust-lib/event-integration/src/document/document_event.rs b/frontend/rust-lib/event-integration-test/src/document/document_event.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/document/document_event.rs rename to frontend/rust-lib/event-integration-test/src/document/document_event.rs diff --git a/frontend/rust-lib/event-integration/src/document/mod.rs b/frontend/rust-lib/event-integration-test/src/document/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/document/mod.rs rename to frontend/rust-lib/event-integration-test/src/document/mod.rs diff --git a/frontend/rust-lib/event-integration/src/document/utils.rs b/frontend/rust-lib/event-integration-test/src/document/utils.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/document/utils.rs rename to frontend/rust-lib/event-integration-test/src/document/utils.rs diff --git a/frontend/rust-lib/event-integration/src/document_event.rs b/frontend/rust-lib/event-integration-test/src/document_event.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/document_event.rs rename to frontend/rust-lib/event-integration-test/src/document_event.rs diff --git a/frontend/rust-lib/event-integration/src/event_builder.rs b/frontend/rust-lib/event-integration-test/src/event_builder.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/event_builder.rs rename to frontend/rust-lib/event-integration-test/src/event_builder.rs diff --git a/frontend/rust-lib/event-integration/src/folder_event.rs b/frontend/rust-lib/event-integration-test/src/folder_event.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/folder_event.rs rename to frontend/rust-lib/event-integration-test/src/folder_event.rs diff --git a/frontend/rust-lib/event-integration/src/lib.rs b/frontend/rust-lib/event-integration-test/src/lib.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/lib.rs rename to frontend/rust-lib/event-integration-test/src/lib.rs diff --git a/frontend/rust-lib/event-integration/src/user_event.rs b/frontend/rust-lib/event-integration-test/src/user_event.rs similarity index 100% rename from frontend/rust-lib/event-integration/src/user_event.rs rename to frontend/rust-lib/event-integration-test/src/user_event.rs diff --git a/frontend/rust-lib/event-integration/tests/asset/037_local.zip b/frontend/rust-lib/event-integration-test/tests/asset/037_local.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/037_local.zip rename to frontend/rust-lib/event-integration-test/tests/asset/037_local.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/038_document_with_grid.zip b/frontend/rust-lib/event-integration-test/tests/asset/038_document_with_grid.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/038_document_with_grid.zip rename to frontend/rust-lib/event-integration-test/tests/asset/038_document_with_grid.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/038_local.zip b/frontend/rust-lib/event-integration-test/tests/asset/038_local.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/038_local.zip rename to frontend/rust-lib/event-integration-test/tests/asset/038_local.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/039_local.zip b/frontend/rust-lib/event-integration-test/tests/asset/039_local.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/039_local.zip rename to frontend/rust-lib/event-integration-test/tests/asset/039_local.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/040_collab_backups.zip b/frontend/rust-lib/event-integration-test/tests/asset/040_collab_backups.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/040_collab_backups.zip rename to frontend/rust-lib/event-integration-test/tests/asset/040_collab_backups.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/040_local.zip b/frontend/rust-lib/event-integration-test/tests/asset/040_local.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/040_local.zip rename to frontend/rust-lib/event-integration-test/tests/asset/040_local.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/040_local_2.zip b/frontend/rust-lib/event-integration-test/tests/asset/040_local_2.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/040_local_2.zip rename to frontend/rust-lib/event-integration-test/tests/asset/040_local_2.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/040_sync_local_document.zip b/frontend/rust-lib/event-integration-test/tests/asset/040_sync_local_document.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/040_sync_local_document.zip rename to frontend/rust-lib/event-integration-test/tests/asset/040_sync_local_document.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/csv_10240r_15c.csv.zip b/frontend/rust-lib/event-integration-test/tests/asset/csv_10240r_15c.csv.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/csv_10240r_15c.csv.zip rename to frontend/rust-lib/event-integration-test/tests/asset/csv_10240r_15c.csv.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/csv_492r_17c.csv.zip b/frontend/rust-lib/event-integration-test/tests/asset/csv_492r_17c.csv.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/csv_492r_17c.csv.zip rename to frontend/rust-lib/event-integration-test/tests/asset/csv_492r_17c.csv.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/database_template_1.afdb b/frontend/rust-lib/event-integration-test/tests/asset/database_template_1.afdb similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/database_template_1.afdb rename to frontend/rust-lib/event-integration-test/tests/asset/database_template_1.afdb diff --git a/frontend/rust-lib/event-integration/tests/asset/folder_1000_view.zip b/frontend/rust-lib/event-integration-test/tests/asset/folder_1000_view.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/folder_1000_view.zip rename to frontend/rust-lib/event-integration-test/tests/asset/folder_1000_view.zip diff --git a/frontend/rust-lib/event-integration/tests/asset/logo.png b/frontend/rust-lib/event-integration-test/tests/asset/logo.png similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/logo.png rename to frontend/rust-lib/event-integration-test/tests/asset/logo.png diff --git a/frontend/rust-lib/event-integration/tests/asset/test.txt.zip b/frontend/rust-lib/event-integration-test/tests/asset/test.txt.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/asset/test.txt.zip rename to frontend/rust-lib/event-integration-test/tests/asset/test.txt.zip diff --git a/frontend/rust-lib/event-integration/tests/database/local_test/group_test.rs b/frontend/rust-lib/event-integration-test/tests/database/local_test/group_test.rs similarity index 99% rename from frontend/rust-lib/event-integration/tests/database/local_test/group_test.rs rename to frontend/rust-lib/event-integration-test/tests/database/local_test/group_test.rs index e59645d4cb..8c97b3e7ce 100644 --- a/frontend/rust-lib/event-integration/tests/database/local_test/group_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/database/local_test/group_test.rs @@ -1,4 +1,4 @@ -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; // The number of groups should be 0 if there is no group by field in grid #[tokio::test] diff --git a/frontend/rust-lib/event-integration/tests/database/local_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/database/local_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/database/local_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/database/local_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/database/local_test/test.rs b/frontend/rust-lib/event-integration-test/tests/database/local_test/test.rs similarity index 99% rename from frontend/rust-lib/event-integration/tests/database/local_test/test.rs rename to frontend/rust-lib/event-integration-test/tests/database/local_test/test.rs index 7f113d1535..f0c78d15b3 100644 --- a/frontend/rust-lib/event-integration/tests/database/local_test/test.rs +++ b/frontend/rust-lib/event-integration-test/tests/database/local_test/test.rs @@ -2,8 +2,8 @@ use std::convert::TryFrom; use bytes::Bytes; -use event_integration::event_builder::EventBuilder; -use event_integration::EventIntegrationTest; +use event_integration_test::event_builder::EventBuilder; +use event_integration_test::EventIntegrationTest; use flowy_database2::entities::{ CellChangesetPB, CellIdPB, CheckboxCellDataPB, ChecklistCellDataChangesetPB, DatabaseLayoutPB, DatabaseSettingChangesetPB, DatabaseViewIdPB, DateCellChangesetPB, FieldType, diff --git a/frontend/rust-lib/event-integration/tests/database/mod.rs b/frontend/rust-lib/event-integration-test/tests/database/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/database/mod.rs rename to frontend/rust-lib/event-integration-test/tests/database/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/database/supabase_test/helper.rs b/frontend/rust-lib/event-integration-test/tests/database/supabase_test/helper.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/database/supabase_test/helper.rs rename to frontend/rust-lib/event-integration-test/tests/database/supabase_test/helper.rs index ee9809de55..8c668afeac 100644 --- a/frontend/rust-lib/event-integration/tests/database/supabase_test/helper.rs +++ b/frontend/rust-lib/event-integration-test/tests/database/supabase_test/helper.rs @@ -7,7 +7,7 @@ use collab::preclude::updates::decoder::Decode; use collab::preclude::{Collab, JsonValue, Update}; use collab_entity::CollabType; -use event_integration::event_builder::EventBuilder; +use event_integration_test::event_builder::EventBuilder; use flowy_database2::entities::{DatabasePB, DatabaseViewIdPB, RepeatedDatabaseSnapshotPB}; use flowy_database2::event_map::DatabaseEvent::*; use flowy_folder::entities::ViewPB; diff --git a/frontend/rust-lib/event-integration/tests/database/supabase_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/database/supabase_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/database/supabase_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/database/supabase_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/database/supabase_test/test.rs b/frontend/rust-lib/event-integration-test/tests/database/supabase_test/test.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/database/supabase_test/test.rs rename to frontend/rust-lib/event-integration-test/tests/database/supabase_test/test.rs diff --git a/frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs b/frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/edit_test.rs similarity index 97% rename from frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs rename to frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/edit_test.rs index 9569fe163a..50a8fd3fd8 100644 --- a/frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/edit_test.rs @@ -2,9 +2,9 @@ use collab_document::blocks::DocumentData; use serde_json::json; use std::time::Duration; -use event_integration::document_event::assert_document_data_equal; -use event_integration::user_event::user_localhost_af_cloud; -use event_integration::EventIntegrationTest; +use event_integration_test::document_event::assert_document_data_equal; +use event_integration_test::user_event::user_localhost_af_cloud; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_document::entities::{DocumentSyncState, DocumentSyncStatePB}; diff --git a/frontend/rust-lib/event-integration/tests/document/af_cloud_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/document/af_cloud_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/document/local_test/edit_test.rs b/frontend/rust-lib/event-integration-test/tests/document/local_test/edit_test.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/document/local_test/edit_test.rs rename to frontend/rust-lib/event-integration-test/tests/document/local_test/edit_test.rs index a6aeac9da7..cfcefeb506 100644 --- a/frontend/rust-lib/event-integration/tests/document/local_test/edit_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/document/local_test/edit_test.rs @@ -1,7 +1,7 @@ use crate::document::generate_random_string; use collab_document::blocks::json_str_to_hashmap; -use event_integration::document::document_event::DocumentEventTest; -use event_integration::document::utils::*; +use event_integration_test::document::document_event::DocumentEventTest; +use event_integration_test::document::utils::*; use flowy_document::entities::*; use flowy_document::parser::parser_entities::{ ConvertDataToJsonPayloadPB, ConvertDocumentPayloadPB, InputType, NestedBlock, ParseTypePB, diff --git a/frontend/rust-lib/event-integration/tests/document/local_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/document/local_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/document/local_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/document/local_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/document/local_test/snapshot_test.rs b/frontend/rust-lib/event-integration-test/tests/document/local_test/snapshot_test.rs similarity index 90% rename from frontend/rust-lib/event-integration/tests/document/local_test/snapshot_test.rs rename to frontend/rust-lib/event-integration-test/tests/document/local_test/snapshot_test.rs index 7d2b3265b1..f37f0919bd 100644 --- a/frontend/rust-lib/event-integration/tests/document/local_test/snapshot_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/document/local_test/snapshot_test.rs @@ -1,5 +1,5 @@ -use event_integration::document::document_event::DocumentEventTest; -use event_integration::document_data_from_document_doc_state; +use event_integration_test::document::document_event::DocumentEventTest; +use event_integration_test::document_data_from_document_doc_state; use std::time::Duration; use tokio::task::yield_now; diff --git a/frontend/rust-lib/event-integration/tests/document/mod.rs b/frontend/rust-lib/event-integration-test/tests/document/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/document/mod.rs rename to frontend/rust-lib/event-integration-test/tests/document/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs b/frontend/rust-lib/event-integration-test/tests/document/supabase_test/edit_test.rs similarity index 96% rename from frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs rename to frontend/rust-lib/event-integration-test/tests/document/supabase_test/edit_test.rs index ba761d347d..d05e1ef95c 100644 --- a/frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/document/supabase_test/edit_test.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use event_integration::document_event::assert_document_data_equal; +use event_integration_test::document_event::assert_document_data_equal; use flowy_document::entities::{DocumentSyncState, DocumentSyncStatePB}; use crate::document::supabase_test::helper::FlowySupabaseDocumentTest; diff --git a/frontend/rust-lib/event-integration/tests/document/supabase_test/file_test.rs b/frontend/rust-lib/event-integration-test/tests/document/supabase_test/file_test.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/document/supabase_test/file_test.rs rename to frontend/rust-lib/event-integration-test/tests/document/supabase_test/file_test.rs diff --git a/frontend/rust-lib/event-integration/tests/document/supabase_test/helper.rs b/frontend/rust-lib/event-integration-test/tests/document/supabase_test/helper.rs similarity index 95% rename from frontend/rust-lib/event-integration/tests/document/supabase_test/helper.rs rename to frontend/rust-lib/event-integration-test/tests/document/supabase_test/helper.rs index a7025180bb..07ff2d96fe 100644 --- a/frontend/rust-lib/event-integration/tests/document/supabase_test/helper.rs +++ b/frontend/rust-lib/event-integration-test/tests/document/supabase_test/helper.rs @@ -1,6 +1,6 @@ use std::ops::Deref; -use event_integration::event_builder::EventBuilder; +use event_integration_test::event_builder::EventBuilder; use flowy_document::entities::{OpenDocumentPayloadPB, RepeatedDocumentSnapshotMetaPB}; use flowy_document::event_map::DocumentEvent::GetDocumentSnapshotMeta; use flowy_folder::entities::ViewPB; diff --git a/frontend/rust-lib/event-integration/tests/document/supabase_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/document/supabase_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/document/supabase_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/document/supabase_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/folder/local_test/folder_test.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/folder_test.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/folder/local_test/folder_test.rs rename to frontend/rust-lib/event-integration-test/tests/folder/local_test/folder_test.rs diff --git a/frontend/rust-lib/event-integration/tests/folder/local_test/import_test.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/import_test.rs similarity index 97% rename from frontend/rust-lib/event-integration/tests/folder/local_test/import_test.rs rename to frontend/rust-lib/event-integration-test/tests/folder/local_test/import_test.rs index e91465195d..a93a232921 100644 --- a/frontend/rust-lib/event-integration/tests/folder/local_test/import_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/folder/local_test/import_test.rs @@ -1,5 +1,5 @@ use crate::util::unzip; -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_folder::entities::{ImportPB, ImportTypePB, ViewLayoutPB}; diff --git a/frontend/rust-lib/event-integration/tests/folder/local_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/folder/local_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/folder/local_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/folder/local_test/script.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/script.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/folder/local_test/script.rs rename to frontend/rust-lib/event-integration-test/tests/folder/local_test/script.rs index 3023db1e9c..eb311cfea7 100644 --- a/frontend/rust-lib/event-integration/tests/folder/local_test/script.rs +++ b/frontend/rust-lib/event-integration-test/tests/folder/local_test/script.rs @@ -1,7 +1,7 @@ use collab_folder::ViewLayout; -use event_integration::event_builder::EventBuilder; -use event_integration::EventIntegrationTest; +use event_integration_test::event_builder::EventBuilder; +use event_integration_test::EventIntegrationTest; use flowy_folder::entities::icon::{UpdateViewIconPayloadPB, ViewIconPB}; use flowy_folder::entities::*; use flowy_folder::event_map::FolderEvent::*; diff --git a/frontend/rust-lib/event-integration/tests/folder/local_test/subscription_test.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/subscription_test.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/folder/local_test/subscription_test.rs rename to frontend/rust-lib/event-integration-test/tests/folder/local_test/subscription_test.rs index 93b8ca3d56..88636febcd 100644 --- a/frontend/rust-lib/event-integration/tests/folder/local_test/subscription_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/folder/local_test/subscription_test.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; use flowy_folder::entities::{ChildViewUpdatePB, RepeatedViewPB, UpdateViewPayloadPB}; use flowy_folder::notification::FolderNotification; diff --git a/frontend/rust-lib/event-integration/tests/folder/local_test/test.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/test.rs similarity index 99% rename from frontend/rust-lib/event-integration/tests/folder/local_test/test.rs rename to frontend/rust-lib/event-integration-test/tests/folder/local_test/test.rs index 277c8eea2e..09af815d65 100644 --- a/frontend/rust-lib/event-integration/tests/folder/local_test/test.rs +++ b/frontend/rust-lib/event-integration-test/tests/folder/local_test/test.rs @@ -1,5 +1,5 @@ -use event_integration::event_builder::EventBuilder; -use event_integration::EventIntegrationTest; +use event_integration_test::event_builder::EventBuilder; +use event_integration_test::EventIntegrationTest; use flowy_folder::entities::icon::{UpdateViewIconPayloadPB, ViewIconPB, ViewIconTypePB}; use flowy_folder::entities::*; use flowy_user::errors::ErrorCode; diff --git a/frontend/rust-lib/event-integration/tests/folder/mod.rs b/frontend/rust-lib/event-integration-test/tests/folder/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/folder/mod.rs rename to frontend/rust-lib/event-integration-test/tests/folder/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/folder/supabase_test/helper.rs b/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/helper.rs similarity index 97% rename from frontend/rust-lib/event-integration/tests/folder/supabase_test/helper.rs rename to frontend/rust-lib/event-integration-test/tests/folder/supabase_test/helper.rs index aa1cf36d29..ed701fd1a7 100644 --- a/frontend/rust-lib/event-integration/tests/folder/supabase_test/helper.rs +++ b/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/helper.rs @@ -8,7 +8,7 @@ use collab::preclude::{Collab, JsonValue, Update}; use collab_entity::CollabType; use collab_folder::FolderData; -use event_integration::event_builder::EventBuilder; +use event_integration_test::event_builder::EventBuilder; use flowy_folder::entities::{FolderSnapshotPB, RepeatedFolderSnapshotPB, WorkspaceIdPB}; use flowy_folder::event_map::FolderEvent::GetFolderSnapshots; diff --git a/frontend/rust-lib/event-integration/tests/folder/supabase_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/folder/supabase_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/folder/supabase_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/folder/supabase_test/test.rs b/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/test.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/folder/supabase_test/test.rs rename to frontend/rust-lib/event-integration-test/tests/folder/supabase_test/test.rs diff --git a/frontend/rust-lib/event-integration/tests/main.rs b/frontend/rust-lib/event-integration-test/tests/main.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/main.rs rename to frontend/rust-lib/event-integration-test/tests/main.rs diff --git a/frontend/rust-lib/event-integration/tests/search/local_test/folder_search_test.rs b/frontend/rust-lib/event-integration-test/tests/search/local_test/folder_search_test.rs similarity index 99% rename from frontend/rust-lib/event-integration/tests/search/local_test/folder_search_test.rs rename to frontend/rust-lib/event-integration-test/tests/search/local_test/folder_search_test.rs index 4ad6c4dd0e..995854699a 100644 --- a/frontend/rust-lib/event-integration/tests/search/local_test/folder_search_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/search/local_test/folder_search_test.rs @@ -1,6 +1,6 @@ use crate::util::{unzip_test_asset, zip}; use collab_folder::View; -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_folder::entities::UpdateViewPayloadPB; use flowy_folder_pub::folder_builder::{FlattedViews, NestedViewBuilder}; diff --git a/frontend/rust-lib/event-integration/tests/search/local_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/search/local_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/search/local_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/search/local_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/search/mod.rs b/frontend/rust-lib/event-integration-test/tests/search/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/search/mod.rs rename to frontend/rust-lib/event-integration-test/tests/search/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/anon_user_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/anon_user_test.rs similarity index 97% rename from frontend/rust-lib/event-integration/tests/user/af_cloud_test/anon_user_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/anon_user_test.rs index eb696538b7..dbcfb7097f 100644 --- a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/anon_user_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/anon_user_test.rs @@ -1,5 +1,5 @@ -use event_integration::user_event::user_localhost_af_cloud; -use event_integration::EventIntegrationTest; +use event_integration_test::user_event::user_localhost_af_cloud; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_user::entities::AuthenticatorPB; diff --git a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/auth_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/auth_test.rs similarity index 91% rename from frontend/rust-lib/event-integration/tests/user/af_cloud_test/auth_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/auth_test.rs index 48590532f1..3f9a5b3f01 100644 --- a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/auth_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/auth_test.rs @@ -1,5 +1,5 @@ -use event_integration::user_event::user_localhost_af_cloud; -use event_integration::EventIntegrationTest; +use event_integration_test::user_event::user_localhost_af_cloud; +use event_integration_test::EventIntegrationTest; use flowy_user::entities::UpdateUserProfilePayloadPB; use crate::util::generate_test_email; diff --git a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/import_af_data_folder_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/import_af_data_folder_test.rs similarity index 99% rename from frontend/rust-lib/event-integration/tests/user/af_cloud_test/import_af_data_folder_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/import_af_data_folder_test.rs index 598eb34dc0..455d4db140 100644 --- a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/import_af_data_folder_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/import_af_data_folder_test.rs @@ -1,8 +1,8 @@ use crate::util::unzip; use assert_json_diff::assert_json_include; use collab_database::rows::database_row_document_id_from_row_id; -use event_integration::user_event::user_localhost_af_cloud; -use event_integration::EventIntegrationTest; +use event_integration_test::user_event::user_localhost_af_cloud; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_user::errors::ErrorCode; use serde_json::{json, Value}; diff --git a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/member_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/member_test.rs similarity index 96% rename from frontend/rust-lib/event-integration/tests/user/af_cloud_test/member_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/member_test.rs index 8e4e9c9559..c5fc2479bb 100644 --- a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/member_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/member_test.rs @@ -1,6 +1,6 @@ use crate::user::af_cloud_test::util::get_synced_workspaces; -use event_integration::user_event::user_localhost_af_cloud; -use event_integration::EventIntegrationTest; +use event_integration_test::user_event::user_localhost_af_cloud; +use event_integration_test::EventIntegrationTest; #[tokio::test] async fn af_cloud_invite_workspace_member() { diff --git a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/af_cloud_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/util.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/util.rs similarity index 92% rename from frontend/rust-lib/event-integration/tests/user/af_cloud_test/util.rs rename to frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/util.rs index 989a3d2039..9830656bb3 100644 --- a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/util.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/util.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; use flowy_user::{ entities::{RepeatedUserWorkspacePB, UserWorkspacePB}, protobuf::UserNotification, diff --git a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/workspace_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/workspace_test.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/user/af_cloud_test/workspace_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/workspace_test.rs index c33c812a0c..af743e7ced 100644 --- a/frontend/rust-lib/event-integration/tests/user/af_cloud_test/workspace_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/workspace_test.rs @@ -2,8 +2,8 @@ use collab::core::collab::DataSource::DocStateV1; use collab::core::origin::CollabOrigin; use collab_entity::CollabType; use collab_folder::Folder; -use event_integration::user_event::user_localhost_af_cloud; -use event_integration::EventIntegrationTest; +use event_integration_test::user_event::user_localhost_af_cloud; +use event_integration_test::EventIntegrationTest; use std::time::Duration; use tokio::time::sleep; diff --git a/frontend/rust-lib/event-integration/tests/user/local_test/auth_test.rs b/frontend/rust-lib/event-integration-test/tests/user/local_test/auth_test.rs similarity index 94% rename from frontend/rust-lib/event-integration/tests/user/local_test/auth_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/local_test/auth_test.rs index 010a88d484..3cd3733837 100644 --- a/frontend/rust-lib/event-integration/tests/user/local_test/auth_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/local_test/auth_test.rs @@ -1,5 +1,5 @@ -use event_integration::user_event::{login_password, unique_email}; -use event_integration::{event_builder::EventBuilder, EventIntegrationTest}; +use event_integration_test::user_event::{login_password, unique_email}; +use event_integration_test::{event_builder::EventBuilder, EventIntegrationTest}; use flowy_user::entities::{AuthenticatorPB, SignInPayloadPB, SignUpPayloadPB}; use flowy_user::errors::ErrorCode; use flowy_user::event_map::UserEvent::*; diff --git a/frontend/rust-lib/event-integration/tests/user/local_test/helper.rs b/frontend/rust-lib/event-integration-test/tests/user/local_test/helper.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/local_test/helper.rs rename to frontend/rust-lib/event-integration-test/tests/user/local_test/helper.rs diff --git a/frontend/rust-lib/event-integration/tests/user/local_test/import_af_data_local_test.rs b/frontend/rust-lib/event-integration-test/tests/user/local_test/import_af_data_local_test.rs similarity index 92% rename from frontend/rust-lib/event-integration/tests/user/local_test/import_af_data_local_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/local_test/import_af_data_local_test.rs index 82cded674f..c8c4d2def1 100644 --- a/frontend/rust-lib/event-integration/tests/user/local_test/import_af_data_local_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/local_test/import_af_data_local_test.rs @@ -1,6 +1,6 @@ use crate::util::unzip; -use event_integration::user_event::user_localhost_af_cloud; -use event_integration::EventIntegrationTest; +use event_integration_test::user_event::user_localhost_af_cloud; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use std::time::Duration; diff --git a/frontend/rust-lib/event-integration/tests/user/local_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/user/local_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/local_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/user/local_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/user/local_test/user_awareness_test.rs b/frontend/rust-lib/event-integration-test/tests/user/local_test/user_awareness_test.rs similarity index 89% rename from frontend/rust-lib/event-integration/tests/user/local_test/user_awareness_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/local_test/user_awareness_test.rs index 82bf53f144..f801b20a16 100644 --- a/frontend/rust-lib/event-integration/tests/user/local_test/user_awareness_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/local_test/user_awareness_test.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; -use event_integration::event_builder::EventBuilder; -use event_integration::EventIntegrationTest; +use event_integration_test::event_builder::EventBuilder; +use event_integration_test::EventIntegrationTest; use flowy_user::entities::{ReminderPB, RepeatedReminderPB}; use flowy_user::event_map::UserEvent::*; diff --git a/frontend/rust-lib/event-integration/tests/user/local_test/user_profile_test.rs b/frontend/rust-lib/event-integration-test/tests/user/local_test/user_profile_test.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/user/local_test/user_profile_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/local_test/user_profile_test.rs index 74a9658373..798054dccf 100644 --- a/frontend/rust-lib/event-integration/tests/user/local_test/user_profile_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/local_test/user_profile_test.rs @@ -1,5 +1,5 @@ use crate::user::local_test::helper::*; -use event_integration::{event_builder::EventBuilder, EventIntegrationTest}; +use event_integration_test::{event_builder::EventBuilder, EventIntegrationTest}; use flowy_user::entities::{AuthenticatorPB, UpdateUserProfilePayloadPB, UserProfilePB}; use flowy_user::{errors::ErrorCode, event_map::UserEvent::*}; use nanoid::nanoid; diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/collab_db_restore.rs b/frontend/rust-lib/event-integration-test/tests/user/migration_test/collab_db_restore.rs similarity index 90% rename from frontend/rust-lib/event-integration/tests/user/migration_test/collab_db_restore.rs rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/collab_db_restore.rs index 7a395a3601..45f33c3cd9 100644 --- a/frontend/rust-lib/event-integration/tests/user/migration_test/collab_db_restore.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/migration_test/collab_db_restore.rs @@ -1,4 +1,4 @@ -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use crate::util::unzip; diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/document_test.rs b/frontend/rust-lib/event-integration-test/tests/user/migration_test/document_test.rs similarity index 93% rename from frontend/rust-lib/event-integration/tests/user/migration_test/document_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/document_test.rs index 62cc556ee2..6b16407dec 100644 --- a/frontend/rust-lib/event-integration/tests/user/migration_test/document_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/migration_test/document_test.rs @@ -1,4 +1,4 @@ -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_folder::entities::ViewLayoutPB; diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/020_historical_user_data.zip b/frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/020_historical_user_data.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/020_historical_user_data.zip rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/020_historical_user_data.zip diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/036_fav_v1_workspace_array.zip b/frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/036_fav_v1_workspace_array.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/036_fav_v1_workspace_array.zip rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/036_fav_v1_workspace_array.zip diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/038_collab_db_corrupt_restore.zip b/frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/038_collab_db_corrupt_restore.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/038_collab_db_corrupt_restore.zip rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/038_collab_db_corrupt_restore.zip diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/README.md b/frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/README.md similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/README.md rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/README.md diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/historical_empty_document.zip b/frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/historical_empty_document.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/migration_test/history_user_db/historical_empty_document.zip rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/history_user_db/historical_empty_document.zip diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/user/migration_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/migration_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/user/migration_test/version_test.rs b/frontend/rust-lib/event-integration-test/tests/user/migration_test/version_test.rs similarity index 99% rename from frontend/rust-lib/event-integration/tests/user/migration_test/version_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/migration_test/version_test.rs index c58dbf8e74..3e925ba0ec 100644 --- a/frontend/rust-lib/event-integration/tests/user/migration_test/version_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/migration_test/version_test.rs @@ -1,4 +1,4 @@ -use event_integration::EventIntegrationTest; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_folder::entities::ViewLayoutPB; use std::time::Duration; diff --git a/frontend/rust-lib/event-integration/tests/user/mod.rs b/frontend/rust-lib/event-integration-test/tests/user/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/mod.rs rename to frontend/rust-lib/event-integration-test/tests/user/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/user/supabase_test/auth_test.rs b/frontend/rust-lib/event-integration-test/tests/user/supabase_test/auth_test.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/user/supabase_test/auth_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/supabase_test/auth_test.rs index 8f5f271d88..1b6d5f9cc6 100644 --- a/frontend/rust-lib/event-integration/tests/user/supabase_test/auth_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/supabase_test/auth_test.rs @@ -8,9 +8,9 @@ use collab_folder::FolderData; use nanoid::nanoid; use serde_json::json; -use event_integration::document::document_event::DocumentEventTest; -use event_integration::event_builder::EventBuilder; -use event_integration::EventIntegrationTest; +use event_integration_test::document::document_event::DocumentEventTest; +use event_integration_test::event_builder::EventBuilder; +use event_integration_test::EventIntegrationTest; use flowy_core::DEFAULT_NAME; use flowy_encrypt::decrypt_text; use flowy_server::supabase::define::{USER_DEVICE_ID, USER_EMAIL, USER_UUID}; diff --git a/frontend/rust-lib/event-integration/tests/user/supabase_test/history_user_db/README.md b/frontend/rust-lib/event-integration-test/tests/user/supabase_test/history_user_db/README.md similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/supabase_test/history_user_db/README.md rename to frontend/rust-lib/event-integration-test/tests/user/supabase_test/history_user_db/README.md diff --git a/frontend/rust-lib/event-integration/tests/user/supabase_test/history_user_db/workspace_sync.zip b/frontend/rust-lib/event-integration-test/tests/user/supabase_test/history_user_db/workspace_sync.zip similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/supabase_test/history_user_db/workspace_sync.zip rename to frontend/rust-lib/event-integration-test/tests/user/supabase_test/history_user_db/workspace_sync.zip diff --git a/frontend/rust-lib/event-integration/tests/user/supabase_test/mod.rs b/frontend/rust-lib/event-integration-test/tests/user/supabase_test/mod.rs similarity index 100% rename from frontend/rust-lib/event-integration/tests/user/supabase_test/mod.rs rename to frontend/rust-lib/event-integration-test/tests/user/supabase_test/mod.rs diff --git a/frontend/rust-lib/event-integration/tests/user/supabase_test/workspace_test.rs b/frontend/rust-lib/event-integration-test/tests/user/supabase_test/workspace_test.rs similarity index 93% rename from frontend/rust-lib/event-integration/tests/user/supabase_test/workspace_test.rs rename to frontend/rust-lib/event-integration-test/tests/user/supabase_test/workspace_test.rs index 15f5f9dec1..2ccbc9438f 100644 --- a/frontend/rust-lib/event-integration/tests/user/supabase_test/workspace_test.rs +++ b/frontend/rust-lib/event-integration-test/tests/user/supabase_test/workspace_test.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use event_integration::{event_builder::EventBuilder, EventIntegrationTest}; +use event_integration_test::{event_builder::EventBuilder, EventIntegrationTest}; use flowy_folder::entities::WorkspaceSettingPB; use flowy_folder::event_map::FolderEvent::GetCurrentWorkspaceSetting; use flowy_server::supabase::define::{USER_EMAIL, USER_UUID}; diff --git a/frontend/rust-lib/event-integration/tests/util.rs b/frontend/rust-lib/event-integration-test/tests/util.rs similarity index 98% rename from frontend/rust-lib/event-integration/tests/util.rs rename to frontend/rust-lib/event-integration-test/tests/util.rs index 5983043ff6..0a63ccaac7 100644 --- a/frontend/rust-lib/event-integration/tests/util.rs +++ b/frontend/rust-lib/event-integration-test/tests/util.rs @@ -18,9 +18,9 @@ use walkdir::WalkDir; use zip::write::FileOptions; use zip::{CompressionMethod, ZipArchive, ZipWriter}; -use event_integration::event_builder::EventBuilder; -use event_integration::Cleaner; -use event_integration::EventIntegrationTest; +use event_integration_test::event_builder::EventBuilder; +use event_integration_test::Cleaner; +use event_integration_test::EventIntegrationTest; use flowy_database_pub::cloud::DatabaseCloudService; use flowy_folder_pub::cloud::{FolderCloudService, FolderSnapshot}; use flowy_server::supabase::api::*; diff --git a/frontend/rust-lib/flowy-database2/Cargo.toml b/frontend/rust-lib/flowy-database2/Cargo.toml index 79563a7929..ff5c70e048 100644 --- a/frontend/rust-lib/flowy-database2/Cargo.toml +++ b/frontend/rust-lib/flowy-database2/Cargo.toml @@ -50,7 +50,7 @@ strum_macros = "0.25" validator = { version = "0.16.0", features = ["derive"] } [dev-dependencies] -event-integration = { path = "../event-integration", default-features = false } +event-integration-test = { path = "../event-integration-test", default-features = false } [build-dependencies] flowy-codegen.workspace = true diff --git a/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs b/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs index 6d96c7b46d..8148be9945 100644 --- a/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs +++ b/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs @@ -7,8 +7,8 @@ use collab_database::rows::{Row, RowDetail, RowId}; use lib_infra::box_any::BoxAny; use strum::EnumCount; -use event_integration::folder_event::ViewTest; -use event_integration::EventIntegrationTest; +use event_integration_test::folder_event::ViewTest; +use event_integration_test::EventIntegrationTest; use flowy_database2::entities::{FieldType, FilterPB, RowMetaPB}; use flowy_database2::services::cell::CellBuilder; use flowy_database2::services::database::DatabaseEditor; diff --git a/frontend/scripts/makefile/tests.toml b/frontend/scripts/makefile/tests.toml index 8ac3ab8dae..857a7ad0de 100644 --- a/frontend/scripts/makefile/tests.toml +++ b/frontend/scripts/makefile/tests.toml @@ -67,7 +67,7 @@ run_task = { name = ["rust_lib_unit_test"] } env = { RUST_LOG = "info" } description = "Run cloud unit tests" script = ''' -cd rust-lib/event-integration +cd rust-lib/event-integration-test RUST_BACKTRACE=1 cargo test supabase_ --features "cloud_test" '''