+
diff --git a/ui/package.json b/ui/package.json
index 28468695b..35b3e2ecd 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -19,15 +19,12 @@
"test:unit:coverage": "vitest run --coverage",
"typecheck": "vue-tsc --noEmit -p tsconfig.app.json --composite false && pnpm run typecheck:packages",
"lint": "eslint . --max-warnings=0 -f html -o build/lint-result/index.html",
- "prettier": "prettier --write \"./{src,uc-src,console-src}/**/*.{vue,js,jsx,ts,tsx,css,scss,json,yml,yaml,html}\" && pnpm run prettier:packages",
+ "prettier": "prettier . --write",
"typecheck:packages": "pnpm --parallel --filter \"./packages/**\" run typecheck",
- "prettier:packages": "pnpm --parallel --filter \"./packages/**\" prettier",
"test:unit:packages": "pnpm --parallel --filter \"./packages/**\" run test:unit"
},
"lint-staged": {
- "*.{vue,js,jsx,ts,tsx,css,scss,json,yml,yaml,html}": [
- "prettier --write"
- ],
+ "**/*": "prettier --write --ignore-unknown",
"*.{ts,mts,tsx,vue}": [
"eslint --fix --max-warnings=0"
]
@@ -35,6 +32,13 @@
"browserslist": [
"defaults"
],
+ "prettier": {
+ "plugins": [
+ "prettier-plugin-organize-imports",
+ "prettier-plugin-tailwindcss"
+ ],
+ "trailingComma": "es5"
+ },
"resolutions": {
"axios": "^1.7.9"
},
@@ -124,9 +128,9 @@
"@types/randomstring": "^1.1.8",
"@types/ua-parser-js": "^0.7.39",
"@typescript/native-preview": "7.0.0-dev.20250619.1",
- "@vitest/eslint-plugin": "^1.2.7",
"@vitejs/plugin-vue": "^6.0.0",
"@vitejs/plugin-vue-jsx": "^5.0.0",
+ "@vitest/eslint-plugin": "^1.2.7",
"@vitest/ui": "^3.1.4",
"@vue/compiler-sfc": "^3.5.16",
"@vue/eslint-config-prettier": "^10.2.0",
@@ -144,9 +148,9 @@
"npm-run-all": "^4.1.5",
"postcss": "^8.4.21",
"postcss-viewport-height-correction": "^1.1.1",
- "prettier": "^2.8.8",
+ "prettier": "^3.6.0",
"prettier-plugin-organize-imports": "^4.1.0",
- "prettier-plugin-tailwindcss": "^0.1.13",
+ "prettier-plugin-tailwindcss": "^0.6.13",
"rollup-plugin-gzip": "^3.1.0",
"sass-embedded": "^1.82.0",
"start-server-and-test": "^1.14.0",
diff --git a/ui/packages/api-client/.prettierrc.js b/ui/packages/api-client/.prettierrc.js
deleted file mode 100644
index 23ebaf45d..000000000
--- a/ui/packages/api-client/.prettierrc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- plugins: ["../../prettier.config.cjs"],
-};
diff --git a/ui/packages/api-client/README.md b/ui/packages/api-client/README.md
index 30c44a451..ff3cc91d5 100644
--- a/ui/packages/api-client/README.md
+++ b/ui/packages/api-client/README.md
@@ -14,8 +14,8 @@ import {
createConsoleApiClient,
createUcApiClient,
createPublicApiClient,
- axiosInstance
-} from "@halo-dev/api-client"
+ axiosInstance,
+} from "@halo-dev/api-client";
```
- **coreApiClient**: 为 Halo 所有自定义模型的 CRUD 接口封装的 api client。
@@ -37,11 +37,11 @@ pnpm install @halo-dev/api-client axios
由于已经在 Console 和 UC 项目中引入并设置好了 Axios 拦截器,所以直接使用即可:
```javascript
-import { coreApiClient } from "@halo-dev/api-client"
+import { coreApiClient } from "@halo-dev/api-client";
-coreApiClient.content.post.listPost().then(response => {
+coreApiClient.content.post.listPost().then((response) => {
// handle response
-})
+});
```
此外,在最新的 `@halo-dev/ui-plugin-bundler-kit@2.17.0` 中,已经排除了 `@halo-dev/api-client`、`axios` 依赖,所以最终产物中的相关依赖会自动使用 Halo 本身提供的依赖,无需关心最终产物大小。
@@ -55,15 +55,15 @@ pnpm install @halo-dev/api-client axios
```
```javascript
-import axios from "axios"
+import axios from "axios";
const axiosInstance = axios.create({
- baseURL: "http://localhost:8090"
-})
+ baseURL: "http://localhost:8090",
+});
-const coreApiClient = createCoreApiClient(axiosInstance)
+const coreApiClient = createCoreApiClient(axiosInstance);
-coreApiClient.content.post.listPost().then(response => {
+coreApiClient.content.post.listPost().then((response) => {
// handle response
-})
+});
```
diff --git a/ui/packages/api-client/entry/api-client.ts b/ui/packages/api-client/entry/api-client.ts
index ed994c7c2..5a4c34a09 100644
--- a/ui/packages/api-client/entry/api-client.ts
+++ b/ui/packages/api-client/entry/api-client.ts
@@ -34,6 +34,7 @@ import {
PersonalAccessTokenV1alpha1UcApi,
PluginV1alpha1Api,
PluginV1alpha1ConsoleApi,
+ PolicyAlpha1ConsoleApi,
PolicyTemplateV1alpha1Api,
PolicyV1alpha1Api,
PostV1alpha1Api,
@@ -63,10 +64,9 @@ import {
ThemeV1alpha1ConsoleApi,
TwoFactorAuthV1alpha1UcApi,
UserConnectionV1alpha1Api,
+ UserPreferenceV1alpha1UcApi,
UserV1alpha1Api,
UserV1alpha1ConsoleApi,
- UserPreferenceV1alpha1UcApi,
- PolicyAlpha1ConsoleApi,
} from "../src";
const defaultAxiosInstance = axios.create({
diff --git a/ui/packages/api-client/entry/index.ts b/ui/packages/api-client/entry/index.ts
index 56f3e8cf5..670787bbf 100644
--- a/ui/packages/api-client/entry/index.ts
+++ b/ui/packages/api-client/entry/index.ts
@@ -1,3 +1,2 @@
export * from "../src";
export * from "./api-client";
-
diff --git a/ui/packages/api-client/tsdown.config.ts b/ui/packages/api-client/tsdown.config.ts
index 33fb0662f..9f7500d3f 100644
--- a/ui/packages/api-client/tsdown.config.ts
+++ b/ui/packages/api-client/tsdown.config.ts
@@ -16,6 +16,6 @@ export default defineConfig({
minify: true,
exports: true,
dts: {
- tsgo: true
- }
+ tsgo: true,
+ },
});
diff --git a/ui/packages/components/.storybook/preview.ts b/ui/packages/components/.storybook/preview.ts
index e660a82a0..00ef6ee0f 100644
--- a/ui/packages/components/.storybook/preview.ts
+++ b/ui/packages/components/.storybook/preview.ts
@@ -1,7 +1,7 @@
import type { Preview } from "@storybook/vue3";
-import "../src/styles/tailwind.css";
import "overlayscrollbars/overlayscrollbars.css";
+import "../src/styles/tailwind.css";
const preview: Preview = {
parameters: {
diff --git a/ui/packages/components/env.d.ts b/ui/packages/components/env.d.ts
index 31748a509..26b22ce31 100644
--- a/ui/packages/components/env.d.ts
+++ b/ui/packages/components/env.d.ts
@@ -1,5 +1,3 @@
-
-
///
///
///
diff --git a/ui/packages/components/package.json b/ui/packages/components/package.json
index 6492c72fe..a57fbade5 100644
--- a/ui/packages/components/package.json
+++ b/ui/packages/components/package.json
@@ -18,7 +18,6 @@
"test:unit:ui": "vitest --watch --ui",
"test:unit:coverage": "vitest run --coverage",
"typecheck": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
- "prettier": "prettier --write './src/**/*.{vue,js,jsx,ts,tsx,css,scss,json,yml,yaml,html}'",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
},
diff --git a/ui/packages/components/prettier.config.js b/ui/packages/components/prettier.config.js
deleted file mode 100644
index 23ebaf45d..000000000
--- a/ui/packages/components/prettier.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- plugins: ["../../prettier.config.cjs"],
-};
diff --git a/ui/packages/components/src/components/alert/Alert.vue b/ui/packages/components/src/components/alert/Alert.vue
index dd75251ec..99a228826 100644
--- a/ui/packages/components/src/components/alert/Alert.vue
+++ b/ui/packages/components/src/components/alert/Alert.vue
@@ -76,58 +76,39 @@ const handleClose = () => {
diff --git a/ui/packages/components/src/components/avatar/AvatarGroup.vue b/ui/packages/components/src/components/avatar/AvatarGroup.vue
index 8b6573e29..d09db2e7c 100644
--- a/ui/packages/components/src/components/avatar/AvatarGroup.vue
+++ b/ui/packages/components/src/components/avatar/AvatarGroup.vue
@@ -21,10 +21,10 @@ provide(AvatarGroupContextInjectionKey, props);
diff --git a/ui/packages/components/src/components/card/Card.vue b/ui/packages/components/src/components/card/Card.vue
index b22b99cbe..f18c81539 100644
--- a/ui/packages/components/src/components/card/Card.vue
+++ b/ui/packages/components/src/components/card/Card.vue
@@ -27,26 +27,14 @@ defineProps<{
diff --git a/ui/packages/components/src/components/dialog/Dialog.vue b/ui/packages/components/src/components/dialog/Dialog.vue
index 14f399184..98645447b 100644
--- a/ui/packages/components/src/components/dialog/Dialog.vue
+++ b/ui/packages/components/src/components/dialog/Dialog.vue
@@ -90,22 +90,22 @@ const handleClose = () => {
:data-unique-id="uniqueId"
@close="handleCancel()"
>
-
+
-
{{ title }}
+
{{ title }}
-
diff --git a/ui/packages/components/src/components/dialog/index.ts b/ui/packages/components/src/components/dialog/index.ts
index 04c96459c..25a47b61b 100644
--- a/ui/packages/components/src/components/dialog/index.ts
+++ b/ui/packages/components/src/components/dialog/index.ts
@@ -1,2 +1,2 @@
-export { default as VDialog } from "./Dialog.vue";
export { Dialog } from "./dialog-manager";
+export { default as VDialog } from "./Dialog.vue";
diff --git a/ui/packages/components/src/components/dropdown/DropdownItem.vue b/ui/packages/components/src/components/dropdown/DropdownItem.vue
index 9b8a34923..8985982da 100644
--- a/ui/packages/components/src/components/dropdown/DropdownItem.vue
+++ b/ui/packages/components/src/components/dropdown/DropdownItem.vue
@@ -54,7 +54,7 @@ function onClick(e: MouseEvent) {
diff --git a/ui/packages/components/src/components/empty/Empty.vue b/ui/packages/components/src/components/empty/Empty.vue
index c32439320..0b2dec694 100644
--- a/ui/packages/components/src/components/empty/Empty.vue
+++ b/ui/packages/components/src/components/empty/Empty.vue
@@ -27,31 +27,18 @@ defineProps<{
diff --git a/ui/packages/components/src/components/entity/Entity.vue b/ui/packages/components/src/components/entity/Entity.vue
index de99944d7..d3cc8d088 100644
--- a/ui/packages/components/src/components/entity/Entity.vue
+++ b/ui/packages/components/src/components/entity/Entity.vue
@@ -61,7 +61,7 @@ const classes = computed(() => {
diff --git a/ui/packages/editor/src/components/block/BlockActionSeparator.vue b/ui/packages/editor/src/components/block/BlockActionSeparator.vue
index 3ae37fc71..27a6c4d49 100644
--- a/ui/packages/editor/src/components/block/BlockActionSeparator.vue
+++ b/ui/packages/editor/src/components/block/BlockActionSeparator.vue
@@ -4,7 +4,7 @@
diff --git a/ui/packages/editor/src/components/block/BlockCard.vue b/ui/packages/editor/src/components/block/BlockCard.vue
index 8d16184c5..4071535ab 100644
--- a/ui/packages/editor/src/components/block/BlockCard.vue
+++ b/ui/packages/editor/src/components/block/BlockCard.vue
@@ -41,7 +41,7 @@ function handleInsertNewLine() {
@@ -77,12 +77,11 @@ function handleInsertNewLine() {
@apply relative my-9;
&__content {
- @apply transition-all
- rounded;
+ @apply rounded transition-all;
}
&__actions {
- @apply p-1 flex flex-row rounded-lg border gap-0.5 items-center bg-gray-100 h-11 shadow-lg;
+ @apply flex h-11 flex-row items-center gap-0.5 rounded-lg border bg-gray-100 p-1 shadow-lg;
}
&:hover & {
diff --git a/ui/packages/editor/src/components/bubble/BubbleItem.vue b/ui/packages/editor/src/components/bubble/BubbleItem.vue
index 4bd355e2c..31068c57c 100644
--- a/ui/packages/editor/src/components/bubble/BubbleItem.vue
+++ b/ui/packages/editor/src/components/bubble/BubbleItem.vue
@@ -55,14 +55,14 @@ const handleBubbleItemClick = (editor: Editor) => {
}"
:class="{ 'bg-gray-200 !text-black': isActive({ editor }) }"
:title="title"
- class="text-gray-600 text-lg hover:bg-gray-100 p-2 rounded-md"
+ class="rounded-md p-2 text-lg text-gray-600 hover:bg-gray-100"
@click="handleBubbleItemClick(editor)"
>
-
+
diff --git a/ui/packages/editor/src/components/bubble/BubbleMenuPlugin.ts b/ui/packages/editor/src/components/bubble/BubbleMenuPlugin.ts
index 6366b9faa..72b895b0f 100644
--- a/ui/packages/editor/src/components/bubble/BubbleMenuPlugin.ts
+++ b/ui/packages/editor/src/components/bubble/BubbleMenuPlugin.ts
@@ -238,14 +238,14 @@ export class BubbleMenuView {
const placement = this.tippyOptions?.placement
? this.tippyOptions?.placement
: isNodeSelection(selection)
- ? ACTIVE_BUBBLE_MENUS.length > 1
- ? "bottom"
- : "top"
- : this.tippy?.props.fixed
- ? "bottom-start"
- : Math.abs(cursorAt - to) <= Math.abs(cursorAt - from)
- ? "bottom-start"
- : "top-start";
+ ? ACTIVE_BUBBLE_MENUS.length > 1
+ ? "bottom"
+ : "top"
+ : this.tippy?.props.fixed
+ ? "bottom-start"
+ : Math.abs(cursorAt - to) <= Math.abs(cursorAt - from)
+ ? "bottom-start"
+ : "top-start";
const otherBubbleMenus = ACTIVE_BUBBLE_MENUS.filter(
(instance) =>
@@ -258,8 +258,8 @@ export class BubbleMenuView {
let offsetY = otherBubbleMenus.length
? otherBubbleMenus.reduce((prev, instance, currentIndex, array) => {
const prevY = array[currentIndex - 1]
- ? array[currentIndex - 1]?.popperInstance?.state?.modifiersData
- ?.popperOffsets?.y ?? 0
+ ? (array[currentIndex - 1]?.popperInstance?.state?.modifiersData
+ ?.popperOffsets?.y ?? 0)
: 0;
const currentY =
instance?.popperInstance?.state?.modifiersData?.popperOffsets?.y ??
@@ -272,7 +272,7 @@ export class BubbleMenuView {
return prev;
}, 0)
- : offset?.[1] ?? 10;
+ : (offset?.[1] ?? 10);
if (!offsetY) {
offsetY = 10;
}
diff --git a/ui/packages/editor/src/components/common/ColorPickerDropdown.vue b/ui/packages/editor/src/components/common/ColorPickerDropdown.vue
index a56dcf882..ef86338ed 100644
--- a/ui/packages/editor/src/components/common/ColorPickerDropdown.vue
+++ b/ui/packages/editor/src/components/common/ColorPickerDropdown.vue
@@ -87,7 +87,7 @@ function onColorChange(color: Payload) {
v-for="item in getColors()"
:key="item.color"
:style="{ backgroundColor: item.color }"
- class="h-5 w-5 rounded-sm cursor-pointer hover:ring-1 ring-offset-1 ring-gray-300"
+ class="h-5 w-5 cursor-pointer rounded-sm ring-gray-300 ring-offset-1 hover:ring-1"
:title="item.name"
@click="handleSetColor(item.color)"
>
@@ -96,7 +96,7 @@ function onColorChange(color: Payload) {
diff --git a/ui/packages/editor/src/components/toolbar/ToolbarItem.vue b/ui/packages/editor/src/components/toolbar/ToolbarItem.vue
index da6712ddd..6118bc080 100644
--- a/ui/packages/editor/src/components/toolbar/ToolbarItem.vue
+++ b/ui/packages/editor/src/components/toolbar/ToolbarItem.vue
@@ -32,7 +32,7 @@ withDefaults(
{ 'cursor-not-allowed opacity-70': disabled },
{ 'hover:bg-gray-100': !disabled },
]"
- class="inline-flex items-center space-x-1 p-1.5 rounded-md"
+ class="inline-flex items-center space-x-1 rounded-md p-1.5"
:disabled="disabled"
tabindex="-1"
@click="action"
diff --git a/ui/packages/editor/src/components/toolbar/ToolbarSubItem.vue b/ui/packages/editor/src/components/toolbar/ToolbarSubItem.vue
index 29af42227..cd4f99a85 100644
--- a/ui/packages/editor/src/components/toolbar/ToolbarSubItem.vue
+++ b/ui/packages/editor/src/components/toolbar/ToolbarSubItem.vue
@@ -28,15 +28,15 @@ const action = () => {
diff --git a/ui/packages/editor/src/components/toolbox/ToolboxItem.vue b/ui/packages/editor/src/components/toolbox/ToolboxItem.vue
index 871b9e7e6..33c0e22e6 100644
--- a/ui/packages/editor/src/components/toolbox/ToolboxItem.vue
+++ b/ui/packages/editor/src/components/toolbox/ToolboxItem.vue
@@ -26,12 +26,12 @@ const action = () => {
{
diff --git a/ui/packages/editor/src/extensions/code-block/CodeBlockSelect.vue b/ui/packages/editor/src/extensions/code-block/CodeBlockSelect.vue
index 4fa724ac1..7dcc22168 100644
--- a/ui/packages/editor/src/extensions/code-block/CodeBlockSelect.vue
+++ b/ui/packages/editor/src/extensions/code-block/CodeBlockSelect.vue
@@ -151,17 +151,17 @@ const handleScrollIntoView = () => {
-
+
{
v-for="(option, index) in filterOptions"
:key="option.value"
:index="index"
- class="w-full h-8 flex items-center rounded-md text-base px-3 py-1 hover:bg-zinc-100"
+ class="flex h-8 w-full items-center rounded-md px-3 py-1 text-base hover:bg-zinc-100"
:class="{
'bg-zinc-200': option.value === value,
'bg-zinc-100': selectedIndex === index,
@@ -199,7 +199,7 @@ const handleScrollIntoView = () => {
No options
diff --git a/ui/packages/editor/src/extensions/code-block/CodeBlockViewRenderer.vue b/ui/packages/editor/src/extensions/code-block/CodeBlockViewRenderer.vue
index 631c0659c..048519325 100644
--- a/ui/packages/editor/src/extensions/code-block/CodeBlockViewRenderer.vue
+++ b/ui/packages/editor/src/extensions/code-block/CodeBlockViewRenderer.vue
@@ -97,19 +97,19 @@ const handleCopyCode = () => {
-
+
@@ -134,19 +134,19 @@ const handleCopyCode = () => {
>
-
diff --git a/ui/packages/editor/src/extensions/code-block/code-block.ts b/ui/packages/editor/src/extensions/code-block/code-block.ts
index 255534153..aca9e394d 100644
--- a/ui/packages/editor/src/extensions/code-block/code-block.ts
+++ b/ui/packages/editor/src/extensions/code-block/code-block.ts
@@ -19,10 +19,10 @@ import {
type Range,
} from "@/tiptap/vue-3";
import { deleteNode } from "@/utils";
+import TiptapCodeBlock from "@tiptap/extension-code-block";
import { markRaw } from "vue";
import MdiCodeBracesBox from "~icons/mdi/code-braces-box";
import CodeBlockViewRenderer from "./CodeBlockViewRenderer.vue";
-import TiptapCodeBlock from "@tiptap/extension-code-block";
declare module "@/tiptap" {
interface Commands
{
diff --git a/ui/packages/editor/src/extensions/code-block/index.ts b/ui/packages/editor/src/extensions/code-block/index.ts
index 07f0a6d41..1ab3dd1e8 100644
--- a/ui/packages/editor/src/extensions/code-block/index.ts
+++ b/ui/packages/editor/src/extensions/code-block/index.ts
@@ -1,2 +1,2 @@
-export { default as ExtensionCodeBlock } from "./code-block";
export * from "./code-block";
+export { default as ExtensionCodeBlock } from "./code-block";
diff --git a/ui/packages/editor/src/extensions/color/ColorBubbleItem.vue b/ui/packages/editor/src/extensions/color/ColorBubbleItem.vue
index d97836585..7f908ef2c 100644
--- a/ui/packages/editor/src/extensions/color/ColorBubbleItem.vue
+++ b/ui/packages/editor/src/extensions/color/ColorBubbleItem.vue
@@ -32,11 +32,11 @@ function handleUnsetColor() {
{{ i18n.global.t("editor.common.button.restore_default") }}
diff --git a/ui/packages/editor/src/extensions/color/ColorToolbarItem.vue b/ui/packages/editor/src/extensions/color/ColorToolbarItem.vue
index bb96c348b..f9839480b 100644
--- a/ui/packages/editor/src/extensions/color/ColorToolbarItem.vue
+++ b/ui/packages/editor/src/extensions/color/ColorToolbarItem.vue
@@ -42,11 +42,11 @@ function handleUnsetColor() {
{{ i18n.global.t("editor.common.button.restore_default") }}
diff --git a/ui/packages/editor/src/extensions/color/index.ts b/ui/packages/editor/src/extensions/color/index.ts
index 491ddbe70..76302374e 100644
--- a/ui/packages/editor/src/extensions/color/index.ts
+++ b/ui/packages/editor/src/extensions/color/index.ts
@@ -1,9 +1,9 @@
+import TextStyle from "@/extensions/text-style";
import { i18n } from "@/locales";
import type { Editor } from "@/tiptap/vue-3";
import type { ExtensionOptions } from "@/types";
import type { ColorOptions } from "@tiptap/extension-color";
import TiptapColor from "@tiptap/extension-color";
-import TextStyle from "@/extensions/text-style";
import { markRaw } from "vue";
import MdiFormatColor from "~icons/mdi/format-color";
import ColorToolbarItem from "./ColorToolbarItem.vue";
diff --git a/ui/packages/editor/src/extensions/commands-menu/CommandsView.vue b/ui/packages/editor/src/extensions/commands-menu/CommandsView.vue
index d8378cd06..fffae5336 100644
--- a/ui/packages/editor/src/extensions/commands-menu/CommandsView.vue
+++ b/ui/packages/editor/src/extensions/commands-menu/CommandsView.vue
@@ -95,7 +95,7 @@ defineExpose({
>
{{ i18n.global.t(item.title) }}
@@ -110,18 +110,10 @@ defineExpose({
diff --git a/ui/packages/editor/src/extensions/draggable/index.ts b/ui/packages/editor/src/extensions/draggable/index.ts
index e25754297..4c4015f62 100644
--- a/ui/packages/editor/src/extensions/draggable/index.ts
+++ b/ui/packages/editor/src/extensions/draggable/index.ts
@@ -376,8 +376,8 @@ const dropPoint = (doc: Node, pos: number, slice: Slice) => {
dep == $pos.depth
? 0
: $pos.pos <= ($pos.start(dep + 1) + $pos.end(dep + 1)) / 2
- ? -1
- : 1;
+ ? -1
+ : 1;
const insertPos = $pos.index(dep) + (bias > 0 ? 1 : 0);
const parent = $pos.node(dep);
let fits = false;
@@ -396,8 +396,8 @@ const dropPoint = (doc: Node, pos: number, slice: Slice) => {
return bias == 0
? $pos.pos
: bias < 0
- ? $pos.before(dep + 1)
- : $pos.after(dep + 1);
+ ? $pos.before(dep + 1)
+ : $pos.after(dep + 1);
}
}
}
diff --git a/ui/packages/editor/src/extensions/font-size/index.ts b/ui/packages/editor/src/extensions/font-size/index.ts
index d527d550f..ad1d98f56 100644
--- a/ui/packages/editor/src/extensions/font-size/index.ts
+++ b/ui/packages/editor/src/extensions/font-size/index.ts
@@ -1,7 +1,7 @@
import { ToolbarItem, ToolbarSubItem } from "@/components";
+import TextStyle from "@/extensions/text-style";
import { i18n } from "@/locales";
import { Extension, type Editor } from "@/tiptap/vue-3";
-import TextStyle from "@/extensions/text-style";
import { markRaw } from "vue";
import MdiFormatSize from "~icons/mdi/format-size";
diff --git a/ui/packages/editor/src/extensions/highlight/HighlightBubbleItem.vue b/ui/packages/editor/src/extensions/highlight/HighlightBubbleItem.vue
index 622e5086d..7d335bfd5 100644
--- a/ui/packages/editor/src/extensions/highlight/HighlightBubbleItem.vue
+++ b/ui/packages/editor/src/extensions/highlight/HighlightBubbleItem.vue
@@ -33,7 +33,7 @@ function handleUnsetColor() {
@@ -46,11 +46,11 @@ function handleUnsetColor() {
diff --git a/ui/packages/editor/src/extensions/highlight/HighlightToolbarItem.vue b/ui/packages/editor/src/extensions/highlight/HighlightToolbarItem.vue
index f54c351c9..8040a3d06 100644
--- a/ui/packages/editor/src/extensions/highlight/HighlightToolbarItem.vue
+++ b/ui/packages/editor/src/extensions/highlight/HighlightToolbarItem.vue
@@ -44,7 +44,7 @@ function handleUnsetColor() {
@@ -57,11 +57,11 @@ function handleUnsetColor() {