diff --git a/frontend/appflowy_flutter/lib/features/share_tab/presentation/share_tab.dart b/frontend/appflowy_flutter/lib/features/share_tab/presentation/share_tab.dart index 68444a78a9..e54af3b695 100644 --- a/frontend/appflowy_flutter/lib/features/share_tab/presentation/share_tab.dart +++ b/frontend/appflowy_flutter/lib/features/share_tab/presentation/share_tab.dart @@ -86,7 +86,7 @@ class _ShareTabState extends State { final isFullAccess = accessLevel == ShareAccessLevel.fullAccess; String tooltip = ''; if (!widget.isInProPlan) { - tooltip = 'Please upgrade to Pro plan to invite guests'; + tooltip = LocaleKeys.shareTab_upgradeToProToInviteGuests.tr(); } else if (!isFullAccess) { tooltip = LocaleKeys.shareTab_onlyFullAccessCanInvite.tr(); } @@ -232,7 +232,7 @@ class _ShareTabState extends State { message = LocaleKeys.shareTab_emailAlreadyInList.tr(); break; case ErrorCode.FreePlanGuestLimitExceeded: - message = LocaleKeys.shareTab_upgradeToProToInviteGuests.tr(); + message = LocaleKeys.shareTab_upgradeToProToInviteMoreGuests.tr(); break; case ErrorCode.PaidPlanGuestLimitExceeded: message = LocaleKeys.shareTab_maxGuestsReached.tr(); diff --git a/frontend/appflowy_flutter/lib/features/share_tab/presentation/widgets/people_with_access_section.dart b/frontend/appflowy_flutter/lib/features/share_tab/presentation/widgets/people_with_access_section.dart index 643743ef8c..6a11484cfe 100644 --- a/frontend/appflowy_flutter/lib/features/share_tab/presentation/widgets/people_with_access_section.dart +++ b/frontend/appflowy_flutter/lib/features/share_tab/presentation/widgets/people_with_access_section.dart @@ -1,8 +1,10 @@ import 'package:appflowy/features/share_tab/data/models/models.dart'; import 'package:appflowy/features/share_tab/presentation/widgets/access_level_list_widget.dart'; import 'package:appflowy/features/share_tab/presentation/widgets/shared_user_widget.dart'; +import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy_ui/appflowy_ui.dart'; import 'package:collection/collection.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; class PeopleWithAccessSectionCallbacks { @@ -53,7 +55,7 @@ class PeopleWithAccessSection extends StatelessWidget { ); return AFMenuSection( - title: 'People with access', + title: LocaleKeys.shareTab_peopleWithAccess.tr(), constraints: BoxConstraints( maxHeight: 240, ), diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/shared_section.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/shared_section.dart index 5617462bb5..633d9fb7f8 100644 --- a/frontend/appflowy_flutter/lib/features/shared_section/presentation/shared_section.dart +++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/shared_section.dart @@ -99,13 +99,13 @@ class SharedSection extends StatelessWidget { // show a dialog to confirm the action await showConfirmDialog( context: context, - title: 'Remove your own access', + title: LocaleKeys.shareTab_removeYourOwnAccess.tr(), titleStyle: theme.textStyle.body.standard( color: theme.textColorScheme.primary, ), description: '', style: ConfirmPopupStyle.cancelAndOk, - confirmLabel: 'Remove', + confirmLabel: LocaleKeys.button_remove.tr(), onConfirm: (_) { context.read().add( SharedSectionEvent.leaveSharedPage( diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_empty.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_empty.dart index dfc3906b2b..0e8944ff14 100644 --- a/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_empty.dart +++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_empty.dart @@ -1,5 +1,7 @@ import 'package:appflowy/generated/flowy_svgs.g.dart'; +import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy_ui/appflowy_ui.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; import 'package:flutter/material.dart'; @@ -19,7 +21,7 @@ class SharedSectionEmpty extends StatelessWidget { ), const VSpace(12), Text( - 'Nothing shared with you', + LocaleKeys.shareTab_nothingSharedWithYou.tr(), style: theme.textStyle.heading3.enhanced( color: theme.textColorScheme.secondary, ), @@ -27,7 +29,7 @@ class SharedSectionEmpty extends StatelessWidget { ), const VSpace(4), Text( - 'Pages shared with you will show here', + LocaleKeys.shareTab_pagesSharedWithYouWillShowHere.tr(), style: theme.textStyle.heading4.standard( color: theme.textColorScheme.tertiary, ), diff --git a/frontend/appflowy_flutter/lib/startup/tasks/debug_task.dart b/frontend/appflowy_flutter/lib/startup/tasks/debug_task.dart index 6864289e73..352c896e24 100644 --- a/frontend/appflowy_flutter/lib/startup/tasks/debug_task.dart +++ b/frontend/appflowy_flutter/lib/startup/tasks/debug_task.dart @@ -1,5 +1,4 @@ import 'package:appflowy/startup/startup.dart'; -import 'package:appflowy_backend/dispatch/dispatch.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -42,7 +41,7 @@ class DebugTask extends LaunchTask { ); // enable rust request tracing - Dispatch.enableTracing = true; + // Dispatch.enableTracing = true; } } } diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart index 50b45ad1c7..45eb658c7a 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart @@ -653,7 +653,7 @@ class _SingleInnerViewItemState extends State { final accessLevel = context.read().state.accessLevel; if (accessLevel == ShareAccessLevel.readOnly) { - return icon; + return SizedBox(width: 16.0, child: icon); } final Widget child = AppFlowyPopover( diff --git a/frontend/resources/translations/en-US.json b/frontend/resources/translations/en-US.json index 2ae8cdf044..306aaa40d7 100644 --- a/frontend/resources/translations/en-US.json +++ b/frontend/resources/translations/en-US.json @@ -3435,7 +3435,7 @@ "onlyFullAccessCanInvite": "Only user with full access can invite others", "invitationSent": "Invitation sent", "emailAlreadyInList": "The email is already in the list", - "upgradeToProToInviteGuests": "Please upgrade to a Pro plan to invite more guests", + "upgradeToProToInviteMoreGuests": "Please upgrade to a Pro plan to invite more guests", "maxGuestsReached": "You have reached the maximum number of guests", "removedGuestSuccessfully": "Removed guest successfully", "updatedAccessLevelSuccessfully": "Updated access level successfully", @@ -3459,7 +3459,11 @@ "member": "Some invitees are outside your workspace. To invite them as guests, please contact your workspace owner to upgrade to the Pro plan.", "guest": "Some invitees are outside your workspace. To invite them as guests, please contact your workspace owner to upgrade to the Pro plan." } - } + }, + "upgradeToProToInviteGuests": "Please upgrade to Pro plan to invite guests", + "removeYourOwnAccess": "Remove your own access", + "nothingSharedWithYou": "Nothing shared with you", + "pagesSharedWithYouWillShowHere": "Pages shared with you will show here" }, "shareSection": { "shared": "Shared with me" diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 26e24f48d3..180cc96fc5 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -163,7 +163,7 @@ checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "bincode", @@ -174,7 +174,6 @@ dependencies = [ "serde_repr", "thiserror 1.0.64", "tokio", - "tokio-tungstenite", "tsify", "url", "uuid", @@ -184,7 +183,7 @@ dependencies = [ [[package]] name = "appflowy-ai-client" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "bytes", @@ -196,23 +195,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "appflowy-proto" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" -dependencies = [ - "bytes", - "collab", - "collab-entity", - "prost 0.13.5", - "prost-build 0.13.5", - "protoc-bin-vendored", - "serde", - "serde_repr", - "thiserror 2.0.12", - "uuid", -] - [[package]] name = "arbitrary" version = "1.3.2" @@ -878,12 +860,11 @@ dependencies = [ [[package]] name = "client-api" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "again", "anyhow", "app-error", - "appflowy-proto", "arc-swap", "async-trait", "base64 0.22.1", @@ -893,10 +874,8 @@ dependencies = [ "client-api-entity", "client-websocket", "collab", - "collab-plugins", "collab-rt-entity", "collab-rt-protocol", - "dashmap 5.5.3", "futures", "futures-core", "futures-util", @@ -911,7 +890,6 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.13.5", - "rand 0.8.5", "rayon", "reqwest 0.12.15", "scraper 0.17.1", @@ -920,7 +898,6 @@ dependencies = [ "serde_json", "serde_urlencoded", "shared-entity", - "smallvec", "thiserror 1.0.64", "tokio", "tokio-retry", @@ -938,7 +915,7 @@ dependencies = [ [[package]] name = "client-api-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "collab-entity", "collab-rt-entity", @@ -951,7 +928,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "futures-channel", "futures-util", @@ -994,7 +971,7 @@ dependencies = [ [[package]] name = "collab" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "arc-swap", @@ -1002,7 +979,6 @@ dependencies = [ "bincode", "bytes", "chrono", - "fastrand", "js-sys", "lazy_static", "serde", @@ -1020,7 +996,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "async-trait", @@ -1060,7 +1036,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "arc-swap", @@ -1081,14 +1057,14 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "bytes", "collab", "getrandom 0.2.10", "prost 0.13.5", - "prost-build 0.12.3", + "prost-build", "protoc-bin-vendored", "serde", "serde_json", @@ -1101,7 +1077,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "arc-swap", @@ -1123,7 +1099,7 @@ dependencies = [ [[package]] name = "collab-importer" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "async-recursion", @@ -1159,10 +1135,34 @@ dependencies = [ "zip 0.6.6", ] +[[package]] +name = "collab-integrate" +version = "0.1.0" +dependencies = [ + "anyhow", + "arc-swap", + "collab", + "collab-database", + "collab-document", + "collab-entity", + "collab-folder", + "collab-plugins", + "collab-user", + "flowy-ai-pub", + "flowy-error", + "lib-infra", + "serde", + "serde_json", + "tokio", + "tracing", + "twox-hash", + "uuid", +] + [[package]] name = "collab-plugins" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "async-stream", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "bincode", @@ -1210,7 +1210,7 @@ dependencies = [ "collab-rt-protocol", "database-entity", "prost 0.13.5", - "prost-build 0.12.3", + "prost-build", "protoc-bin-vendored", "serde", "serde_repr", @@ -1221,7 +1221,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "async-trait", @@ -1239,7 +1239,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7351662938af9c5271b08393b9c7468ec2d37bc0#7351662938af9c5271b08393b9c7468ec2d37bc0" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4dfccef#4dfccefb9e4fd35240107b93fb4b5966295b452e" dependencies = [ "anyhow", "collab", @@ -1293,7 +1293,7 @@ checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ "futures-core", "prost 0.12.3", - "prost-types 0.12.3", + "prost-types", "tonic", "tracing-core", ] @@ -1310,7 +1310,7 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost-types 0.12.3", + "prost-types", "serde", "serde_json", "thread_local", @@ -1586,6 +1586,7 @@ dependencies = [ "allo-isolate", "byteorder", "bytes", + "collab-integrate", "crossbeam-utils", "flowy-codegen", "flowy-core", @@ -1647,7 +1648,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "bincode", "bytes", @@ -1993,7 +1994,6 @@ dependencies = [ name = "event-integration-test" version = "0.1.0" dependencies = [ - "anyhow", "assert-json-diff", "bytes", "chrono", @@ -2002,8 +2002,6 @@ dependencies = [ "collab-document", "collab-entity", "collab-folder", - "collab-plugins", - "csv", "flowy-ai", "flowy-ai-pub", "flowy-core", @@ -2258,6 +2256,7 @@ dependencies = [ "client-api", "flowy-error", "flowy-sqlite", + "flowy-user-pub", "futures", "lib-infra", "serde", @@ -2313,6 +2312,7 @@ dependencies = [ "collab-document", "collab-entity", "collab-folder", + "collab-integrate", "collab-plugins", "console-subscriber", "dashmap 6.0.1", @@ -2338,6 +2338,7 @@ dependencies = [ "flowy-user", "flowy-user-pub", "futures", + "futures-core", "lib-dispatch", "lib-infra", "lib-log", @@ -2381,6 +2382,7 @@ dependencies = [ "collab", "collab-database", "collab-entity", + "collab-integrate", "collab-plugins", "csv", "dashmap 6.0.1", @@ -2392,7 +2394,6 @@ dependencies = [ "flowy-derive", "flowy-error", "flowy-notification", - "flowy-user-pub", "futures", "indexmap 2.9.0", "lazy_static", @@ -2457,6 +2458,7 @@ dependencies = [ "collab", "collab-document", "collab-entity", + "collab-integrate", "collab-plugins", "dashmap 6.0.1", "flowy-codegen", @@ -2465,7 +2467,6 @@ dependencies = [ "flowy-error", "flowy-notification", "flowy-storage-pub", - "flowy-user-pub", "futures", "getrandom 0.2.10", "indexmap 2.9.0", @@ -2539,6 +2540,7 @@ dependencies = [ "collab", "collab-entity", "collab-folder", + "collab-integrate", "dashmap 6.0.1", "flowy-codegen", "flowy-derive", @@ -2597,7 +2599,6 @@ dependencies = [ "lib-dispatch", "protobuf", "serde", - "serde_json", "tokio", "tokio-util", "tracing", @@ -2809,6 +2810,7 @@ dependencies = [ "collab-document", "collab-entity", "collab-folder", + "collab-integrate", "collab-plugins", "collab-user", "dashmap 6.0.1", @@ -2850,19 +2852,12 @@ dependencies = [ name = "flowy-user-pub" version = "0.1.0" dependencies = [ - "anyhow", - "arc-swap", "base64 0.21.5", "chrono", "client-api", "collab", - "collab-database", - "collab-document", "collab-entity", "collab-folder", - "collab-plugins", - "collab-user", - "flowy-ai-pub", "flowy-error", "flowy-folder-pub", "flowy-sqlite", @@ -3197,7 +3192,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "getrandom 0.2.10", @@ -3212,7 +3207,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "app-error", "jsonwebtoken", @@ -3905,17 +3900,15 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "bytes", "futures", "pin-project", - "rayon", "reqwest 0.12.15", "serde", "serde_json", - "thiserror 2.0.12", "tokio", "tracing", "validator 0.19.0", @@ -5486,33 +5479,13 @@ dependencies = [ "petgraph", "prettyplease", "prost 0.12.3", - "prost-types 0.12.3", + "prost-types", "regex", "syn 2.0.94", "tempfile", "which", ] -[[package]] -name = "prost-build" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" -dependencies = [ - "heck 0.5.0", - "itertools 0.13.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.13.5", - "prost-types 0.13.5", - "regex", - "syn 2.0.94", - "tempfile", -] - [[package]] name = "prost-derive" version = "0.12.3" @@ -5533,7 +5506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.94", @@ -5548,15 +5521,6 @@ dependencies = [ "prost 0.12.3", ] -[[package]] -name = "prost-types" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" -dependencies = [ - "prost 0.13.5", -] - [[package]] name = "protobuf" version = "2.28.0" @@ -6907,7 +6871,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "app-error", @@ -7027,9 +6991,6 @@ name = "smallvec" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" -dependencies = [ - "serde", -] [[package]] name = "socket2" @@ -8965,7 +8926,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=55bed00#55bed00bdeb0aa24129ada5c486beb6f9d4e6d15" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=592f644#592f644a24beb159d45f25a4cabc34621ef7382c" dependencies = [ "anyhow", "async-trait", @@ -9050,9 +9011,9 @@ dependencies = [ [[package]] name = "yrs" -version = "0.23.4" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1d740a98b12112352f05ddfc06c1505b66fca116601f9388b84be45d21f84d" +checksum = "81de5913bca29f43a1d12ca92a7b39a2945e9420e01602a7563917c7bfc60f70" dependencies = [ "arc-swap", "async-lock", @@ -9063,7 +9024,7 @@ dependencies = [ "serde_json", "smallstr", "smallvec", - "thiserror 2.0.12", + "thiserror 1.0.64", ] [[package]] diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index 8552118735..3835319328 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -110,9 +110,9 @@ flowy-sqlite-vec = { path = "flowy-sqlite-vec" } # Run the script.add_workspace_members: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "55bed00" } -client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "55bed00" } -workspace-template = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "55bed00" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "592f644" } +client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "592f644" } +workspace-template = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "592f644" } [profile.dev] opt-level = 0