diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs index e68d8a3e..94b0192a 100644 --- a/.lintstagedrc.mjs +++ b/.lintstagedrc.mjs @@ -1,4 +1,10 @@ export default { + '*.md': ['prettier --cache --ignore-unknown --write'], + '*.vue': [ + 'prettier --write', + 'eslint --cache --fix', + 'stylelint --fix --allow-empty-input', + ], '*.{js,jsx,ts,tsx}': [ 'prettier --cache --ignore-unknown --write', 'eslint --cache --fix', @@ -7,14 +13,8 @@ export default { 'prettier --cache --ignore-unknown --write', 'stylelint --fix --allow-empty-input', ], - '*.md': ['prettier --cache --ignore-unknown --write'], - '*.vue': [ - 'prettier --write', - 'eslint --cache --fix', - 'stylelint --fix --allow-empty-input', - ], + 'package.json': ['prettier --cache --write'], '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': [ 'prettier --cache --write--parser json', ], - 'package.json': ['prettier --cache --write'], }; diff --git a/apps/web-antd/src/adapter/component/index.ts b/apps/web-antd/src/adapter/component/index.ts index 370bcdf3..750c7936 100644 --- a/apps/web-antd/src/adapter/component/index.ts +++ b/apps/web-antd/src/adapter/component/index.ts @@ -4,13 +4,12 @@ */ import type { BaseFormComponentType } from '@vben/common-ui'; - import type { Component, SetupContext } from 'vue'; -import { h } from 'vue'; +import { Tinymce as RichTextarea } from '#/components/tinymce'; +import { FileUpload, ImageUpload } from '#/components/upload'; import { ApiComponent, globalShareState, IconPicker } from '@vben/common-ui'; import { $t } from '@vben/locales'; - import { AutoComplete, Button, @@ -35,9 +34,7 @@ import { TreeSelect, Upload, } from 'ant-design-vue'; - -import { Tinymce as RichTextarea } from '#/components/tinymce'; -import { FileUpload, ImageUpload } from '#/components/upload'; +import { h } from 'vue'; const withDefaultPlaceholder = ( component: T, diff --git a/apps/web-antd/src/locales/index.ts b/apps/web-antd/src/locales/index.ts index 11fad689..ddb3022f 100644 --- a/apps/web-antd/src/locales/index.ts +++ b/apps/web-antd/src/locales/index.ts @@ -1,8 +1,6 @@ import type { LocaleSetupOptions, SupportedLanguagesType } from '@vben/locales'; import type { Locale } from 'ant-design-vue/es/locale'; - import type { App } from 'vue'; -import { ref } from 'vue'; import { $t, @@ -10,10 +8,10 @@ import { loadLocalesMapFromDir, } from '@vben/locales'; import { preferences } from '@vben/preferences'; - import antdEnLocale from 'ant-design-vue/es/locale/en_US'; import antdDefaultLocale from 'ant-design-vue/es/locale/zh_CN'; import dayjs from 'dayjs'; +import { ref } from 'vue'; const antdLocale = ref(antdDefaultLocale); diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue index fadfc917..9bd90fc8 100644 --- a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue +++ b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue @@ -1,11 +1,8 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarImage.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarImage.vue index bac84a5c..787eeeb7 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarImage.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarImage.vue @@ -1,5 +1,7 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/avatar.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/avatar.ts index b9964155..8aae81f4 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/avatar.ts +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/avatar.ts @@ -1,4 +1,6 @@ -import { cva, type VariantProps } from 'class-variance-authority'; +import type { VariantProps } from 'class-variance-authority'; + +import { cva } from 'class-variance-authority'; export const avatarVariant = cva( 'inline-flex items-center justify-center font-normal text-foreground select-none shrink-0 bg-secondary overflow-hidden', diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/badge/Badge.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/badge/Badge.vue index 729dc9dc..818d4045 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/badge/Badge.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/badge/Badge.vue @@ -1,7 +1,9 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuItem.vue index ed11878d..b45bfc7c 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuItem.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuItem.vue @@ -1,14 +1,9 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioGroup.vue index bfed356d..b757dd51 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioGroup.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioGroup.vue @@ -1,11 +1,11 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue index 9a8d7396..d1733069 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue @@ -1,19 +1,16 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenu.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenu.vue index 6a4328e6..12c20692 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenu.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenu.vue @@ -1,10 +1,7 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuItem.vue index 3aac6678..21910436 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuItem.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuItem.vue @@ -1,13 +1,9 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/label/Label.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/label/Label.vue index a4169355..65db6631 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/label/Label.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/label/Label.vue @@ -1,9 +1,9 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroup.vue index 35c48701..0f47e4ac 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroup.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroup.vue @@ -1,14 +1,9 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectLabel.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectLabel.vue index 59842686..f8308daf 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectLabel.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectLabel.vue @@ -1,7 +1,8 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollDownButton.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollDownButton.vue index 9aa28b08..0231b59c 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollDownButton.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollDownButton.vue @@ -1,14 +1,10 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/separator/Separator.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/separator/Separator.vue index cf6ca4a7..ffa15994 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/separator/Separator.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/separator/Separator.vue @@ -1,9 +1,9 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue index e15c60f9..33388b0a 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue @@ -1,17 +1,13 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts index 5fd114fd..badf3114 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts @@ -1,4 +1,6 @@ -import { cva, type VariantProps } from 'class-variance-authority'; +import type { VariantProps } from 'class-variance-authority'; + +import { cva } from 'class-variance-authority'; export const sheetVariants = cva( 'bg-background shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 border-border', diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue index 6a28899d..462fe2dd 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue @@ -1,15 +1,9 @@ diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipTrigger.vue index 2aa3794f..ead771e7 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipTrigger.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipTrigger.vue @@ -1,5 +1,7 @@ diff --git a/packages/@core/ui-kit/tabs-ui/src/use-tabs-drag.ts b/packages/@core/ui-kit/tabs-ui/src/use-tabs-drag.ts index db4b7ce8..4693509e 100644 --- a/packages/@core/ui-kit/tabs-ui/src/use-tabs-drag.ts +++ b/packages/@core/ui-kit/tabs-ui/src/use-tabs-drag.ts @@ -1,15 +1,11 @@ +import type { Sortable } from '@vben-core/composables'; import type { EmitType } from '@vben-core/typings'; import type { TabsProps } from './types'; +import { useIsMobile, useSortable } from '@vben-core/composables'; import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'; -import { - type Sortable, - useIsMobile, - useSortable, -} from '@vben-core/composables'; - // 可能会找到拖拽的子元素,这里需要确保拖拽的dom时tab元素 function findParentElement(element: HTMLElement) { const parentCls = 'group'; diff --git a/packages/effects/common-ui/package.json b/packages/effects/common-ui/package.json index dbaf628e..2575d92d 100644 --- a/packages/effects/common-ui/package.json +++ b/packages/effects/common-ui/package.json @@ -29,7 +29,6 @@ "@codemirror/theme-one-dark": "^6.1.2", "@vben-core/form-ui": "workspace:*", "@vben-core/popup-ui": "workspace:*", - "@vben-core/preferences": "workspace:*", "@vben-core/shadcn-ui": "workspace:*", "@vben-core/shared": "workspace:*", "@vben/constants": "workspace:*", diff --git a/packages/effects/common-ui/src/components/api-component/api-component.vue b/packages/effects/common-ui/src/components/api-component/api-component.vue index d1d42ad7..51435316 100644 --- a/packages/effects/common-ui/src/components/api-component/api-component.vue +++ b/packages/effects/common-ui/src/components/api-component/api-component.vue @@ -1,12 +1,11 @@