add shared-lib folder

backend/Cargo.toml

@@ -40,7 +40,6 @@ serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 serde-aux = "1.0.1"
 
-
 derive_more = {version = "0.99"}
 protobuf = {version = "2.20.0"}
 uuid = { version = "0.8", features = ["serde", "v4"] }
@@ -60,12 +59,12 @@ pin-project = "1.0.0"
 byteorder = {version = "1.3.4"}
 async-stream = "0.3.2"
 
-flowy-user-infra = { path = "../frontend/rust-lib/flowy-user-infra" }
-flowy-workspace-infra = { path = "../frontend/rust-lib/flowy-workspace-infra" }
-flowy-document-infra = { path = "../frontend/rust-lib/flowy-document-infra" }
-lib-ws = { path = "../frontend/rust-lib/lib-ws" }
-lib-ot = { path = "../frontend/rust-lib/lib-ot" }
-backend-service = { path = "../frontend/rust-lib/backend-service", features = ["http_server"] }
+flowy-user-infra = { path = "../shared-lib/flowy-user-infra" }
+flowy-workspace-infra = { path = "../shared-lib/flowy-workspace-infra" }
+flowy-document-infra = { path = "../shared-lib/flowy-document-infra" }
+lib-ws = { path = "../shared-lib/lib-ws" }
+lib-ot = { path = "../shared-lib/lib-ot" }
+backend-service = { path = "../shared-lib/backend-service", features = ["http_server"] }
 
 ormx = { version = "0.7", features = ["postgres"]}
 [dependencies.sqlx]
@@ -104,8 +103,5 @@ backend = { path = ".", features = ["flowy_test"]}
 flowy-sdk = { path = "../frontend/rust-lib/flowy-sdk", features = ["http_server"] }
 flowy-user = { path = "../frontend/rust-lib/flowy-user", features = ["http_server"] }
 flowy-document = { path = "../frontend/rust-lib/flowy-document", features = ["flowy_test", "http_server"] }
-lib-ws = { path = "../frontend/rust-lib/lib-ws" }
 flowy-test = { path = "../frontend/rust-lib/flowy-test" }
-lib-infra = { path = "../frontend/rust-lib/lib-infra" }
-lib-ot = { path = "../frontend/rust-lib/lib-ot" }
-lib-sqlite = { path = "../frontend/rust-lib/lib-sqlite" }
+

frontend/rust-lib/Cargo.toml

@@ -1,25 +1,17 @@
 [workspace]
 members = [
   "lib-dispatch",
+  "lib-log",
+  "lib-sqlite",
+  "lib-infra",
   "flowy-sdk",
   "dart-ffi",
-  "lib-log",
   "flowy-user",
-  "flowy-user-infra",
-  "flowy-ast",
-  "flowy-derive",
   "flowy-test",
-  "lib-sqlite",
   "flowy-database",
-  "lib-infra",
   "flowy-workspace",
-  "flowy-workspace-infra",
   "dart-notify",
   "flowy-document",
-  "flowy-document-infra",
-  "lib-ot",
-  "lib-ws",
-  "backend-service",
 ]
 
 exclude = ["../backend"]

frontend/rust-lib/dart-ffi/Cargo.toml

@@ -26,9 +26,10 @@ parking_lot = "0.11"
 
 lib-dispatch = {path = "../lib-dispatch" }
 flowy-sdk = {path = "../flowy-sdk"}
-flowy-derive = {path = "../flowy-derive"}
 dart-notify = {path = "../dart-notify" }
-backend-service = { path = "../backend-service" }
+
+flowy-derive = {path = "../../../shared-lib/flowy-derive" }
+backend-service = { path = "../../../shared-lib/backend-service" }
 
 
 [features]

frontend/rust-lib/dart-notify/Cargo.toml

@@ -12,7 +12,7 @@ allo-isolate = {version = "^0.1", features = ["catch-unwind",]}
 log = "0.4.14"
 bytes = { version = "1.0" }
 
-flowy-derive = {path = "../flowy-derive"}
+flowy-derive = {path = "../../../shared-lib/flowy-derive" }
 lib-dispatch = {path = "../lib-dispatch" }
 
 [features]

frontend/rust-lib/flowy-document/Cargo.toml

@@ -7,16 +7,17 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flowy-document-infra = { path = "../flowy-document-infra" }
+flowy-document-infra = { path = "../../../shared-lib/flowy-document-infra" }
+flowy-derive = { path = "../../../shared-lib/flowy-derive" }
+lib-ot = { path = "../../../shared-lib/lib-ot" }
+lib-ws = { path = "../../../shared-lib/lib-ws" }
+backend-service = { path = "../../../shared-lib/backend-service" }
+
 derive_more = {version = "0.99", features = ["display"]}
 lib-dispatch = { path = "../lib-dispatch" }
-flowy-derive = { path = "../flowy-derive" }
-flowy-database = { path = "../flowy-database" }
 lib-infra = { path = "../lib-infra" }
+flowy-database = { path = "../flowy-database" }
 dart-notify = { path = "../dart-notify" }
-lib-ot = { path = "../lib-ot" }
-lib-ws = { path = "../lib-ws" }
-backend-service = { path = "../backend-service" }
 
 
 diesel = {version = "1.4.8", features = ["sqlite"]}

frontend/rust-lib/flowy-sdk/Cargo.toml

@@ -9,13 +9,10 @@ edition = "2018"
 lib-dispatch = { path = "../lib-dispatch" }
 lib-log = { path = "../lib-log" }
 flowy-user = { path = "../flowy-user" }
-lib-infra = { path = "../lib-infra" }
 flowy-workspace = { path = "../flowy-workspace", default-features = false }
 flowy-database = { path = "../flowy-database" }
 flowy-document = { path = "../flowy-document" }
-flowy-document-infra = { path = "../flowy-document-infra" }
-lib-ws = { path = "../lib-ws" }
-backend-service = { path = "../backend-service" }
+lib-infra = { path = "../lib-infra" }
 tracing = { version = "0.1" }
 log = "0.4.14"
 futures-core = { version = "0.3", default-features = false }
@@ -24,6 +21,12 @@ bytes = "1.0"
 tokio = { version = "1", features = ["rt"] }
 parking_lot = "0.11"
 
+
+flowy-document-infra = { path = "../../../shared-lib/flowy-document-infra" }
+lib-ws = { path = "../../../shared-lib/lib-ws" }
+backend-service = { path = "../../../shared-lib/backend-service" }
+
+
 [dev-dependencies]
 serde = { version = "1.0", features = ["derive"] }
 bincode = { version = "1.3"}

frontend/rust-lib/flowy-test/Cargo.toml

@@ -7,13 +7,15 @@ edition = "2018"
 
 [dependencies]
 flowy-sdk = { path = "../flowy-sdk"}
-lib-dispatch = { path = "../lib-dispatch" }
 flowy-user = { path = "../flowy-user"}
 flowy-workspace = { path = "../flowy-workspace", default-features = false}
-lib-infra = { path = "../lib-infra" }
 flowy-document = { path = "../flowy-document"}
-flowy-document-infra = { path = "../flowy-document-infra"}
-backend-service = { path = "../backend-service" }
+lib-dispatch = { path = "../lib-dispatch" }
+lib-infra = { path = "../lib-infra" }
+
+flowy-document-infra = { path = "../../../shared-lib/flowy-document-infra" }
+backend-service = { path = "../../../shared-lib/backend-service" }
+
 
 serde = { version = "1.0", features = ["derive"] }
 bincode = { version = "1.3"}

frontend/rust-lib/flowy-user/Cargo.toml

@@ -6,16 +6,17 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flowy-user-infra = { path = "../flowy-user-infra" }
-backend-service = { path = "../backend-service" }
+flowy-user-infra = { path = "../../../shared-lib/flowy-user-infra" }
+backend-service = { path = "../../../shared-lib/backend-service" }
+flowy-derive = { path = "../../../shared-lib/flowy-derive" }
+lib-ws = { path = "../../../shared-lib/lib-ws" }
+
 derive_more = {version = "0.99", features = ["display"]}
-lib-dispatch = { path = "../lib-dispatch" }
-flowy-derive = { path = "../flowy-derive" }
 flowy-database = { path = "../flowy-database" }
-lib-sqlite = { path = "../lib-sqlite" }
-lib-infra = { path = "../lib-infra" }
-lib-ws = { path = "../lib-ws" }
 dart-notify = { path = "../dart-notify" }
+lib-dispatch = { path = "../lib-dispatch" }
+lib-infra = { path = "../lib-infra" }
+lib-sqlite = { path = "../lib-sqlite" }
 
 tracing = { version = "0.1", features = ["log"] }
 bytes = "1.0"

frontend/rust-lib/flowy-workspace/Cargo.toml

@@ -6,17 +6,20 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flowy-workspace-infra = { path = "../flowy-workspace-infra" }
-flowy-document-infra = { path = "../flowy-document-infra" }
+flowy-workspace-infra = { path = "../../../shared-lib/flowy-workspace-infra" }
+flowy-document-infra = { path = "../../../shared-lib/flowy-document-infra" }
+flowy-derive = { path = "../../../shared-lib/flowy-derive" }
+lib-ot = { path = "../../../shared-lib/lib-ot" }
+backend-service = { path = "../../../shared-lib/backend-service" }
+
+
 flowy-document = { path = "../flowy-document" }
-lib-dispatch = { path = "../lib-dispatch" }
-flowy-derive = { path = "../flowy-derive" }
 flowy-database = { path = "../flowy-database" }
-lib-sqlite = { path = "../lib-sqlite" }
-lib-infra = { path = "../lib-infra" }
 dart-notify = { path = "../dart-notify" }
-lib-ot = { path = "../lib-ot" }
-backend-service = { path = "../backend-service" }
+lib-dispatch = { path = "../lib-dispatch" }
+lib-infra = { path = "../lib-infra" }
+lib-sqlite = { path = "../lib-sqlite" }
+
 
 parking_lot = "0.11"
 protobuf = {version = "2.18.0"}

frontend/rust-lib/lib-infra/Cargo.toml

@@ -10,7 +10,7 @@ uuid = { version = "0.8", features = ["serde", "v4"] }
 diesel = {version = "1.4.8", features = ["sqlite"]}
 diesel_derives = {version = "1.4.1", features = ["sqlite"]}
 diesel_migrations = {version = "1.4.0", features = ["sqlite"]}
-flowy-derive = { path = "../flowy-derive"}
+flowy-derive = { path = "../../../shared-lib/flowy-derive" }
 lib-sqlite = { path = "../lib-sqlite" }
 lazy_static = "1.4.0"
 protobuf = {version = "2.18.0"}

frontend/scripts/flowy-tool/Cargo.toml

@@ -14,7 +14,7 @@ log = "0.4.11"
 env_logger = "0.8.2"
 #shell = { git="https://github.com/google/rust-shell.git"}
 cmd_lib = "1.1"
-flowy-ast = { path = "../../rust-lib/flowy-ast" }
+flowy-ast = { path = "../../shared-lib/flowy-ast" }
 console = "0.14.0"
 fancy-regex = "0.5.0"
 lazy_static = "1.4.0"

shared-lib/Cargo.toml

@@ -0,0 +1,14 @@
+[workspace]
+members = [
+  "flowy-user-infra",
+  "flowy-workspace-infra",
+  "flowy-document-infra",
+  "lib-ot",
+  "lib-ws",
+  "backend-service",
+  "flowy-derive",
+  "flowy-ast",
+]
+
+[profile.dev]
+split-debuginfo = "unpacked"