Skip to content

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.

chore: bump collab version (#6363)

Nathan.foooe36f9aee4e53
diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lock
index d6d313fb0a..500791e3f1 100644
--- a/frontend/appflowy_flutter/pubspec.lock
+++ b/frontend/appflowy_flutter/pubspec.lock
@@ -1559,10 +1559,10 @@ packages:
dependency: transitive
description:
name: platform
- sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+ sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
url: "https://pub.dev"
source: hosted
- version: "3.1.5"
+ version: "3.1.4"
plugin_platform_interface:
dependency: "direct dev"
description:
@@ -1989,10 +1989,10 @@ packages:
dependency: transitive
description:
name: string_scanner
- sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+ sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
- version: "1.3.0"
+ version: "1.2.0"
string_validator:
dependency: "direct main"
description:
@@ -2311,10 +2311,10 @@ packages:
dependency: transitive
description:
name: vm_service
- sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+ sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
- version: "14.2.5"
+ version: "14.2.1"
watcher:
dependency: transitive
description:
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock
index 85c91b116d..39c2559f3f 100644
--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock
+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock
@@ -976,7 +976,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"arc-swap",
@@ -1001,7 +1001,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"async-trait",
@@ -1027,18 +1027,20 @@ dependencies = [
"tokio-util",
"tracing",
"uuid",
+ "yrs",
]
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"arc-swap",
"collab",
"collab-entity",
"getrandom 0.2.10",
+ "markdown",
"nanoid",
"serde",
"serde_json",
@@ -1052,7 +1054,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"bytes",
@@ -1072,7 +1074,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"arc-swap",
@@ -1115,7 +1117,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"async-stream",
@@ -1195,7 +1197,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"collab",
@@ -2223,7 +2225,6 @@ dependencies = [
"strum",
"strum_macros 0.25.2",
"tokio",
- "tokio-retry",
"tokio-util",
"tracing",
"url",
@@ -4096,6 +4097,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "markdown"
+version = "1.0.0-alpha.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "911a8325e6fb87b89890cd4529a2ab34c2669c026279e61c26b7140a3d821ccb"
+dependencies = [
+ "unicode-id",
+]
+
[[package]]
name = "markup5ever"
version = "0.10.1"
@@ -7619,6 +7629,12 @@ version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+[[package]]
+name = "unicode-id"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f"
+
[[package]]
name = "unicode-ident"
version = "1.0.9"
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml
index 6ebcdd34fb..4dba2e14ba 100644
--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml
+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml
@@ -52,6 +52,7 @@ collab-document = { version = "0.2" }
collab-database = { version = "0.2" }
collab-plugins = { version = "0.2" }
collab-user = { version = "0.2" }
+collab-importer = { version = "0.1" }
# Please using the following command to update the revision id
# Current directory: frontend
@@ -119,13 +120,15 @@ custom-protocol = ["tauri/custom-protocol"]
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+
# Working directory: frontend
# To update the commit ID, run:
diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lock
index 21d46ec665..cabdfbe436 100644
--- a/frontend/appflowy_web_app/src-tauri/Cargo.lock
+++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock
@@ -959,7 +959,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"arc-swap",
@@ -984,7 +984,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"async-trait",
@@ -1010,18 +1010,20 @@ dependencies = [
"tokio-util",
"tracing",
"uuid",
+ "yrs",
]
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"arc-swap",
"collab",
"collab-entity",
"getrandom 0.2.12",
+ "markdown",
"nanoid",
"serde",
"serde_json",
@@ -1035,7 +1037,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"bytes",
@@ -1055,7 +1057,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"arc-swap",
@@ -1098,7 +1100,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"async-stream",
@@ -1178,7 +1180,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87d1f8b086ab4005ce2fbd4e13d355a48e95763d#87d1f8b086ab4005ce2fbd4e13d355a48e95763d"
dependencies = [
"anyhow",
"collab",
@@ -2253,7 +2255,6 @@ dependencies = [
"strum",
"strum_macros 0.25.3",
"tokio",
- "tokio-retry",
"tokio-util",
"tracing",
"url",
@@ -4181,6 +4182,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "markdown"
+version = "1.0.0-alpha.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "911a8325e6fb87b89890cd4529a2ab34c2669c026279e61c26b7140a3d821ccb"
+dependencies = [
+ "unicode-id",
+]
+
[[package]]
name = "markup5ever"
version = "0.11.0"
@@ -7754,6 +7764,12 @@ version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+[[package]]
+name = "unicode-id"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f"
+
[[package]]
name = "unicode-ident"
version = "1.0.12"
diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml
index 9bc189e708..ec5eb41305 100644
--- a/frontend/appflowy_web_app/src-tauri/Cargo.toml
+++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml
@@ -51,6 +51,7 @@ collab-document = { version = "0.2" }
collab-database = { version = "0.2" }
collab-plugins = { version = "0.2" }
collab-user = { version = "0.2" }
+collab-importer = { version = "0.1" }
# Please using the following command to update the revision id
# Current directory: frontend
@@ -117,13 +118,15 @@ custom-protocol = ["tauri/custom-protocol"]
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+
# Working directory: frontend
# To update the commit ID, run:
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index fffaee2340..94ca824144 100644
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@ -837,7 +837,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
dependencies = [
"anyhow",
"arc-swap",
@@ -862,7 +862,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
dependencies = [
"anyhow",
"async-trait",
@@ -888,18 +888,20 @@ dependencies = [
"tokio-util",
"tracing",
"uuid",
+ "yrs",
]
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
dependencies = [
"anyhow",
"arc-swap",
"collab",
"collab-entity",
"getrandom 0.2.10",
+ "markdown",
"nanoid",
"serde",
"serde_json",
@@ -913,7 +915,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
dependencies = [
"anyhow",
"bytes",
@@ -933,7 +935,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
dependencies = [
"anyhow",
"arc-swap",
@@ -951,6 +953,35 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "collab-importer"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "chrono",
+ "collab",
+ "collab-database",
+ "collab-document",
+ "collab-entity",
+ "collab-folder",
+ "fancy-regex 0.13.0",
+ "fxhash",
+ "hex",
+ "markdown",
+ "percent-encoding",
+ "rayon",
+ "serde",
+ "serde_json",
+ "sha2",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "uuid",
+ "walkdir",
+]
+
[[package]]
name = "collab-integrate"
version = "0.1.0"
@@ -976,7 +1007,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
dependencies = [
"anyhow",
"async-stream",
@@ -1056,7 +1087,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9a07a19181a509b6c3237d71ac9bb602322ebe0b#9a07a19181a509b6c3237d71ac9bb602322ebe0b"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2af6d29503e214d957b6ea4fb56846289dbc9d8f#2af6d29503e214d957b6ea4fb56846289dbc9d8f"
dependencies = [
"anyhow",
"collab",
@@ -1776,6 +1807,17 @@ dependencies = [
"regex",
]
+[[package]]
+name = "fancy-regex"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
+dependencies = [
+ "bit-set",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
+]
+
[[package]]
name = "fancy_constructor"
version = "1.2.2"
@@ -2392,6 +2434,7 @@ dependencies = [
"async-trait",
"bytes",
"chrono",
+ "collab-importer",
"dashmap 6.0.1",
"flowy-codegen",
"flowy-derive",
@@ -3589,6 +3632,15 @@ dependencies = [
"syn 2.0.47",
]
+[[package]]
+name = "markdown"
+version = "1.0.0-alpha.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "911a8325e6fb87b89890cd4529a2ab34c2669c026279e61c26b7140a3d821ccb"
+dependencies = [
+ "unicode-id",
+]
+
[[package]]
name = "markup5ever"
version = "0.11.0"
@@ -4930,6 +4982,17 @@ dependencies = [
"regex-syntax 0.7.5",
]
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.4",
+]
+
[[package]]
name = "regex-syntax"
version = "0.6.29"
@@ -5328,18 +5391,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
-version = "1.0.202"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.202"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
@@ -5359,11 +5422,12 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.117"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -5441,9 +5505,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
[[package]]
name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -6590,6 +6654,12 @@ version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+[[package]]
+name = "unicode-id"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f"
+
[[package]]
name = "unicode-ident"
version = "1.0.11"
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
index cde886e9d5..0ef0cd1664 100644
--- a/frontend/rust-lib/Cargo.toml
+++ b/frontend/rust-lib/Cargo.toml
@@ -94,6 +94,7 @@ collab-document = { version = "0.2" }
collab-database = { version = "0.2" }
collab-plugins = { version = "0.2" }
collab-user = { version = "0.2" }
+collab-importer = { version = "0.1" }
yrs = "0.21.0"
validator = { version = "0.16.1", features = ["derive"] }
tokio-util = "0.7.11"
@@ -141,13 +142,14 @@ rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1710120
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9a07a19181a509b6c3237d71ac9bb602322ebe0b" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2af6d29503e214d957b6ea4fb56846289dbc9d8f" }
# Working directory: frontend
# To update the commit ID, run:
diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml
index 1e05603334..58261ca0d7 100644
--- a/frontend/rust-lib/flowy-core/Cargo.toml
+++ b/frontend/rust-lib/flowy-core/Cargo.toml
@@ -15,7 +15,7 @@ flowy-folder-pub = { workspace = true }
flowy-database2 = { workspace = true }
flowy-database-pub = { workspace = true }
flowy-sqlite = { workspace = true }
-flowy-document = { workspace = true }
+flowy-document = { workspace = true, features = ["verbose_log"] }
flowy-document-pub = { workspace = true }
flowy-error = { workspace = true }
flowy-server = { workspace = true, features = ["enable_supabase"] }
diff --git a/frontend/rust-lib/flowy-document/src/manager.rs b/frontend/rust-lib/flowy-document/src/manager.rs
index 3e42b3af8b..32cdbaf549 100644
--- a/frontend/rust-lib/flowy-document/src/manager.rs
+++ b/frontend/rust-lib/flowy-document/src/manager.rs
@@ -8,7 +8,6 @@ use collab::entity::EncodedCollab;
use collab::lock::RwLock;
use collab::preclude::Collab;
use collab_document::blocks::DocumentData;
-use collab_document::conversions::convert_document_to_plain_text;
use collab_document::document::Document;
use collab_document::document_awareness::DocumentAwarenessState;
use collab_document::document_awareness::DocumentAwarenessUser;
@@ -269,7 +268,7 @@ impl DocumentManager {
pub async fn get_document_text(&self, doc_id: &str) -> FlowyResult<String> {
let document = self.get_document(doc_id).await?;
let document = document.read().await;
- let text = convert_document_to_plain_text(&document)?;
+ let text = document.to_plain_text()?;
Ok(text)
}
diff --git a/frontend/rust-lib/flowy-storage/Cargo.toml b/frontend/rust-lib/flowy-storage/Cargo.toml
index ba451fb5ad..405faed1ba 100644
--- a/frontend/rust-lib/flowy-storage/Cargo.toml
+++ b/frontend/rust-lib/flowy-storage/Cargo.toml
@@ -27,6 +27,7 @@ dashmap.workspace = true
strum_macros = "0.25.2"
allo-isolate = { version = "^0.1", features = ["catch-unwind"] }
futures-util = "0.3.30"
+collab-importer = { workspace = true }
[dev-dependencies]
tokio = { workspace = true, features = ["full"] }
diff --git a/frontend/rust-lib/flowy-storage/src/manager.rs b/frontend/rust-lib/flowy-storage/src/manager.rs
index 1c8e3457a5..9fdbab1a2c 100644
--- a/frontend/rust-lib/flowy-storage/src/manager.rs
+++ b/frontend/rust-lib/flowy-storage/src/manager.rs
@@ -9,11 +9,12 @@ use crate::sqlite_sql::{
use crate::uploader::{FileUploader, FileUploaderRunner, Signal, UploadTask, UploadTaskQueue};
use allo_isolate::Isolate;
use async_trait::async_trait;
+use collab_importer::util::FileId;
use dashmap::DashMap;
use flowy_error::{ErrorCode, FlowyError, FlowyResult};
use flowy_sqlite::DBConnection;
use flowy_storage_pub::chunked_byte::{ChunkedBytes, MIN_CHUNK_SIZE};
-use flowy_storage_pub::cloud::{ObjectIdentity, ObjectValue, StorageCloudService};
+use flowy_storage_pub::cloud::StorageCloudService;
use flowy_storage_pub::storage::{
CompletedPartRequest, CreatedUpload, FileProgress, FileProgressReceiver, FileUploadState,
ProgressNotifier, StorageService, UploadPartResponse,
@@ -26,7 +27,7 @@ use std::path::{Path, PathBuf};
use std::sync::atomic::AtomicBool;
use std::sync::Arc;
use std::time::Duration;
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::io::AsyncWriteExt;
use tokio::sync::{broadcast, watch};
use tracing::{debug, error, info, instrument, trace};
@@ -457,7 +458,7 @@ async fn create_upload_record(
let content_type = mime_guess::from_path(&local_file_path)
.first_or_octet_stream()
.to_string();
- let file_id = format!("{}.{}", fxhash::hash(&chunked_bytes.data), ext);
+ let file_id = FileId::from_bytes(&chunked_bytes.data, ext);
let record = UploadFileTable {
workspace_id,
file_id,
@@ -800,32 +801,3 @@ async fn complete_upload(
}
Ok(())
}
-
-pub async fn object_from_disk(
- workspace_id: &str,
- local_file_path: &str,
-) -> Result<(ObjectIdentity, ObjectValue), FlowyError> {
- let ext = Path::new(local_file_path)
- .extension()
- .and_then(std::ffi::OsStr::to_str)
- .unwrap_or("")
- .to_owned();
- let mut file = tokio::fs::File::open(local_file_path).await?;
- let mut content = Vec::new();
- let n = file.read_to_end(&mut content).await?;
- info!("read {} bytes from file: {}", n, local_file_path);
- let mime = mime_guess::from_path(local_file_path).first_or_octet_stream();
- let hash = fxhash::hash(&content);
-
- Ok((
- ObjectIdentity {
- workspace_id: workspace_id.to_owned(),
- file_id: hash.to_string(),
- ext,
- },
- ObjectValue {
- raw: content.into(),
- mime,
- },
- ))
-}
diff --git a/frontend/rust-lib/flowy-storage/tests/multiple_part_upload_test.rs b/frontend/rust-lib/flowy-storage/tests/multiple_part_upload_test.rs
index 5b6b02e0aa..37047c0f21 100644
--- a/frontend/rust-lib/flowy-storage/tests/multiple_part_upload_test.rs
+++ b/frontend/rust-lib/flowy-storage/tests/multiple_part_upload_test.rs
@@ -1,3 +1,4 @@
+use collab_importer::util::FileId;
use flowy_sqlite::Database;
use flowy_storage::sqlite_sql::{
batch_select_upload_file, delete_upload_file, insert_upload_file, insert_upload_part,
@@ -162,7 +163,7 @@ pub async fn create_upload_file_record(
.to_string();
// Calculate file ID
- let file_id = fxhash::hash(&chunked_bytes.data).to_string();
+ let file_id = FileId::from_bytes(&chunked_bytes.data, "b".to_string());
// Create UploadFileTable record
UploadFileTable {
diff --git a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs
index 79650a2b09..4840554a87 100644
--- a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs
+++ b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs
@@ -522,7 +522,9 @@ where
);
mut_row_with_collab(imported_collab, |row_update| {
- row_update.set_row_id(RowId::from(new_row_id.clone()), new_database_id.clone());
+ row_update
+ .set_row_id(RowId::from(new_row_id.clone()))
+ .set_database_id(new_database_id.clone());
});
write_collab_object(
imported_collab,