From 6e2f1070b9686d5e3de770aa63c6ccd785e9c3df Mon Sep 17 00:00:00 2001 From: DarkSky Date: Sat, 11 Feb 2023 00:44:00 +0800 Subject: [PATCH] feat: remove submodules --- .gitmodules | 4 -- apps/desktop/src-OctoBase | 1 - apps/desktop/src-tauri/Cargo.lock | 51 ++++++++++++++++--------- apps/desktop/src-tauri/Cargo.toml | 51 ++++++++++++++----------- apps/desktop/src-tauri/types/Cargo.toml | 4 +- 5 files changed, 63 insertions(+), 48 deletions(-) delete mode 100644 .gitmodules delete mode 160000 apps/desktop/src-OctoBase diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6a5545f111..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "apps/desktop/src-OctoBase"] - path = apps/desktop/src-OctoBase - url = https://github.com/toeverything/OctoBase - branch = master diff --git a/apps/desktop/src-OctoBase b/apps/desktop/src-OctoBase deleted file mode 160000 index f8ce0c0f05..0000000000 --- a/apps/desktop/src-OctoBase +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8ce0c0f0547b04efe50d249643217bec7b85c77 diff --git a/apps/desktop/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock index 70a3368c02..c2b4d052f2 100644 --- a/apps/desktop/src-tauri/Cargo.lock +++ b/apps/desktop/src-tauri/Cargo.lock @@ -3,8 +3,24 @@ version = 3 [[package]] -name = "AFFiNE" -version = "0.0.0" +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "affine-client" +version = "0.0.1" dependencies = [ "bytes", "cloud-database", @@ -27,25 +43,10 @@ dependencies = [ "yrs", ] -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "affine-cloud-migration" version = "0.1.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "sea-orm-migration", "tokio", @@ -464,6 +465,7 @@ dependencies = [ [[package]] name = "cang-jie" version = "0.14.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "jieba-rs", "log", @@ -621,6 +623,7 @@ dependencies = [ [[package]] name = "cloud-database" version = "0.1.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "affine-cloud-migration", "anyhow", @@ -1999,6 +2002,7 @@ dependencies = [ [[package]] name = "jwst" version = "0.1.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "async-trait", "bytes", @@ -2021,6 +2025,7 @@ dependencies = [ [[package]] name = "jwst-blob-migration" version = "0.1.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "sea-orm-migration", "tokio", @@ -2029,6 +2034,7 @@ dependencies = [ [[package]] name = "jwst-doc-migration" version = "0.1.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "sea-orm-migration", "tokio", @@ -2037,6 +2043,7 @@ dependencies = [ [[package]] name = "jwst-logger" version = "0.1.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "chrono", "nu-ansi-term", @@ -2049,6 +2056,7 @@ dependencies = [ [[package]] name = "jwst-storage" version = "0.1.0" +source = "git+https://github.com/toeverything/OctoBase?rev=5f1162b#5f1162b570588224687169158446168164be1fd5" dependencies = [ "anyhow", "async-trait", @@ -5765,6 +5773,7 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "y-sync" version = "0.1.0" +source = "git+https://github.com/toeverything/y-sync?rev=e061fa3#e061fa3f7b74c6350b2d2ff141ce79c3cb78925e" dependencies = [ "lib0", "thiserror", @@ -5774,8 +5783,14 @@ dependencies = [ [[package]] name = "yrs" version = "0.12.0" +source = "git+https://github.com/toeverything/y-crdt?rev=a1034b4#a1034b46ac852c13112c0a3cd94cb1587901315b" dependencies = [ "lib0", "rand 0.7.3", "smallstr", ] + +[[patch.unused]] +name = "rust-embed" +version = "6.4.2" +source = "git+https://github.com/pyrossh/rust-embed?rev=7c0fc42#7c0fc42f2dbecba295d956b3273b9b117ccbdc45" diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml index 4bd6c9eb5c..0811174f47 100644 --- a/apps/desktop/src-tauri/Cargo.toml +++ b/apps/desktop/src-tauri/Cargo.toml @@ -1,28 +1,33 @@ [package] -name = "AFFiNE" -version = "0.0.0" -description = "Development Tool for BlockSuite" -authors = ["you"] -license = "" -repository = "" +name = "affine-client" +version = "0.0.1" +description = "Multiple platform client for AFFiNE" +authors = [ + "linonetwo ", + "DarkSky ", +] +license = "MPL-2.0" +repository = "https://github.com/toeverything/AFFiNE" edition = "2021" -rust-version = "1.57" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[build-dependencies] -tauri-build = { version = "1.2", features = [] } +[features] +# by default Tauri runs in production mode +# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL +default = ["custom-protocol"] +# this feature is used used for production builds where `devPath` points to the filesystem +# DO NOT remove this +custom-protocol = ["tauri/custom-protocol"] [dependencies] bytes = "1.3.0" ipc_types = { path = "./types" } futures = "^0.3.25" js-sys = "0.3.60" -jwst = { path = "../src-OctoBase/libs/jwst" } -jwst-storage = { path = "../src-OctoBase/libs/jwst-storage", features = [ +jwst = { git = "https://github.com/toeverything/OctoBase", rev = "5f1162b" } +jwst-storage = { git = "https://github.com/toeverything/OctoBase", rev = "5f1162b", features = [ "sqlite", ] } -cloud-database = { path = "../src-OctoBase/libs/cloud-database", features = [ +cloud-database = { git = "https://github.com/toeverything/OctoBase", rev = "5f1162b", features = [ "sqlite", ] } project-root = "0.2.2" @@ -34,16 +39,16 @@ tauri = { version = "1.2", features = ["api-all", "devtools"] } tokio = { version = "1.23.0", features = ["rt", "macros"] } lib0 = "0.12.0" moka = { version = "0.9.6", features = ["future"] } -yrs = { path = "../src-OctoBase/libs/vendors/y-crdt/yrs" } -y-sync = { path = "../src-OctoBase/libs/vendors/y-sync" } +y-sync = "0.1.0" +yrs = "=0.12.0" -[features] -# by default Tauri runs in production mode -# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL -default = ["custom-protocol"] -# this feature is used used for production builds where `devPath` points to the filesystem -# DO NOT remove this -custom-protocol = ["tauri/custom-protocol"] +[build-dependencies] +tauri-build = { version = "1.2", features = [] } + +[patch.crates-io] +rust-embed = { git = "https://github.com/pyrossh/rust-embed", rev = "7c0fc42" } +yrs = { git = "https://github.com/toeverything/y-crdt", rev = "a1034b4" } +y-sync = { git = "https://github.com/toeverything/y-sync", rev = "e061fa3" } [profile.release.package.wry] debug = true diff --git a/apps/desktop/src-tauri/types/Cargo.toml b/apps/desktop/src-tauri/types/Cargo.toml index ae1a846988..f95db39a04 100644 --- a/apps/desktop/src-tauri/types/Cargo.toml +++ b/apps/desktop/src-tauri/types/Cargo.toml @@ -3,10 +3,10 @@ name = "ipc_types" version = "0.1.0" [dependencies] -jwst-storage = { path = "../../src-OctoBase/libs/jwst-storage", features = [ +cloud-database = { git = "https://github.com/toeverything/OctoBase", rev = "5f1162b", features = [ "sqlite", ] } -cloud-database = { path = "../../src-OctoBase/libs/cloud-database", features = [ +jwst-storage = { git = "https://github.com/toeverything/OctoBase", rev = "5f1162b", features = [ "sqlite", ] } project-root = "0.2.2"