From 5e28c6db0c1d95e7d82077426afcd2b31528e384 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Wed, 25 Jun 2025 17:47:21 +0800 Subject: [PATCH] chore: update prettier and simplify config (#7589) #### What type of PR is this? /area ui /kind cleanup #### What this PR does / why we need it: Upgrade Prettier and related plugins, and simplify Prettier configuration. Now, formatting for all packages will be managed by Prettier in the project root directory. #### Does this PR introduce a user-facing change? ```release-note None ``` --- ui/.prettierignore | 3 +- ui/README.md | 4 +- .../comments/components/CommentListItem.vue | 8 +- .../comments/components/OwnerButton.vue | 2 +- .../comments/components/ReplyDetailModal.vue | 2 +- .../comments/components/ReplyFormItems.vue | 2 +- .../comments/components/ReplyListItem.vue | 4 +- .../contents/pages/DeletedSinglePageList.vue | 4 +- .../components/entity-fields/CoverField.vue | 4 +- .../contents/posts/DeletedPostList.vue | 4 +- .../components/CategoryListItem.vue | 4 +- .../components/entity-fields/CoverField.vue | 4 +- .../modules/dashboard/DashboardDesigner.vue | 2 +- .../dashboard/components/ActionButton.vue | 2 +- .../dashboard/components/WidgetCard.vue | 10 +- .../components/WidgetEditableItem.vue | 2 +- .../dashboard/components/WidgetHubModal.vue | 36 ++++--- .../widgets/presets/comments/CommentItem.vue | 10 +- .../presets/core/iframe/IframeWidget.vue | 4 +- .../core/quick-action/QuickActionWidget.vue | 4 +- .../presets/core/stack/StackWidget.vue | 12 +-- .../core/stack/StackWidgetConfigModal.vue | 6 +- .../core/stack/components/IndexIndicator.vue | 10 +- .../stack/components/WidgetEditableItem.vue | 2 +- .../core/stack/components/WidgetViewItem.vue | 2 +- .../modules/interface/menus/Menus.vue | 4 +- .../users/components/GrantPermissionModal.vue | 4 +- .../system/users/components/RolesView.vue | 2 +- ui/index.html | 2 +- ui/package.json | 20 ++-- ui/packages/api-client/.prettierrc.js | 3 - ui/packages/api-client/README.md | 22 ++--- ui/packages/api-client/entry/api-client.ts | 4 +- ui/packages/api-client/entry/index.ts | 1 - ui/packages/api-client/tsdown.config.ts | 4 +- ui/packages/components/.storybook/preview.ts | 2 +- ui/packages/components/env.d.ts | 2 - ui/packages/components/package.json | 1 - ui/packages/components/prettier.config.js | 3 - .../components/src/components/alert/Alert.vue | 47 +++------ .../src/components/avatar/Avatar.vue | 18 ++-- .../src/components/avatar/AvatarGroup.vue | 4 +- .../components/src/components/card/Card.vue | 22 +---- .../description/DescriptionItem.vue | 2 +- .../src/components/dialog/Dialog.vue | 10 +- .../components/src/components/dialog/index.ts | 2 +- .../src/components/dropdown/DropdownItem.vue | 4 +- .../components/src/components/empty/Empty.vue | 21 +--- .../src/components/entity/Entity.vue | 8 +- .../src/components/entity/EntityField.vue | 8 +- .../src/components/menu/MenuItem.vue | 17 +--- .../components/src/components/modal/Modal.vue | 62 ++---------- .../src/components/pagination/Pagination.vue | 12 +-- .../components/src/components/space/Space.vue | 3 +- .../src/components/status/StatusDot.vue | 2 +- .../src/components/switch/Switch.vue | 32 +------ .../components/src/components/tabs/Tabbar.vue | 82 +++------------- .../components/src/components/tabs/index.ts | 2 +- .../components/src/components/tag/Tag.vue | 25 +---- .../components/src/components/toast/Toast.vue | 12 +-- .../components/src/stories/Introduction.mdx | 32 ++++--- ui/packages/components/vite.config.ts | 6 +- ui/packages/components/vitest.config.ts | 2 +- ui/packages/editor/index.html | 2 +- ui/packages/editor/package.json | 1 - ui/packages/editor/prettier.config.js | 3 - ui/packages/editor/src/components/Editor.vue | 6 +- .../src/components/EditorBubbleMenu.vue | 2 +- .../editor/src/components/EditorHeader.vue | 12 +-- .../components/block/BlockActionButton.vue | 2 +- .../src/components/block/BlockActionInput.vue | 2 +- .../components/block/BlockActionSeparator.vue | 2 +- .../editor/src/components/block/BlockCard.vue | 7 +- .../src/components/bubble/BubbleItem.vue | 6 +- .../src/components/bubble/BubbleMenuPlugin.ts | 22 ++--- .../components/common/ColorPickerDropdown.vue | 4 +- .../src/components/toolbar/ToolbarItem.vue | 2 +- .../src/components/toolbar/ToolbarSubItem.vue | 8 +- .../src/components/toolbox/ToolboxItem.vue | 4 +- .../editor/src/extensions/audio/AudioView.vue | 4 +- .../extensions/audio/BubbleItemAudioLink.vue | 2 +- .../extensions/code-block/CodeBlockSelect.vue | 10 +- .../code-block/CodeBlockViewRenderer.vue | 18 ++-- .../src/extensions/code-block/code-block.ts | 2 +- .../editor/src/extensions/code-block/index.ts | 2 +- .../src/extensions/color/ColorBubbleItem.vue | 4 +- .../src/extensions/color/ColorToolbarItem.vue | 4 +- .../editor/src/extensions/color/index.ts | 2 +- .../extensions/commands-menu/CommandsView.vue | 23 ++--- .../editor/src/extensions/draggable/index.ts | 8 +- .../editor/src/extensions/font-size/index.ts | 2 +- .../highlight/HighlightBubbleItem.vue | 6 +- .../highlight/HighlightToolbarItem.vue | 6 +- .../iframe/BubbleItemIframeLink.vue | 2 +- .../src/extensions/iframe/IframeView.vue | 4 +- .../extensions/image/BubbleItemImageAlt.vue | 2 +- .../extensions/image/BubbleItemImageHref.vue | 8 +- .../extensions/image/BubbleItemImageLink.vue | 2 +- .../editor/src/extensions/image/ImageView.vue | 10 +- ui/packages/editor/src/extensions/index.ts | 4 +- .../src/extensions/link/LinkBubbleButton.vue | 14 +-- .../range-selection/range-selection.ts | 5 +- .../search-and-replace/SearchAndReplace.vue | 42 ++++---- .../editor/src/extensions/table/util.ts | 94 +++++++++--------- .../extensions/video/BubbleItemVideoLink.vue | 2 +- .../extensions/video/BubbleItemVideoSize.vue | 2 +- .../editor/src/extensions/video/VideoView.vue | 6 +- ui/packages/editor/src/styles/base.scss | 2 +- .../editor/src/styles/format-brush.scss | 3 +- ui/packages/editor/vite.lib.config.ts | 10 +- ui/packages/shared/package.json | 1 - ui/packages/shared/prettier.config.js | 3 - ui/packages/shared/src/types/plugin.ts | 6 +- .../ui-plugin-bundler-kit/.prettierrc.cjs | 3 - ui/packages/ui-plugin-bundler-kit/README.md | 30 +++--- .../src/constants/externals.ts | 2 +- .../ui-plugin-bundler-kit/src/index.ts | 2 +- .../ui-plugin-bundler-kit/src/legacy.ts | 2 +- .../ui-plugin-bundler-kit/src/rsbuild.ts | 6 +- .../src/utils/halo-plugin.ts | 2 +- ui/packages/ui-plugin-bundler-kit/src/vite.ts | 6 +- ui/pnpm-lock.yaml | 96 +++++++++++++++---- ui/pnpm-workspace.yaml | 2 +- ui/prettier.config.cjs | 6 -- .../attachment/AttachmentPermalinkList.vue | 2 +- .../EditorProviderSelector.vue | 2 +- ui/src/components/form/AnnotationsForm.vue | 34 ++++--- .../global-search/GlobalSearchModal.vue | 6 +- ui/src/components/user-avatar/UserAvatar.vue | 2 +- ui/src/formkit/inputs/secret/SecretSelect.vue | 4 +- .../secret/components/SecretCreationModal.vue | 11 ++- .../secret/components/SecretEditModal.vue | 11 ++- ui/src/formkit/inputs/select/SelectMain.vue | 5 +- ui/tsconfig.node.json | 1 + .../posts/components/PostListItem.vue | 4 +- .../modules/notifications/Notifications.vue | 8 +- .../profile/tabs/PersonalAccessTokens.vue | 2 +- ui/uc-src/modules/profile/tabs/TwoFactor.vue | 2 +- 138 files changed, 587 insertions(+), 720 deletions(-) delete mode 100644 ui/packages/api-client/.prettierrc.js delete mode 100644 ui/packages/components/prettier.config.js delete mode 100644 ui/packages/editor/prettier.config.js delete mode 100644 ui/packages/shared/prettier.config.js delete mode 100644 ui/packages/ui-plugin-bundler-kit/.prettierrc.cjs delete mode 100644 ui/prettier.config.cjs diff --git a/ui/.prettierignore b/ui/.prettierignore index 3909f451c..00f2944be 100644 --- a/ui/.prettierignore +++ b/ui/.prettierignore @@ -1,2 +1,3 @@ pnpm-lock.yaml -packages/api-client +packages/api-client/src +docs \ No newline at end of file diff --git a/ui/README.md b/ui/README.md index 97533c506..e60bbf4c4 100644 --- a/ui/README.md +++ b/ui/README.md @@ -16,7 +16,7 @@ Gitpod ready-to-code

------------------------------- +--- 当前仓库已经将 `halo-admin` 改为了 `console`。但对于 Halo 1.x 版本,依旧保持 halo-admin 的概念。 @@ -27,7 +27,7 @@ npm install -g pnpm@9 ``` ```bash -pnpm install +pnpm install ``` ```bash diff --git a/ui/console-src/modules/contents/comments/components/CommentListItem.vue b/ui/console-src/modules/contents/comments/components/CommentListItem.vue index 1250c12fe..0b1ab81f8 100644 --- a/ui/console-src/modules/contents/comments/components/CommentListItem.vue +++ b/ui/console-src/modules/contents/comments/components/CommentListItem.vue @@ -286,13 +286,13 @@ const { operationItems } = useOperationItemExtensionPoint( :owner="comment?.owner" @click="detailModalVisible = true" /> - + {{ $t("core.comment.text.commented_on") }} {{ subjectRefResult.title }} @@ -311,7 +311,7 @@ const { operationItems } = useOperationItemExtensionPoint( >
{{ @@ -328,7 +328,7 @@ const { operationItems } = useOperationItemExtensionPoint( /> {{ $t("core.comment.operations.reply.button") }} diff --git a/ui/console-src/modules/contents/comments/components/OwnerButton.vue b/ui/console-src/modules/contents/comments/components/OwnerButton.vue index b4214177d..4af266426 100644 --- a/ui/console-src/modules/contents/comments/components/OwnerButton.vue +++ b/ui/console-src/modules/contents/comments/components/OwnerButton.vue @@ -8,7 +8,7 @@ defineProps<{