Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat: using workspace crate deps (#3924)
Nathan.fooo50e612511d7a
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex 02448abe3a..c008877ee4 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -138,7 +138,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","reqwest",@@ -234,9 +234,9 @@ dependencies = [[[package]]name = "async-trait"-version = "0.1.73"+version = "0.1.74"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"dependencies = ["proc-macro2","quote",@@ -768,7 +768,7 @@ dependencies = [[[package]]name = "client-api"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -1303,7 +1303,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.6",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1449,7 +1449,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -2326,7 +2326,6 @@ dependencies = ["lazy_static","lib-dispatch","lib-infra",- "log","once_cell","parking_lot","protobuf",@@ -2407,9 +2406,9 @@ dependencies = [[[package]]name = "futures"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"dependencies = ["futures-channel","futures-core",@@ -2422,9 +2421,9 @@ dependencies = [[[package]]name = "futures-channel"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"dependencies = ["futures-core","futures-sink",@@ -2432,15 +2431,15 @@ dependencies = [[[package]]name = "futures-core"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"[[package]]name = "futures-executor"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"dependencies = ["futures-core","futures-task",@@ -2460,15 +2459,15 @@ dependencies = [[[package]]name = "futures-io"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"[[package]]name = "futures-macro"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"dependencies = ["proc-macro2","quote",@@ -2477,15 +2476,15 @@ dependencies = [[[package]]name = "futures-sink"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"[[package]]name = "futures-task"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"[[package]]name = "futures-timer"@@ -2495,9 +2494,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"[[package]]name = "futures-util"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"dependencies = ["futures-channel","futures-core",@@ -2807,7 +2806,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","futures-util",@@ -2823,7 +2822,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -3259,7 +3258,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","reqwest",@@ -3468,8 +3467,8 @@ dependencies = ["futures-channel","futures-core","futures-util",- "log","nanoid",+ "parking_lot","pin-project","protobuf","serde",@@ -3502,7 +3501,6 @@ version = "0.1.0"dependencies = ["chrono","lazy_static",- "log","serde","serde_json","tracing",@@ -3525,9 +3523,9 @@ dependencies = [[[package]]name = "libc"-version = "0.2.147"+version = "0.2.150"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"[[package]]name = "libloading"@@ -3815,9 +3813,9 @@ dependencies = [[[package]]name = "mio"-version = "0.8.8"+version = "0.8.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"dependencies = ["libc","wasi 0.11.0+wasi-snapshot-preview1",@@ -4341,6 +4339,7 @@ version = "0.11.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"dependencies = [+ "phf_macros 0.11.2","phf_shared 0.11.2",]@@ -4432,6 +4431,19 @@ dependencies = ["syn 1.0.109",]+[[package]]+name = "phf_macros"+version = "0.11.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"+dependencies = [+ "phf_generator 0.11.2",+ "phf_shared 0.11.2",+ "proc-macro2",+ "quote",+ "syn 2.0.29",+]+[[package]]name = "phf_shared"version = "0.8.0"@@ -4482,9 +4494,9 @@ dependencies = [[[package]]name = "pin-project-lite"-version = "0.2.9"+version = "0.2.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"[[package]]name = "pin-utils"@@ -4673,7 +4685,7 @@ checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac"dependencies = ["bytes","heck 0.4.1",- "itertools 0.10.5",+ "itertools 0.11.0","log","multimap","once_cell",@@ -4694,7 +4706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"dependencies = ["anyhow",- "itertools 0.10.5",+ "itertools 0.11.0","proc-macro2","quote","syn 2.0.29",@@ -4989,7 +5001,7 @@ dependencies = [[[package]]name = "realtime-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","bincode",@@ -5733,7 +5745,7 @@ dependencies = [[[package]]name = "shared_entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -5864,9 +5876,9 @@ dependencies = [[[package]]name = "socket2"-version = "0.5.3"+version = "0.5.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"dependencies = ["libc","windows-sys 0.48.0",@@ -6560,11 +6572,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"[[package]]name = "tokio"-version = "1.28.2"+version = "1.34.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"dependencies = [- "autocfg",+ "backtrace","bytes","libc","mio",@@ -6572,16 +6584,16 @@ dependencies = ["parking_lot","pin-project-lite","signal-hook-registry",- "socket2 0.4.9",+ "socket2 0.5.5","tokio-macros","windows-sys 0.48.0",][[package]]name = "tokio-macros"-version = "2.1.0"+version = "2.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"dependencies = ["proc-macro2","quote",@@ -6617,7 +6629,7 @@ dependencies = ["pin-project-lite","postgres-protocol","postgres-types",- "socket2 0.5.3",+ "socket2 0.5.5","tokio","tokio-util",]@@ -6734,11 +6746,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"[[package]]name = "tracing"-version = "0.1.37"+version = "0.1.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"dependencies = [- "cfg-if","log","pin-project-lite","tracing-attributes",@@ -6758,9 +6769,9 @@ dependencies = [[[package]]name = "tracing-attributes"-version = "0.1.26"+version = "0.1.27"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"dependencies = ["proc-macro2","quote",@@ -6787,9 +6798,9 @@ dependencies = [[[package]]name = "tracing-core"-version = "0.1.31"+version = "0.1.32"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"dependencies = ["once_cell","valuable",@@ -7027,9 +7038,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"[[package]]name = "uuid"-version = "1.4.1"+version = "1.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"dependencies = ["getrandom 0.2.10","serde",diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex 98f446e15e..397511c258 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -13,13 +13,30 @@ rust-version = "1.57"[build-dependencies]tauri-build = { version = "1.2", features = [] }+[workspace.dependencies]+anyhow = "1.0.75"+tracing = "0.1.40"+bytes = "1.5.0"+serde = "1.0.108"+serde_json = "1.0.108"+protobuf = { version = "2.28.0" }+diesel = { version = "1.4.8", features = ["sqlite", "chrono"] }+uuid = { version = "1.5.0", features = ["serde", "v4"] }+serde_repr = "0.1"+parking_lot = "0.12"+futures = "0.3.29"+tokio = "1.34.0"+tokio-stream = "0.1.14"+async-trait = "0.1.74"+chrono = { version = "0.4.31", default-features = false, features = ["clock"] }+[dependencies]-serde_json = "1.0"-serde = { version = "1.0", features = ["derive"] }+serde_json.workspace = true+serde.workspace = truetauri = { version = "1.2", features = ["fs-all", "shell-open"] }tauri-utils = "1.2"-bytes = { version = "1.5" }-tracing = { version = "0.1", features = ["log"] }+bytes.workspace = true+tracing.workspace = truelib-dispatch = { path = "../../rust-lib/lib-dispatch", features = ["use_serde"] }flowy-core = { path = "../../rust-lib/flowy-core", features = ["rev-sqlite", "ts"] }flowy-notification = { path = "../../rust-lib/flowy-notification", features = ["ts"] }@@ -38,7 +55,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 = "0873b582d61d787e20c6a7193fdcbad2ea90de0e" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "2e14dcf129cab5e1c980655971cfb5ff321b0844" }# Please use the following script to update collab.# Working directory: frontend#diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex a8311ed3a2..b3ae836095 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -124,7 +124,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","reqwest",@@ -214,9 +214,9 @@ dependencies = [[[package]]name = "async-trait"-version = "0.1.73"+version = "0.1.74"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"dependencies = ["proc-macro2","quote",@@ -467,7 +467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"dependencies = ["borsh-derive",- "hashbrown 0.12.3",+ "hashbrown 0.13.2",][[package]]@@ -666,7 +666,7 @@ dependencies = [[[package]]name = "client-api"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -1246,7 +1246,6 @@ dependencies = ["flowy-server-config","lazy_static","lib-dispatch",- "log","parking_lot","protobuf","serde",@@ -1277,7 +1276,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -2160,7 +2159,6 @@ dependencies = ["lazy_static","lib-dispatch","lib-infra",- "log","nanoid","once_cell","parking_lot",@@ -2252,9 +2250,9 @@ dependencies = [[[package]]name = "futures"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"dependencies = ["futures-channel","futures-core",@@ -2283,9 +2281,9 @@ checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"[[package]]name = "futures-executor"-version = "0.3.28"+version = "0.3.29"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"dependencies = ["futures-core","futures-task",@@ -2467,7 +2465,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","futures-util",@@ -2483,7 +2481,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -2844,7 +2842,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","reqwest",@@ -2969,8 +2967,8 @@ dependencies = ["futures-channel","futures-core","futures-util",- "log","nanoid",+ "parking_lot","pin-project","protobuf","serde",@@ -3003,7 +3001,6 @@ version = "0.1.0"dependencies = ["chrono","lazy_static",- "log","serde","serde_json","tracing",@@ -3026,9 +3023,9 @@ dependencies = [[[package]]name = "libc"-version = "0.2.147"+version = "0.2.150"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"[[package]]name = "libloading"@@ -3265,9 +3262,9 @@ dependencies = [[[package]]name = "mio"-version = "0.8.8"+version = "0.8.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"dependencies = ["libc","wasi 0.11.0+wasi-snapshot-preview1",@@ -4322,7 +4319,7 @@ dependencies = [[[package]]name = "realtime-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","bincode",@@ -4965,7 +4962,7 @@ dependencies = [[[package]]name = "shared_entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0873b582d61d787e20c6a7193fdcbad2ea90de0e#0873b582d61d787e20c6a7193fdcbad2ea90de0e"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=2e14dcf129cab5e1c980655971cfb5ff321b0844#2e14dcf129cab5e1c980655971cfb5ff321b0844"dependencies = ["anyhow","app-error",@@ -5090,9 +5087,9 @@ dependencies = [[[package]]name = "socket2"-version = "0.5.3"+version = "0.5.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"dependencies = ["libc","windows-sys",@@ -5475,9 +5472,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"[[package]]name = "tokio"-version = "1.32.0"+version = "1.34.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"dependencies = ["backtrace","bytes",@@ -5487,7 +5484,7 @@ dependencies = ["parking_lot","pin-project-lite","signal-hook-registry",- "socket2 0.5.3",+ "socket2 0.5.5","tokio-macros","tracing","windows-sys",@@ -5505,9 +5502,9 @@ dependencies = [[[package]]name = "tokio-macros"-version = "2.1.0"+version = "2.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"dependencies = ["proc-macro2","quote",@@ -5544,7 +5541,7 @@ dependencies = ["postgres-protocol","postgres-types","rand 0.8.5",- "socket2 0.5.3",+ "socket2 0.5.5","tokio","tokio-util","whoami",@@ -5681,11 +5678,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"[[package]]name = "tracing"-version = "0.1.37"+version = "0.1.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"dependencies = [- "cfg-if","log","pin-project-lite","tracing-attributes",@@ -5705,9 +5701,9 @@ dependencies = [[[package]]name = "tracing-attributes"-version = "0.1.26"+version = "0.1.27"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"dependencies = ["proc-macro2","quote",@@ -5734,9 +5730,9 @@ dependencies = [[[package]]name = "tracing-core"-version = "0.1.31"+version = "0.1.32"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"dependencies = ["once_cell","valuable",@@ -5961,9 +5957,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"[[package]]name = "uuid"-version = "1.4.1"+version = "1.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"dependencies = ["getrandom 0.2.10","serde",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex 01876a160a..d20c8bac23 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -53,6 +53,21 @@ flowy-storage = { workspace = true, path = "flowy-storage" }collab-integrate = { workspace = true, path = "collab-integrate" }flowy-ai = { workspace = true, path = "flowy-ai" }flowy-date = { workspace = true, path = "flowy-date" }+anyhow = "1.0.75"+tracing = "0.1.40"+bytes = "1.5.0"+serde_json = "1.0.108"+serde = "1.0.108"+protobuf = { version = "2.28.0" }+diesel = { version = "1.4.8", features = ["sqlite", "chrono"] }+uuid = { version = "1.5.0", features = ["serde", "v4"] }+serde_repr = "0.1"+parking_lot = "0.12"+futures = "0.3.29"+tokio = "1.34.0"+tokio-stream = "0.1.14"+async-trait = "0.1.74"+chrono = { version = "0.4.31", default-features = false, features = ["clock"] }[profile.dev]opt-level = 0@@ -83,7 +98,7 @@ incremental = false# Run the script:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0873b582d61d787e20c6a7193fdcbad2ea90de0e" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "2e14dcf129cab5e1c980655971cfb5ff321b0844" }# Please use the following script to update collab.# Working directory: frontend#diff --git a/frontend/rust-lib/collab-integrate/Cargo.toml b/frontend/rust-lib/collab-integrate/Cargo.tomlindex d801024469..b0ba081ef3 100644--- a/frontend/rust-lib/collab-integrate/Cargo.toml+++ b/frontend/rust-lib/collab-integrate/Cargo.toml@@ -13,14 +13,14 @@ collab-database = { version = "0.1.0" }collab-plugins = { version = "0.1.0" }collab-document = { version = "0.1.0" }collab-entity = { version = "0.1.0" }-serde = { version = "1.0", features = ["derive"] }-serde_json = "1.0"-anyhow = "1.0"-tracing = "0.1"-parking_lot = "0.12.1"-futures = "0.3"-async-trait = "0.1.73"-tokio = {version = "1.26", features = ["sync"]}+serde.workspace = true+serde_json.workspace = true+anyhow.workspace = true+tracing.workspace = true+parking_lot.workspace = true+futures.workspace = true+async-trait.workspace = true+tokio = { workspace = true, features = ["sync"]}lib-infra = { path = "../../../shared-lib/lib-infra" }[features]diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.tomlindex 8bd45c8483..a719c3e54b 100644--- a/frontend/rust-lib/dart-ffi/Cargo.toml+++ b/frontend/rust-lib/dart-ffi/Cargo.toml@@ -14,16 +14,15 @@ crate-type = ["staticlib"][dependencies]allo-isolate = { version = "^0.1", features = ["catch-unwind"] }byteorder = { version = "1.4.3" }-protobuf = { version = "2.28.0" }-tokio = { version = "1.26", features = ["full", "rt-multi-thread", "tracing"] }-log = "0.4.17"-serde = { version = "1.0", features = ["derive"] }-serde_json = { version = "1.0" }-bytes = { version = "1.5" }+protobuf.workspace = true+tokio = { workspace = true, features = ["full", "rt-multi-thread", "tracing"] }+serde.workspace = true+serde_json.workspace = true+bytes.workspace = truecrossbeam-utils = "0.8.15"lazy_static = "1.4.0"-parking_lot = "0.12.1"-tracing = { version = "0.1", features = ["log"] }+parking_lot.workspace = true+tracing.workspace = true# workspacelib-dispatch = { workspace = true }diff --git a/frontend/rust-lib/dart-ffi/src/lib.rs b/frontend/rust-lib/dart-ffi/src/lib.rsindex f9af82ce7b..3c488c6476 100644--- a/frontend/rust-lib/dart-ffi/src/lib.rs+++ b/frontend/rust-lib/dart-ffi/src/lib.rs@@ -4,9 +4,8 @@ use std::sync::Arc;use std::{ffi::CStr, os::raw::c_char};use lazy_static::lazy_static;-use log::error;use parking_lot::Mutex;-use tracing::trace;+use tracing::{error, trace};use flowy_core::*;use flowy_notification::{register_notification_sender, unregister_all_notification_sender};diff --git a/frontend/rust-lib/event-integration/Cargo.toml b/frontend/rust-lib/event-integration/Cargo.tomlindex f571986ffc..82a342568c 100644--- a/frontend/rust-lib/event-integration/Cargo.toml+++ b/frontend/rust-lib/event-integration/Cargo.toml@@ -21,20 +21,20 @@ lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-server = { path = "../flowy-server" }flowy-server-config = { workspace = true }flowy-notification = { workspace = true }-anyhow = "1.0.71"+anyhow.workspace = trueflowy-storage = { workspace = true }-serde = { version = "1.0", features = ["derive"] }-serde_json = {version = "1.0"}-protobuf = {version = "2.28.0"}-tokio = { version = "1.26", features = ["full"]}+serde.workspace = true+serde_json.workspace = true+protobuf.workspace = true+tokio = { workspace = true, features = ["full"]}futures-util = "0.3.26"thread-id = "3.3.0"-bytes = "1.4"+bytes.workspace = truenanoid = "0.4.0"-tracing = { version = "0.1.27" }-parking_lot = "0.12.1"-uuid = { version = "1.3.3", features = ["serde", "v4"] }+tracing.workspace = true+parking_lot.workspace = true+uuid.workspace = truecollab = { version = "0.1.0" }collab-document = { version = "0.1.0" }collab-folder = { version = "0.1.0" }@@ -45,7 +45,7 @@ collab-entity = { version = "0.1.0" }[dev-dependencies]dotenv = "0.15.0"tempdir = "0.3.7"-uuid = { version = "1.3.3", features = ["v4"] }+uuid.workspace = trueassert-json-diff = "2.0.2"tokio-postgres = { version = "0.7.8" }zip = "0.6.6"diff --git a/frontend/rust-lib/flowy-ai/Cargo.toml b/frontend/rust-lib/flowy-ai/Cargo.tomlindex a8526484c7..ece06cce6e 100644--- a/frontend/rust-lib/flowy-ai/Cargo.toml+++ b/frontend/rust-lib/flowy-ai/Cargo.toml@@ -7,10 +7,10 @@ edition = "2021"[dependencies]reqwest = { version = "0.11", features = ["json"] }-serde = { version = "1.0", features = ["derive"] }-serde_json = "1.0"-anyhow = "1.0.75"+serde.workspace = true+serde_json.workspace = true+anyhow.workspace = truelib-infra = { path = "../../../shared-lib/lib-infra" }async-openai = "0.14.2"-tokio = { version = "1.12", features = ["rt", "sync"] }+tokio = { workspace = true, features = ["rt", "sync"] }dotenv = "0.15.0"\ No newline at end of filediff --git a/frontend/rust-lib/flowy-config/Cargo.toml b/frontend/rust-lib/flowy-config/Cargo.tomlindex 1870a11230..a4fcf93da4 100644--- a/frontend/rust-lib/flowy-config/Cargo.toml+++ b/frontend/rust-lib/flowy-config/Cargo.toml@@ -12,8 +12,8 @@ lib-dispatch = { workspace = true }flowy-error = { workspace = true }flowy-derive = { path = "../../../shared-lib/flowy-derive" }-protobuf = {version = "2.28.0"}-bytes = { version = "1.5" }+protobuf.workspace = true+bytes.workspace = truestrum_macros = "0.21"[build-dependencies]diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.tomlindex ed57833410..3ae5624b7e 100644--- a/frontend/rust-lib/flowy-core/Cargo.toml+++ b/frontend/rust-lib/flowy-core/Cargo.toml@@ -28,26 +28,26 @@ flowy-ai = { workspace = true }collab-entity = { version = "0.1.0" }collab-plugins = { version = "0.1.0" }collab = { version = "0.1.0" }-diesel = { version = "1.4.8", features = ["sqlite"] }-uuid = { version = "1.3.3", features = ["v4"] }+diesel.workspace = true+uuid.workspace = trueflowy-storage = { workspace = true }client-api = { version = "0.1.0", features = ["collab-sync"] }-tracing = { version = "0.1", features = ["log"] }+tracing.workspace = truefutures-core = { version = "0.3", default-features = false }-bytes = "1.5"-tokio = { version = "1.26", features = ["full"] }-tokio-stream = {version = "0.1.14", features = ["sync"]}+bytes.workspace = true+tokio = { workspace = true, features = ["full"] }+tokio-stream = { workspace = true, features = ["sync"]}console-subscriber = { version = "0.2", optional = true }-parking_lot = "0.12.1"-anyhow = "1.0.75"+parking_lot.workspace = true+anyhow.workspace = truebase64 = "0.21.5"lib-infra = { path = "../../../shared-lib/lib-infra" }-serde = "1.0"-serde_json = "1.0"-serde_repr = "0.1"-futures = "0.3.28"+serde.workspace = true+serde_json.workspace = true+serde_repr.workspace = true+futures.workspace = truewalkdir = "2.4.0"[features]diff --git a/frontend/rust-lib/flowy-database-deps/Cargo.toml b/frontend/rust-lib/flowy-database-deps/Cargo.tomlindex b9200fe5b2..9bd8f911df 100644--- a/frontend/rust-lib/flowy-database-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-database-deps/Cargo.toml@@ -9,4 +9,4 @@ edition = "2021"lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-error = { workspace = true }collab-entity = { version = "0.1.0" }-anyhow = "1.0.71"\ No newline at end of file+anyhow.workspace = true\ No newline at end of filediff --git a/frontend/rust-lib/flowy-database2/Cargo.toml b/frontend/rust-lib/flowy-database2/Cargo.tomlindex b4867a5fe3..edffb0d202 100644--- a/frontend/rust-lib/flowy-database2/Cargo.toml+++ b/frontend/rust-lib/flowy-database2/Cargo.toml@@ -14,35 +14,34 @@ flowy-database-deps = { workspace = true }flowy-derive = { path = "../../../shared-lib/flowy-derive" }flowy-notification = { workspace = true }-parking_lot = "0.12.1"-protobuf = {version = "2.28.0"}+parking_lot.workspace = true+protobuf.workspace = trueflowy-error = { workspace = true, features = ["impl_from_dispatch_error", "impl_from_collab"]}lib-dispatch = { workspace = true }-tokio = { version = "1.26", features = ["sync"] }+tokio = { workspace = true, features = ["sync"] }flowy-task= { workspace = true }-bytes = { version = "1.5" }-tracing = { version = "0.1", features = ["log"] }-serde = { version = "1.0", features = ["derive"] }-serde_json = {version = "1.0"}-serde_repr = "0.1"+bytes.workspace = true+tracing.workspace = true+serde.workspace = true+serde_json.workspace = true+serde_repr.workspace = truelib-infra = { path = "../../../shared-lib/lib-infra" }-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }+chrono = { workspace = true, default-features = false, features = ["clock"] }rust_decimal = "1.28.1"rusty-money = {version = "0.4.1", features = ["iso"]}lazy_static = "1.4.0"indexmap = {version = "1.9.2", features = ["serde"]}url = { version = "2"}fancy-regex = "0.11.0"-futures = "0.3.26"+futures.workspace = truedashmap = "5"-anyhow = "1.0"+anyhow.workspace = trueasync-stream = "0.3.4"rayon = "1.6.1"nanoid = "0.4.0"-async-trait = "0.1.73"+async-trait.workspace = truechrono-tz = "0.8.2"csv = "1.1.6"-strum = "0.25"strum_macros = "0.25"diff --git a/frontend/rust-lib/flowy-date/Cargo.toml b/frontend/rust-lib/flowy-date/Cargo.tomlindex 6211fd9bb7..61599c4787 100644--- a/frontend/rust-lib/flowy-date/Cargo.toml+++ b/frontend/rust-lib/flowy-date/Cargo.toml@@ -9,12 +9,12 @@ edition = "2021"lib-dispatch = { path = "../lib-dispatch" }flowy-error = { path = "../flowy-error" }flowy-derive = { path = "../../../shared-lib/flowy-derive" }-protobuf = { version = "2.28.0" }-bytes = { version = "1.4" }+protobuf.workspace = true+bytes.workspace = truestrum_macros = "0.21"-tracing = { version = "0.1" }+tracing.workspace = truedate_time_parser = { version = "0.2.0" }-chrono = { version = "0.4.26" }+chrono.workspace = truefancy-regex = { version = "0.11.0" }[features]diff --git a/frontend/rust-lib/flowy-document-deps/Cargo.toml b/frontend/rust-lib/flowy-document-deps/Cargo.tomlindex 9c926cea76..d4b04ca2b1 100644--- a/frontend/rust-lib/flowy-document-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-document-deps/Cargo.toml@@ -9,4 +9,4 @@ edition = "2021"lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-error = { workspace = true }collab-document = { version = "0.1.0" }-anyhow = "1.0.71"\ No newline at end of file+anyhow.workspace = true\ No newline at end of filediff --git a/frontend/rust-lib/flowy-document2/Cargo.toml b/frontend/rust-lib/flowy-document2/Cargo.tomlindex 332176aed4..ed89fcecf8 100644--- a/frontend/rust-lib/flowy-document2/Cargo.toml+++ b/frontend/rust-lib/flowy-document2/Cargo.toml@@ -19,20 +19,20 @@ flowy-error = { path = "../flowy-error", features = ["impl_from_serde", "impl_frlib-dispatch = { workspace = true }lib-infra = { path = "../../../shared-lib/lib-infra" }validator = "0.16.0"-protobuf = {version = "2.28.0"}-bytes = { version = "1.5" }+protobuf.workspace = true+bytes.workspace = truenanoid = "0.4.0"-parking_lot = "0.12.1"+parking_lot.workspace = truestrum_macros = "0.21"-serde = { version = "1.0", features = ["derive"] }-serde_json = {version = "1.0"}-tracing = { version = "0.1", features = ["log"] }-tokio = { version = "1.26", features = ["full"] }-anyhow = "1.0"+serde.workspace = true+serde_json.workspace = true+tracing.workspace = true+tokio = { workspace = true, features = ["full"] }+anyhow.workspace = trueindexmap = {version = "1.9.2", features = ["serde"]}-uuid = { version = "1.3.3", features = ["v4"] }-futures = "0.3.26"-tokio-stream = { version = "0.1.14", features = ["sync"] }+uuid.workspace = true+futures.workspace = true+tokio-stream = { workspace = true, features = ["sync"] }scraper = "0.18.0"[dev-dependencies]diff --git a/frontend/rust-lib/flowy-encrypt/Cargo.toml b/frontend/rust-lib/flowy-encrypt/Cargo.tomlindex 402d1a7b1a..2041fccff1 100644--- a/frontend/rust-lib/flowy-encrypt/Cargo.toml+++ b/frontend/rust-lib/flowy-encrypt/Cargo.toml@@ -11,5 +11,5 @@ rand = "0.8"pbkdf2 = "0.12.2"hmac = "0.12.1"sha2 = "0.10.7"-anyhow = "1.0.72"+anyhow.workspace = truebase64 = "0.21.2"\ No newline at end of filediff --git a/frontend/rust-lib/flowy-error/Cargo.toml b/frontend/rust-lib/flowy-error/Cargo.tomlindex 2a06f299ef..6a99f0b155 100644--- a/frontend/rust-lib/flowy-error/Cargo.toml+++ b/frontend/rust-lib/flowy-error/Cargo.toml@@ -7,18 +7,18 @@ edition = "2018"[dependencies]flowy-derive = { path = "../../../shared-lib/flowy-derive" }-protobuf = { version = "2.28.0" }-bytes = "1.4"-anyhow = "1.0"+protobuf.workspace = true+bytes.workspace = true+anyhow.workspace = truethiserror = "1.0"validator = "0.16.0"-tokio = { version = "1.0", features = ["sync"]}+tokio = { workspace = true, features = ["sync"]}fancy-regex = { version = "0.11.0" }lib-dispatch = { workspace = true, optional = true }-serde_json = { version = "1.0", optional = true }-serde_repr = { version = "0.1" }-serde = "1.0"+serde_json.workspace = true+serde_repr.workspace = true+serde.workspace = truereqwest = { version = "0.11.14", optional = true, features = ["native-tls-vendored",] }@@ -33,7 +33,7 @@ client-api = { version = "0.1.0", optional = true }[features]default = ["impl_from_appflowy_cloud", "impl_from_collab", "impl_from_reqwest", "impl_from_serde"]impl_from_dispatch_error = ["lib-dispatch"]-impl_from_serde = ["serde_json"]+impl_from_serde = []impl_from_reqwest = ["reqwest"]impl_from_sqlite = ["flowy-sqlite", "r2d2"]impl_from_collab = ["collab-database", "collab-document", "impl_from_reqwest"]diff --git a/frontend/rust-lib/flowy-folder-deps/Cargo.toml b/frontend/rust-lib/flowy-folder-deps/Cargo.tomlindex ec01d5bb05..26c6dfaf27 100644--- a/frontend/rust-lib/flowy-folder-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-folder-deps/Cargo.toml@@ -9,5 +9,5 @@ edition = "2021"lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-error = { workspace = true }collab-folder = { version = "0.1.0" }-uuid = { version = "1.3.3", features = ["v4"] }-anyhow = "1.0.71"\ No newline at end of file+uuid.workspace = true+anyhow.workspace = true\ No newline at end of filediff --git a/frontend/rust-lib/flowy-folder2/Cargo.toml b/frontend/rust-lib/flowy-folder2/Cargo.tomlindex 3b306db494..0f98425828 100644--- a/frontend/rust-lib/flowy-folder2/Cargo.toml+++ b/frontend/rust-lib/flowy-folder2/Cargo.toml@@ -14,21 +14,21 @@ flowy-folder-deps = { workspace = true }flowy-derive = { path = "../../../shared-lib/flowy-derive" }flowy-notification = { workspace = true }-parking_lot = "0.12.1"+parking_lot.workspace = trueunicode-segmentation = "1.10"-tracing = { version = "0.1", features = ["log"] }+tracing.workspace = trueflowy-error = { path = "../flowy-error", features = ["impl_from_dispatch_error"]}lib-dispatch = { workspace = true }-bytes = { version = "1.5" }+bytes.workspace = truelib-infra = { path = "../../../shared-lib/lib-infra" }-tokio = { version = "1.26", features = ["full"] }+tokio = { workspace = true, features = ["full"] }nanoid = "0.4.0"lazy_static = "1.4.0"-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }+chrono = { workspace = true, default-features = false, features = ["clock"] }strum_macros = "0.21"-protobuf = {version = "2.28.0"}-uuid = { version = "1.3.3", features = ["v4"] }-tokio-stream = { version = "0.1.14", features = ["sync"] }+protobuf.workspace = true+uuid.workspace = true+tokio-stream = { workspace = true, features = ["sync"] }[build-dependencies]flowy-codegen = { path = "../../../shared-lib/flowy-codegen"}diff --git a/frontend/rust-lib/flowy-notification/Cargo.toml b/frontend/rust-lib/flowy-notification/Cargo.tomlindex 64dab43b40..ef8886cd28 100644--- a/frontend/rust-lib/flowy-notification/Cargo.toml+++ b/frontend/rust-lib/flowy-notification/Cargo.toml@@ -7,10 +7,10 @@ edition = "2018"[dependencies]lazy_static = { version = "1.4.0" }-protobuf = { version = "2.28.0" }-tracing = { version = "0.1", features = ["log"] }-bytes = { version = "1.5" }-serde = "1.0"+protobuf.workspace = true+tracing.workspace = true+bytes.workspace = true+serde.workspace = trueflowy-derive = { path = "../../../shared-lib/flowy-derive" }lib-dispatch = { workspace = true }diff --git a/frontend/rust-lib/flowy-server-config/Cargo.toml b/frontend/rust-lib/flowy-server-config/Cargo.tomlindex 8e11e35439..183271f430 100644--- a/frontend/rust-lib/flowy-server-config/Cargo.toml+++ b/frontend/rust-lib/flowy-server-config/Cargo.toml@@ -7,4 +7,4 @@ edition = "2021"[dependencies]flowy-error = { workspace = true }-serde = { version = "1.0", features = ["derive"] }\ No newline at end of file+serde.workspace = true\ No newline at end of filediff --git a/frontend/rust-lib/flowy-server/Cargo.toml b/frontend/rust-lib/flowy-server/Cargo.tomlindex 76141ea518..ed0224372b 100644--- a/frontend/rust-lib/flowy-server/Cargo.toml+++ b/frontend/rust-lib/flowy-server/Cargo.toml@@ -6,24 +6,24 @@ edition = "2021"# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html[dependencies]-tracing = { version = "0.1" }-futures = "0.3.26"+tracing.workspace = true+futures.workspace = truefutures-util = "0.3.26"reqwest = { version = "0.11.20", features = ["native-tls-vendored", "multipart", "blocking"] }hyper = "0.14"config = { version = "0.10.1", default-features = false, features = ["yaml"] }-serde = { version = "1.0", features = ["derive"] }-serde_json = "1.0"+serde.workspace = true+serde_json.workspace = trueserde-aux = "4.2.0"thiserror = "1.0"-tokio = { version = "1.26", features = ["sync"]}-parking_lot = "0.12"+tokio = { workspace = true, features = ["sync"]}+parking_lot.workspace = truelazy_static = "1.4.0"-bytes = { version = "1.5", features = ["serde"] }+bytes = { workspace = true, features = ["serde"] }tokio-retry = "0.3"-anyhow = "1.0"-uuid = { version = "1.3.3", features = ["v4"] }-chrono = { version = "0.4.31", default-features = false, features = ["clock", "serde"] }+anyhow.workspace = true+uuid.workspace = true+chrono = { workspace = true, default-features = false, features = ["clock", "serde"] }collab = { version = "0.1.0" }collab-plugins = { version = "0.1.0"}collab-document = { version = "0.1.0" }@@ -42,15 +42,15 @@ flowy-storage = { workspace = true }mime_guess = "2.0"url = "2.4"tokio-util = "0.7"-tokio-stream = { version = "0.1.14", features = ["sync"] }+tokio-stream = { workspace = true, features = ["sync"] }client-api = { version = "0.1.0", features = ["collab-sync", "test_util"] }lib-dispatch = { workspace = true }[dev-dependencies]-uuid = { version = "1.3.3", features = ["v4"] }+uuid.workspace = truetracing-subscriber = { version = "0.3.3", features = ["env-filter"] }dotenv = "0.15.0"yrs = "0.16.5"assert-json-diff = "2.0.2"-serde_json = "1.0.104"+serde_json.workspace = trueclient-api = { version = "0.1.0" }diff --git a/frontend/rust-lib/flowy-sqlite/Cargo.toml b/frontend/rust-lib/flowy-sqlite/Cargo.tomlindex 810be10065..b6639960d5 100644--- a/frontend/rust-lib/flowy-sqlite/Cargo.toml+++ b/frontend/rust-lib/flowy-sqlite/Cargo.toml@@ -6,15 +6,15 @@ edition = "2018"# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html[dependencies]-diesel = { version = "1.4.8", features = ["sqlite", "chrono"] }+diesel.workspace = truediesel_derives = { version = "1.4.1", features = ["sqlite"] }diesel_migrations = { version = "1.4.0", features = ["sqlite"] }-tracing = { version = "0.1", features = ["log"] }+tracing.workspace = truelazy_static = "1.4.0"-serde = { version = "1.0", features = ["derive"] }-serde_json = "1.0"-anyhow = "1.0"-parking_lot = "0.12.1"+serde.workspace = true+serde_json.workspace = true+anyhow.workspace = true+parking_lot.workspace = truer2d2 = "0.8.10"libsqlite3-sys = { version = ">=0.8.0, <0.24.0", features = ["bundled"] }diff --git a/frontend/rust-lib/flowy-storage/Cargo.toml b/frontend/rust-lib/flowy-storage/Cargo.tomlindex 1387ec98ac..3fef485446 100644--- a/frontend/rust-lib/flowy-storage/Cargo.toml+++ b/frontend/rust-lib/flowy-storage/Cargo.toml@@ -7,10 +7,10 @@ edition = "2021"[dependencies]reqwest = { version = "0.11", features = ["json", "stream"] }-serde_json = "1.0"-serde = { version = "1.0", features = ["derive"] }-async-trait = "0.1.73"-bytes = "1.0.1"+serde_json.workspace = true+serde.workspace = true+async-trait.workspace = true+bytes.workspace = truemime_guess = "2.0"lib-infra = { path = "../../../shared-lib/lib-infra" }url = "2.2.2"diff --git a/frontend/rust-lib/flowy-task/Cargo.toml b/frontend/rust-lib/flowy-task/Cargo.tomlindex ee3c749e26..e28795eff2 100644--- a/frontend/rust-lib/flowy-task/Cargo.toml+++ b/frontend/rust-lib/flowy-task/Cargo.toml@@ -7,11 +7,11 @@ edition = "2021"[dependencies]lib-infra = { path = "../../../shared-lib/lib-infra" }-tokio = { version = "1.26", features = ["sync", "macros", ]}+tokio = { workspace = true, features = ["sync", "macros", ]}atomic_refcell = "0.1.9"-anyhow = "1.0"-tracing = { version = "0.1", features = ["log"] }+anyhow.workspace = true+tracing.workspace = true[dev-dependencies]rand = "0.8.5"-futures = "0.3.26"+futures.workspace = truediff --git a/frontend/rust-lib/flowy-user-deps/Cargo.toml b/frontend/rust-lib/flowy-user-deps/Cargo.tomlindex 82dac5eda8..3ab00eb697 100644--- a/frontend/rust-lib/flowy-user-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-user-deps/Cargo.toml@@ -8,11 +8,11 @@ edition = "2021"[dependencies]lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-error = { workspace = true }-uuid = { version = "1.3.3", features = ["v4"] }-serde = { version = "1.0", features = ["derive"] }+uuid.workspace = true+serde.workspace = truecollab-entity = { version = "0.1.0" }-serde_json = { version = "1.0"}-serde_repr = "0.1"-chrono = { version = "0.4.31", default-features = false, features = ["clock", "serde"] }-anyhow = "1.0.71"-tokio = { version = "1.26", features = ["sync"] }+serde_json.workspace = true+serde_repr.workspace = true+chrono = { workspace = true, default-features = false, features = ["clock", "serde"] }+anyhow.workspace = true+tokio = { workspace = true, features = ["sync"] }diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.tomlindex 459e6c4b54..dce4628ee1 100644--- a/frontend/rust-lib/flowy-user/Cargo.toml+++ b/frontend/rust-lib/flowy-user/Cargo.toml@@ -23,28 +23,26 @@ collab-database = { version = "0.1.0" }collab-user = { version = "0.1.0" }collab-entity = { version = "0.1.0" }flowy-user-deps = { workspace = true }-anyhow = "1.0.75"--tracing = { version = "0.1", features = ["log"] }-bytes = "1.4"-serde = { version = "1.0", features = ["derive"] }-serde_json = { version = "1.0" }-serde_repr = "0.1"-log = "0.4.17"-protobuf = { version = "2.28.0" }+anyhow.workspace = true+tracing.workspace = true+bytes.workspace = true+serde.workspace = true+serde_json.workspace = true+serde_repr.workspace = true+protobuf.workspace = truelazy_static = "1.4.0"-diesel = { version = "1.4.8", features = ["sqlite"] }+diesel.workspace = truediesel_derives = { version = "1.4.1", features = ["sqlite"] }once_cell = "1.17.1"-parking_lot = "0.12.1"+parking_lot.workspace = truestrum = "0.25"strum_macros = "0.25.2"-tokio = { version = "1.26", features = ["rt"] }+tokio = { workspace = true, features = ["rt"] }validator = "0.16.0"unicode-segmentation = "1.10"fancy-regex = "0.11.0"-uuid = { version = "1.3.3", features = [ "v4"] }-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }+uuid.workspace = true+chrono = { workspace = true, default-features = false, features = ["clock"] }base64 = "^0.21"tokio-stream = "0.1.14"diff --git a/frontend/rust-lib/lib-dispatch/Cargo.toml b/frontend/rust-lib/lib-dispatch/Cargo.tomlindex 0ae9fa340e..b8ce73de80 100644--- a/frontend/rust-lib/lib-dispatch/Cargo.toml+++ b/frontend/rust-lib/lib-dispatch/Cargo.toml@@ -9,27 +9,27 @@ edition = "2018"pin-project = "1.0"futures-core = { version = "0.3", default-features = false }futures-channel = "0.3.26"-futures = "0.3.26"+futures.workspace = truefutures-util = "0.3.26"bytes = {version = "1.4", features = ["serde"]}-tokio = { version = "1.26", features = ["full"] }+tokio = { workspace = true, features = ["full"] }nanoid = "0.4.0"-log = "0.4.17"thread-id = "3.3.0"dyn-clone = "1.0"derivative = "2.2.0"-serde_json = {version = "1.0", optional = true }+serde_json = { workspace = true, optional = true }serde = { version = "1.0", features = ["derive"], optional = true }-serde_repr = { version = "0.1", optional = true }+serde_repr = { workspace = true, optional = true }validator = "0.16.1"-tracing = { version = "0.1"}+tracing.workspace = true+parking_lot = "0.12"#optional cratebincode = { version = "1.3", optional = true}-protobuf = {version = "2.28.0", optional = true}+protobuf = { workspace = true, optional = true }[dev-dependencies]-tokio = { version = "1.26", features = ["full"] }+tokio = { workspace = true, features = ["full"] }futures-util = "0.3.26"[features]diff --git a/frontend/rust-lib/lib-dispatch/src/data.rs b/frontend/rust-lib/lib-dispatch/src/data.rsindex 9cb028ad64..144cf219c3 100644--- a/frontend/rust-lib/lib-dispatch/src/data.rs+++ b/frontend/rust-lib/lib-dispatch/src/data.rs@@ -78,7 +78,7 @@ wherefn respond_to(self, _request: &AFPluginEventRequest) -> AFPluginEventResponse {match self.into_inner().into_bytes() {Ok(bytes) => {- log::trace!(+ tracing::trace!("Serialize Data: {:?} to event response",std::any::type_name::<T>());diff --git a/frontend/rust-lib/lib-dispatch/src/module/data.rs b/frontend/rust-lib/lib-dispatch/src/module/data.rsindex 1d71299274..520c3e2494 100644--- a/frontend/rust-lib/lib-dispatch/src/module/data.rs+++ b/frontend/rust-lib/lib-dispatch/src/module/data.rs@@ -67,7 +67,7 @@ where"Failed to get the plugin state of type: {}",type_name::<T>());- log::error!("{}", msg,);+ tracing::error!("{}", msg,);ready(Err(InternalError::Other(msg).into()))}}diff --git a/frontend/rust-lib/lib-dispatch/src/request/request.rs b/frontend/rust-lib/lib-dispatch/src/request/request.rsindex 45fb6a7d00..c62950f65d 100644--- a/frontend/rust-lib/lib-dispatch/src/request/request.rs+++ b/frontend/rust-lib/lib-dispatch/src/request/request.rs@@ -80,7 +80,7 @@ impl FromAFPluginRequest for String {}pub fn unexpected_none_payload(request: &AFPluginEventRequest) -> DispatchError {- log::warn!("{:?} expected payload", &request.event);+ tracing::warn!("{:?} expected payload", &request.event);InternalError::UnexpectedNone("Expected payload".to_string()).into()}diff --git a/frontend/rust-lib/lib-log/Cargo.toml b/frontend/rust-lib/lib-log/Cargo.tomlindex 9dc46e9121..1a4e9933fb 100644--- a/frontend/rust-lib/lib-log/Cargo.toml+++ b/frontend/rust-lib/lib-log/Cargo.toml@@ -11,10 +11,9 @@ tracing-subscriber = { version = "0.3.17", features = ["registry", "env-filter",tracing-bunyan-formatter = "0.3.9"tracing-appender = "0.2.2"tracing-core = "0.1"-tracing = { version = "0.1", features = ["log"] }-log = "0.4.17"-serde_json = "1.0"-serde = "1.0"+tracing.workspace = true+serde_json.workspace = true+serde.workspace = truechrono = "0.4"lazy_static = "1.4.0"diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lockindex 0550d668de..fff37673fd 100644--- a/shared-lib/Cargo.lock+++ b/shared-lib/Cargo.lock@@ -2,6 +2,21 @@# It is not intended for manual editing.version = 3+[[package]]+name = "addr2line"+version = "0.21.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"+dependencies = [+ "gimli",+]++[[package]]+name = "adler"+version = "1.0.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"+[[package]]name = "aho-corasick"version = "0.7.18"@@ -37,19 +52,19 @@ dependencies = [[[package]]name = "anyhow"-version = "1.0.71"+version = "1.0.75"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"[[package]]name = "async-trait"-version = "0.1.64"+version = "0.1.74"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"dependencies = ["proc-macro2","quote",- "syn 1.0.109",+ "syn 2.0.39",][[package]]@@ -58,6 +73,21 @@ version = "1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"+[[package]]+name = "backtrace"+version = "0.3.69"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"+dependencies = [+ "addr2line",+ "cc",+ "cfg-if",+ "libc",+ "miniz_oxide",+ "object",+ "rustc-demangle",+]+[[package]]name = "basic-toml"version = "0.1.2"@@ -415,7 +445,6 @@ dependencies = ["flowy-ast","flowy-codegen","lazy_static",- "log","proc-macro2","quote","serde_json",@@ -469,6 +498,12 @@ dependencies = ["wasi 0.10.0+wasi-snapshot-preview1",]+[[package]]+name = "gimli"+version = "0.28.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"+[[package]]name = "glob"version = "0.3.1"@@ -627,9 +662,9 @@ dependencies = [[[package]]name = "itoa"-version = "0.4.8"+version = "1.0.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"[[package]]name = "js-sys"@@ -669,7 +704,6 @@ dependencies = ["indexmap","indextree","lazy_static",- "log","serde","serde_json","strum",@@ -680,9 +714,9 @@ dependencies = [[[package]]name = "libc"-version = "0.2.139"+version = "0.2.150"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"[[package]]name = "libm"@@ -735,16 +769,24 @@ version = "2.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"+[[package]]+name = "miniz_oxide"+version = "0.7.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"+dependencies = [+ "adler",+]+[[package]]name = "mio"-version = "0.8.6"+version = "0.8.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"dependencies = ["libc",- "log","wasi 0.11.0+wasi-snapshot-preview1",- "windows-sys 0.45.0",+ "windows-sys 0.48.0",][[package]]@@ -766,6 +808,15 @@ dependencies = ["libc",]+[[package]]+name = "object"+version = "0.32.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"+dependencies = [+ "memchr",+]+[[package]]name = "once_cell"version = "1.17.1"@@ -850,7 +901,7 @@ dependencies = ["pest_meta","proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.39",][[package]]@@ -964,14 +1015,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.39",][[package]]name = "pin-project-lite"-version = "0.2.7"+version = "0.2.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"[[package]]name = "ppv-lite86"@@ -1107,9 +1158,9 @@ dependencies = [[[package]]name = "quote"-version = "1.0.27"+version = "1.0.33"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"dependencies = ["proc-macro2",]@@ -1230,6 +1281,12 @@ version = "0.7.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"+[[package]]+name = "rustc-demangle"+version = "0.1.23"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"+[[package]]name = "rustix"version = "0.37.3"@@ -1273,29 +1330,29 @@ checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"[[package]]name = "serde"-version = "1.0.163"+version = "1.0.192"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"dependencies = ["serde_derive",][[package]]name = "serde_derive"-version = "1.0.163"+version = "1.0.192"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.39",][[package]]name = "serde_json"-version = "1.0.71"+version = "1.0.108"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "063bf466a64011ac24040a49009724ee60a57da1b437617ceb32e53ad61bfb19"+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"dependencies = ["itoa","ryu",@@ -1351,12 +1408,12 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"[[package]]name = "socket2"-version = "0.4.7"+version = "0.5.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"dependencies = ["libc",- "winapi",+ "windows-sys 0.48.0",][[package]]@@ -1390,9 +1447,9 @@ dependencies = [[[package]]name = "syn"-version = "2.0.16"+version = "2.0.39"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"dependencies = ["proc-macro2","quote",@@ -1471,7 +1528,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.39",][[package]]@@ -1485,14 +1542,13 @@ dependencies = [[[package]]name = "tokio"-version = "1.26.0"+version = "1.34.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"dependencies = [- "autocfg",+ "backtrace","bytes","libc",- "memchr","mio","num_cpus","parking_lot",@@ -1500,18 +1556,18 @@ dependencies = ["signal-hook-registry","socket2","tokio-macros",- "windows-sys 0.45.0",+ "windows-sys 0.48.0",][[package]]name = "tokio-macros"-version = "1.8.2"+version = "2.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"dependencies = ["proc-macro2","quote",- "syn 1.0.109",+ "syn 2.0.39",][[package]]@@ -1525,12 +1581,10 @@ dependencies = [[[package]]name = "tracing"-version = "0.1.29"+version = "0.1.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"dependencies = [- "cfg-if",- "log","pin-project-lite","tracing-attributes","tracing-core",@@ -1538,22 +1592,22 @@ dependencies = [[[package]]name = "tracing-attributes"-version = "0.1.18"+version = "0.1.27"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"dependencies = ["proc-macro2","quote",- "syn 1.0.109",+ "syn 2.0.39",][[package]]name = "tracing-core"-version = "0.1.21"+version = "0.1.32"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"dependencies = [- "lazy_static",+ "once_cell",][[package]]diff --git a/shared-lib/Cargo.toml b/shared-lib/Cargo.tomlindex 82438fe2e4..37d51ffeb2 100644--- a/shared-lib/Cargo.toml+++ b/shared-lib/Cargo.toml@@ -11,3 +11,13 @@ members = [opt-level = 0#https://doc.rust-lang.org/rustc/codegen-options/index.html#debug-assertions#split-debuginfo = "unpacked"+++[workspace.dependencies]+anyhow = "1.0.75"+tracing = "0.1.40"+serde = "1.0.108"+serde_json = "1.0.108"+tokio = "1.34.0"+async-trait = "0.1.74"+chrono = { version = "0.4.31", default-features = false, features = ["clock"] }diff --git a/shared-lib/flowy-codegen/Cargo.toml b/shared-lib/flowy-codegen/Cargo.tomlindex 6121de6edd..4b713071a3 100644--- a/shared-lib/flowy-codegen/Cargo.toml+++ b/shared-lib/flowy-codegen/Cargo.toml@@ -8,7 +8,7 @@ edition = "2021"[dependencies]log = "0.4.17"serde = { version = "1.0", features = ["derive"]}-serde_json = "1.0"+serde_json.workspace = trueflowy-ast = { path = "../flowy-ast"}quote = "1.0"@@ -27,7 +27,6 @@ protoc-bin-vendored = { version = "3.0", optional = true }toml = {version = "0.5.11", optional = true}-[features]proto_gen = ["similar",diff --git a/shared-lib/flowy-codegen/src/dart_event/dart_event.rs b/shared-lib/flowy-codegen/src/dart_event/dart_event.rsindex 3a0a69240b..8ab6d3fb59 100644--- a/shared-lib/flowy-codegen/src/dart_event/dart_event.rs+++ b/shared-lib/flowy-codegen/src/dart_event/dart_event.rs@@ -1,22 +1,26 @@-use super::event_template::*;-use crate::ast::EventASTContext;-use crate::flowy_toml::{parse_crate_config_from, CrateConfig};-use crate::util::{is_crate_dir, is_hidden, path_string_with_component, read_file};-use flowy_ast::ASTResult;use std::fs::File;use std::io::Write;use std::path::PathBuf;+use syn::Item;use walkdir::WalkDir;+use flowy_ast::ASTResult;++use crate::ast::EventASTContext;+use crate::flowy_toml::{parse_crate_config_from, CrateConfig};+use crate::util::{is_crate_dir, is_hidden, path_string_with_component, read_file};++use super::event_template::*;+pub fn gen(crate_name: &str) {if std::env::var("CARGO_MAKE_WORKING_DIRECTORY").is_err() {- log::warn!("CARGO_MAKE_WORKING_DIRECTORY was not set, skip generate dart pb");+ println!("CARGO_MAKE_WORKING_DIRECTORY was not set, skip generate dart pb");return;}if std::env::var("FLUTTER_FLOWY_SDK_PATH").is_err() {- log::warn!("FLUTTER_FLOWY_SDK_PATH was not set, skip generate dart pb");+ println!("FLUTTER_FLOWY_SDK_PATH was not set, skip generate dart pb");return;}diff --git a/shared-lib/flowy-derive/Cargo.toml b/shared-lib/flowy-derive/Cargo.tomlindex a363dbc952..2c2285987d 100644--- a/shared-lib/flowy-derive/Cargo.toml+++ b/shared-lib/flowy-derive/Cargo.toml@@ -21,10 +21,9 @@ flowy-ast = { path = "../flowy-ast" }lazy_static = {version = "1.4.0"}dashmap = "5"flowy-codegen = { path = "../flowy-codegen"}-serde_json = "1.0"+serde_json.workspace = truewalkdir = "2.3.2"[dev-dependencies]-tokio = { version = "1.26", features = ["full"] }+tokio = { workspace = true, features = ["full"] }trybuild = "1.0.77"-log = "0.4.17"diff --git a/shared-lib/lib-infra/Cargo.toml b/shared-lib/lib-infra/Cargo.tomlindex e064f14268..4a1c4df90c 100644--- a/shared-lib/lib-infra/Cargo.toml+++ b/shared-lib/lib-infra/Cargo.toml@@ -6,12 +6,12 @@ edition = "2018"# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html[dependencies]-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }+chrono = { workspace = true, default-features = false, features = ["clock"] }bytes = { version = "1.5" }pin-project = "1.1.3"futures-core = { version = "0.3" }-tokio = { version = "1.26", features = ["time", "rt"] }+tokio = { workspace = true, features = ["time", "rt"] }rand = "0.8.5"-async-trait = "0.1.64"+async-trait.workspace = truemd5 = "0.7.0"-anyhow = "1.0"+anyhow.workspace = truediff --git a/shared-lib/lib-ot/Cargo.toml b/shared-lib/lib-ot/Cargo.tomlindex 259cf1bdd5..9d36af88d7 100644--- a/shared-lib/lib-ot/Cargo.toml+++ b/shared-lib/lib-ot/Cargo.toml@@ -8,10 +8,9 @@ edition = "2018"[dependencies]serde = { version = "1.0", features = ["derive", "rc"] }thiserror = "1.0"-serde_json = { version = "1.0" }+serde_json.workspace = trueindexmap = {version = "1.9.2", features = ["serde"]}-log = "0.4"-tracing = { version = "0.1", features = ["log"] }+tracing.workspace = truelazy_static = "1.4.0"strum = "0.21"strum_macros = "0.21"