Skip to content

Commit 7e26a1c

Browse files
committed
chore: merge crates
1 parent 2a70499 commit 7e26a1c

File tree

385 files changed

+1613
-2173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+1613
-2173
lines changed

Cargo.lock

Lines changed: 40 additions & 387 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
[workspace]
2-
members = [
3-
"collab",
4-
"collab-database",
5-
"collab-user",
6-
"collab-entity",
7-
"collab-document",
8-
"collab-folder",
9-
"collab-plugins",
10-
"collab-importer",
11-
]
2+
members = ["collab"]
123
resolver = "2"
134

145
[workspace.dependencies]
15-
collab = { path = "collab" }
16-
collab-database = { path = "collab-database" }
17-
collab-plugins = { path = "collab-plugins" }
18-
collab-user = { path = "collab-user" }
19-
collab-entity = { path = "collab-entity" }
20-
collab-document = { path = "collab-document" }
21-
collab-folder = { path = "collab-folder" }
22-
collab-importer = { path = "collab-importer" }
236
yrs = { version = "0.24", features = ["sync"] }
247
anyhow = "1.0.94"
258
thiserror = "1.0.39"
@@ -37,4 +20,4 @@ futures-lite = { version = "2.6.0", features = ["futures-io"] }
3720
[patch.crates-io]
3821
# We're using a specific commit here because rust-rocksdb doesn't publish the latest version that includes the memory alignment fix.
3922
# For more details, see https://github.com/rust-rocksdb/rust-rocksdb/pull/868
40-
rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1710120e4549e04ba3baa6a1ee5a5a801fa45a72" }
23+
rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1710120e4549e04ba3baa6a1ee5a5a801fa45a72" }

Makefile.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ script = [
8383
"""
8484
#!/bin/bash
8585
BASE_DIR=$(pwd)
86-
crates=("collab" "collab-document" "collab-folder" "collab-user" "collab-plugins")
86+
crates=("collab")
8787
8888
# Iterate over each crate and build it
8989
for crate in "${crates[@]}"; do
@@ -104,7 +104,7 @@ script = [
104104
"""
105105
#!/bin/bash
106106
BASE_DIR=$(pwd)
107-
crates=("collab-plugins")
107+
crates=("collab")
108108
109109
# Iterate over each crate and build it
110110
for crate in "${crates[@]}"; do

README.md

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11

22
# AppFlowy-Collab
33

4-
`AppFlowy-Collab` is a project that aims to support the collaborative features of AppFlowy. It consists of several crates that are currently under active development:
5-
6-
* `collab`
7-
* `collab-database`
8-
* `collab-document`
9-
* `collab-folder`
10-
* `collab-plugins`
11-
* `collab-sync`
4+
`AppFlowy-Collab` is a project that aims to support the collaborative features of AppFlowy. The workspace now centers on
5+
the `collab` crate, which houses database, document, folder, importer, plugin, and user functionality under a single
6+
module tree.
127

138
![architecture.png](resources/crate_arch.png)
149

@@ -18,23 +13,11 @@ ones are refined.
1813

1914
## collab
2015
The `collab` crate is built on top of the [yrs](https://docs.rs/yrs/latest/yrs/) crate, providing a higher level of
21-
abstraction for the collaborative features of AppFlowy. It offers a simple API for creating and managing collaborative
22-
documents.
23-
24-
## collab-database
25-
The `collab-database` crate provides a simple API for creating and managing collaborative databases. It is built on top
26-
of the `collab` crate.
27-
28-
## collab-document
29-
The `collab-document` crate provides a simple API for creating and managing collaborative documents. It is built on top
30-
of the `collab` crate.
31-
32-
## collab-folder
33-
The `collab-folder` crate provides a simple API for creating and managing collaborative folders. It is built on top of
34-
the `collab` crate.
16+
abstraction for the collaborative features of AppFlowy. It exposes cohesive modules:
3517

36-
## collab-plugins
37-
The `collab-plugins` crate contains a list of plugins that can be used with the `collab` crate.
18+
- Entity definitions and protobuf types under `collab::entity`.
19+
- Database, document, folder, importer, plugin, and user services under `collab::database`, `collab::document`,
20+
`collab::folder`, `collab::importer`, `collab::plugins`, and `collab::user`.
3821

39-
## collab-sync
40-
The `collab-sync` crate supports syncing the collaborative documents to a remote server.
22+
With everything consolidated, consumers only need to depend on the `collab` crate to access the full collaborative
23+
feature set.

collab-database/Cargo.toml

Lines changed: 0 additions & 63 deletions
This file was deleted.

collab-document/Cargo.toml

Lines changed: 0 additions & 39 deletions
This file was deleted.

collab-document/src/lib.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

collab-entity/Cargo.toml

Lines changed: 0 additions & 29 deletions
This file was deleted.

collab-entity/src/lib.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)