[PR #4550] [MERGED] fix: potential dependency conflict #6304

New issue

Closed

opened 2026-03-23 22:22:37 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 22:22:37 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/4550
Author: @LucasXu0
Created: 1/30/2024
Status: ✅ Merged
Merged: 1/30/2024
Merged by: @LucasXu0

Base: main ← Head: fix_potential_dependency_conflict

📝 Commits (2)

d5e9994 fix: potential dependency conflict
b1de81d fix: ci issues

📊 Changes

31 files changed (+273 additions, -303 deletions)

View changed files

📝 frontend/appflowy_flutter/integration_test/document/document_text_direction_test.dart (+2 -2)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/custom_text_align_command.dart (+3 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart (+3 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_component.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_shortcut_event.dart (+5 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/context_menu/custom_context_menu.dart (+3 -3)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/copy_and_paste/custom_copy_command.dart (+1 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/copy_and_paste/custom_cut_command.dart (+1 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/copy_and_paste/custom_paste_command.dart (+1 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/inline_database_menu_item.dart (+4 -3)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/referenced_database_menu_item.dart (+4 -4)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/image_selection_menu.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/math_equation/math_equation_block_component.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/slash_menu_items.dart (+3 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/auto_completion_node_widget.dart (+2 -4)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_shortcut_event.dart (+1 -0)
📝 frontend/appflowy_flutter/lib/startup/tasks/supabase_task.dart (+17 -17)
📝 frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart (+8 -10)

...and 11 more files

📄 Description

Feature Preview

closes https://github.com/AppFlowy-IO/AppFlowy/issues/4549

upgrade supabase_flutter and appflowy_editor versions to resolve potential dependency conflicts.
upgrade the dependencies to their major versions.

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/4550 **Author:** [@LucasXu0](https://github.com/LucasXu0) **Created:** 1/30/2024 **Status:** ✅ Merged **Merged:** 1/30/2024 **Merged by:** [@LucasXu0](https://github.com/LucasXu0) **Base:** `main` ← **Head:** `fix_potential_dependency_conflict` --- ### 📝 Commits (2) - [`d5e9994`](https://github.com/AppFlowy-IO/AppFlowy/commit/d5e99945e1a58bcce3ca1bc19b4b20aa8adbfcfa) fix: potential dependency conflict - [`b1de81d`](https://github.com/AppFlowy-IO/AppFlowy/commit/b1de81d6258cf26423bcd8e74695f0b1fb4e8f22) fix: ci issues ### 📊 Changes **31 files changed** (+273 additions, -303 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/integration_test/document/document_text_direction_test.dart` (+2 -2) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/custom_text_align_command.dart` (+3 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart` (+3 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_component.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_shortcut_event.dart` (+5 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/context_menu/custom_context_menu.dart` (+3 -3) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/copy_and_paste/custom_copy_command.dart` (+1 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/copy_and_paste/custom_cut_command.dart` (+1 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/copy_and_paste/custom_paste_command.dart` (+1 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/inline_database_menu_item.dart` (+4 -3) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/referenced_database_menu_item.dart` (+4 -4) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/image_selection_menu.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/math_equation/math_equation_block_component.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/slash_menu_items.dart` (+3 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/auto_completion_node_widget.dart` (+2 -4) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_shortcut_event.dart` (+1 -0) 📝 `frontend/appflowy_flutter/lib/startup/tasks/supabase_task.dart` (+17 -17) 📝 `frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart` (+8 -10) _...and 11 more files_ </details> ### 📄 Description   ### Feature Preview closes https://github.com/AppFlowy-IO/AppFlowy/issues/4549 - upgrade supabase_flutter and appflowy_editor versions to resolve potential dependency conflicts. - upgrade the dependencies to their major versions.  ---  #### PR Checklist - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [ ] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [ ] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>