Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dependency issue

Browse Source
This commit is contained in:
Zack Fu Zi Xiang 2024-06-04 10:24:29 +08:00
parent 3f26e271b2
commit f11f407564
No known key found for this signature in database
2 changed files with 28 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
frontend/rust-lib/Cargo.lock generated
View File

@ -160,26 +160,6 @@ version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]]
name = "app-error"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"bincode",
"getrandom 0.2.10",
"reqwest",
"serde",
"serde_json",
"serde_repr",
"thiserror",
"tokio",
"tsify",
"url",
"uuid",
"wasm-bindgen",
]
[[package]]
name = "app-error"
version = "0.1.0"
@ -200,20 +180,6 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "appflowy-ai-client"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"bytes",
"futures",
"serde",
"serde_json",
"serde_repr",
"thiserror",
]
[[package]]
name = "appflowy-ai-client"
version = "0.1.0"
@ -231,13 +197,13 @@ dependencies = [
[[package]]
name = "appflowy-cloud-billing-client"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client?rev=13d00e3a63e7f6eb19f5372539a6c49c22ca5f8c#13d00e3a63e7f6eb19f5372539a6c49c22ca5f8c"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client?rev=5a9b151bbb22e9789867b3ca810f7b35f0f7ebb4#5a9b151bbb22e9789867b3ca810f7b35f0f7ebb4"
dependencies = [
"client-api 0.2.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"client-api",
"reqwest",
"serde",
"serde_json",
"shared-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"shared-entity",
"tokio",
"yrs",
]
@ -709,49 +675,6 @@ dependencies = [
"libloading",
]
[[package]]
name = "client-api"
version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"again",
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"async-trait",
"bincode",
"bytes",
"chrono",
"client-websocket 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"collab-entity",
"collab-rt-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"collab-rt-protocol 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"database-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"futures-core",
"futures-util",
"getrandom 0.2.10",
"gotrue 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"gotrue-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"mime",
"parking_lot 0.12.1",
"prost",
"reqwest",
"semver",
"serde",
"serde_json",
"serde_repr",
"serde_urlencoded",
"shared-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"thiserror",
"tokio",
"tokio-retry",
"tokio-stream",
"tokio-util",
"tracing",
"url",
"uuid",
"wasm-bindgen-futures",
]
[[package]]
name = "client-api"
version = "0.2.0"
@ -759,23 +682,23 @@ source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a
dependencies = [
"again",
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"app-error",
"async-trait",
"bincode",
"brotli",
"bytes",
"chrono",
"client-websocket 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"client-websocket",
"collab",
"collab-entity",
"collab-rt-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"collab-rt-protocol 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"database-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"collab-rt-entity",
"collab-rt-protocol",
"database-entity",
"futures-core",
"futures-util",
"getrandom 0.2.10",
"gotrue 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"gotrue-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"gotrue",
"gotrue-entity",
"mime",
"parking_lot 0.12.1",
"prost",
@ -786,7 +709,7 @@ dependencies = [
"serde_json",
"serde_repr",
"serde_urlencoded",
"shared-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"shared-entity",
"thiserror",
"tokio",
"tokio-retry",
@ -799,24 +722,6 @@ dependencies = [
"yrs",
]
[[package]]
name = "client-websocket"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"futures-channel",
"futures-util",
"http",
"httparse",
"js-sys",
"percent-encoding",
"thiserror",
"tokio",
"tokio-tungstenite",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "client-websocket"
version = "0.1.0"
@ -1025,31 +930,6 @@ dependencies = [
"yrs",
]
[[package]]
name = "collab-rt-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"bincode",
"bytes",
"chrono",
"client-websocket 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"collab",
"collab-entity",
"collab-rt-protocol 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"database-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"prost",
"prost-build",
"protoc-bin-vendored",
"serde",
"serde_json",
"serde_repr",
"thiserror",
"tokio-tungstenite",
"yrs",
]
[[package]]
name = "collab-rt-entity"
version = "0.1.0"
@ -1059,11 +939,11 @@ dependencies = [
"bincode",
"bytes",
"chrono",
"client-websocket 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"client-websocket",
"collab",
"collab-entity",
"collab-rt-protocol 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"database-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"collab-rt-protocol",
"database-entity",
"prost",
"prost-build",
"protoc-bin-vendored",
@ -1075,23 +955,6 @@ dependencies = [
"yrs",
]
[[package]]
name = "collab-rt-protocol"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"async-trait",
"bincode",
"collab",
"collab-entity",
"serde",
"thiserror",
"tokio",
"tracing",
"yrs",
]
[[package]]
name = "collab-rt-protocol"
version = "0.1.0"
@ -1412,32 +1275,13 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "database-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"bincode",
"chrono",
"collab-entity",
"serde",
"serde_json",
"serde_repr",
"thiserror",
"tracing",
"uuid",
"validator",
]
[[package]]
name = "database-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a#b36715dc2427e23a15fa81c629e1817d3dbf1e1a"
dependencies = [
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"app-error",
"bincode",
"chrono",
"collab-entity",
@ -1844,7 +1688,7 @@ dependencies = [
name = "flowy-chat-pub"
version = "0.1.0"
dependencies = [
"client-api 0.2.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"client-api",
"flowy-error",
"futures",
"lib-infra",
@ -1895,7 +1739,7 @@ dependencies = [
"anyhow",
"base64 0.21.5",
"bytes",
"client-api 0.2.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"client-api",
"collab",
"collab-entity",
"collab-integrate",
@ -2096,7 +1940,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bytes",
"client-api 0.2.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"client-api",
"collab-database",
"collab-document",
"collab-folder",
@ -2234,7 +2078,7 @@ dependencies = [
"assert-json-diff",
"bytes",
"chrono",
"client-api 0.2.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"client-api",
"collab",
"collab-document",
"collab-entity",
@ -2686,23 +2530,6 @@ dependencies = [
"web-sys",
]
[[package]]
name = "gotrue"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"futures-util",
"getrandom 0.2.10",
"gotrue-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"infra 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"reqwest",
"serde",
"serde_json",
"tokio",
"tracing",
]
[[package]]
name = "gotrue"
version = "0.1.0"
@ -2711,8 +2538,8 @@ dependencies = [
"anyhow",
"futures-util",
"getrandom 0.2.10",
"gotrue-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"infra 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"gotrue-entity",
"infra",
"reqwest",
"serde",
"serde_json",
@ -2720,27 +2547,13 @@ dependencies = [
"tracing",
]
[[package]]
name = "gotrue-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"chrono",
"jsonwebtoken",
"lazy_static",
"serde",
"serde_json",
]
[[package]]
name = "gotrue-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a#b36715dc2427e23a15fa81c629e1817d3dbf1e1a"
dependencies = [
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"app-error",
"chrono",
"jsonwebtoken",
"lazy_static",
@ -3099,18 +2912,6 @@ dependencies = [
"serde",
]
[[package]]
name = "infra"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"reqwest",
"serde",
"serde_json",
"tracing",
]
[[package]]
name = "infra"
version = "0.1.0"
@ -5194,40 +4995,19 @@ dependencies = [
"lazy_static",
]
[[package]]
name = "shared-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96#45bfcc0a31e84996157c69a60c8458eeb98b5f96"
dependencies = [
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"appflowy-ai-client 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"chrono",
"collab-entity",
"database-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"futures",
"gotrue-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=45bfcc0a31e84996157c69a60c8458eeb98b5f96)",
"reqwest",
"serde",
"serde_json",
"serde_repr",
"thiserror",
"uuid",
]
[[package]]
name = "shared-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a#b36715dc2427e23a15fa81c629e1817d3dbf1e1a"
dependencies = [
"anyhow",
"app-error 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"appflowy-ai-client 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"app-error",
"appflowy-ai-client",
"chrono",
"collab-entity",
"database-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"database-entity",
"futures",
"gotrue-entity 0.1.0 (git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b36715dc2427e23a15fa81c629e1817d3dbf1e1a)",
"gotrue-entity",
"reqwest",
"serde",
"serde_json",

3
frontend/rust-lib/Cargo.toml
View File

@ -94,7 +94,7 @@ yrs = "0.18.8"
# scripts/tool/update_client_api_rev.sh new_rev_id
# ⚠️⚠️⚠️️
client-api = { version = "0.2" }
appflowy-cloud-billing-client = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client", rev = "13d00e3a63e7f6eb19f5372539a6c49c22ca5f8c" }
appflowy-cloud-billing-client = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client", rev = "5a9b151bbb22e9789867b3ca810f7b35f0f7ebb4" }
[profile.dev]
opt-level = 1
@ -122,6 +122,7 @@ incremental = false
[patch.crates-io]
client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b36715dc2427e23a15fa81c629e1817d3dbf1e1a" }
shared-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b36715dc2427e23a15fa81c629e1817d3dbf1e1a" }
# TODO(Lucas.Xu) Upgrade to the latest version of RocksDB once PR(https://github.com/rust-rocksdb/rust-rocksdb/pull/869) is merged.
# Currently, using the following revision id. This commit is patched to fix the 32-bit build issue and it's checked out from 0.21.0, not 0.22.0.