瀏覽代碼

chore: close eslint object sorting (#6101)

Vben 1 周之前
父節點
當前提交
17a18fc9ba

+ 1 - 1
apps/web-antd/src/adapter/component/index.ts

@@ -73,8 +73,8 @@ const withDefaultPlaceholder = <T extends Component>(
   componentProps: Recordable<any> = {},
 ) => {
   return defineComponent({
-    inheritAttrs: false,
     name: component.name,
+    inheritAttrs: false,
     setup: (props: any, { attrs, expose, slots }) => {
       const placeholder =
         props?.placeholder ||

+ 1 - 1
apps/web-ele/src/adapter/component/index.ts

@@ -130,8 +130,8 @@ const withDefaultPlaceholder = <T extends Component>(
   componentProps: Recordable<any> = {},
 ) => {
   return defineComponent({
-    inheritAttrs: false,
     name: component.name,
+    inheritAttrs: false,
     setup: (props: any, { attrs, expose, slots }) => {
       const placeholder =
         props?.placeholder ||

+ 1 - 1
apps/web-naive/src/adapter/component/index.ts

@@ -76,8 +76,8 @@ const withDefaultPlaceholder = <T extends Component>(
   componentProps: Recordable<any> = {},
 ) => {
   return defineComponent({
-    inheritAttrs: false,
     name: component.name,
+    inheritAttrs: false,
     setup: (props: any, { attrs, expose, slots }) => {
       const placeholder =
         props?.placeholder ||

+ 1 - 1
internal/lint-configs/eslint-config/src/configs/perfectionist.ts

@@ -70,7 +70,7 @@ export async function perfectionist(): Promise<Linter.Config[]> {
           },
         ],
         'perfectionist/sort-objects': [
-          'error',
+          'off',
           {
             customGroups: {
               items: 'items',

+ 7 - 0
internal/lint-configs/eslint-config/src/custom-config.ts

@@ -28,6 +28,13 @@ const customConfig: Linter.Config[] = [
       'perfectionist/sort-objects': 'off',
     },
   },
+  {
+    files: ['**/**.vue'],
+    ignores: restrictedImportIgnores,
+    rules: {
+      'perfectionist/sort-objects': 'off',
+    },
+  },
   {
     // apps内部的一些基础规则
     files: ['apps/**/**'],

+ 1 - 1
packages/@core/ui-kit/form-ui/src/use-vben-form.ts

@@ -31,8 +31,8 @@ export function useVbenForm<
         h(VbenUseForm, { ...props, ...attrs, formApi: extendedApi }, slots);
     },
     {
-      inheritAttrs: false,
       name: 'VbenUseForm',
+      inheritAttrs: false,
     },
   );
   // Add reactivity support

+ 4 - 2
packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts

@@ -64,9 +64,10 @@ export function useVbenDrawer<
             slots,
           );
       },
+      // eslint-disable-next-line vue/one-component-per-file
       {
-        inheritAttrs: false,
         name: 'VbenParentDrawer',
+        inheritAttrs: false,
       },
     );
     return [Drawer, extendedApi as ExtendedDrawerApi] as const;
@@ -105,9 +106,10 @@ export function useVbenDrawer<
       return () =>
         h(VbenDrawer, { ...props, ...attrs, drawerApi: extendedApi }, slots);
     },
+    // eslint-disable-next-line vue/one-component-per-file
     {
-      inheritAttrs: false,
       name: 'VbenDrawer',
+      inheritAttrs: false,
     },
   );
   injectData.extendApi?.(extendedApi);

+ 4 - 2
packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts

@@ -63,9 +63,10 @@ export function useVbenModal<TParentModalProps extends ModalProps = ModalProps>(
             slots,
           );
       },
+      // eslint-disable-next-line vue/one-component-per-file
       {
-        inheritAttrs: false,
         name: 'VbenParentModal',
+        inheritAttrs: false,
       },
     );
     return [Modal, extendedApi as ExtendedModalApi] as const;
@@ -112,9 +113,10 @@ export function useVbenModal<TParentModalProps extends ModalProps = ModalProps>(
           slots,
         );
     },
+    // eslint-disable-next-line vue/one-component-per-file
     {
-      inheritAttrs: false,
       name: 'VbenModal',
+      inheritAttrs: false,
     },
   );
   injectData.extendApi?.(extendedApi);

+ 0 - 1
packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue

@@ -12,7 +12,6 @@ interface Props extends TabsProps {}
 
 defineOptions({
   name: 'VbenTabsChrome',
-  // eslint-disable-next-line perfectionist/sort-objects
   inheritAttrs: false,
 });
 

+ 1 - 1
packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue

@@ -12,7 +12,7 @@ interface Props extends TabsProps {}
 
 defineOptions({
   name: 'VbenTabs',
-  // eslint-disable-next-line perfectionist/sort-objects
+
   inheritAttrs: false,
 });
 const props = withDefaults(defineProps<Props>(), {

+ 2 - 1
packages/effects/layouts/src/widgets/language-toggle.vue

@@ -12,7 +12,8 @@ defineOptions({
   name: 'LanguageToggle',
 });
 
-async function handleUpdate(value: string) {
+async function handleUpdate(value: string | undefined) {
+  if (!value) return;
   const locale = value as SupportedLanguagesType;
   updatePreferences({
     app: {

+ 2 - 1
packages/effects/layouts/src/widgets/layout-toggle.vue

@@ -39,7 +39,8 @@ const menus = computed((): VbenDropdownMenuItem[] => [
 
 const { authPanelCenter, authPanelLeft, authPanelRight } = usePreferences();
 
-function handleUpdate(value: string) {
+function handleUpdate(value: string | undefined) {
+  if (!value) return;
   updatePreferences({
     app: {
       authPageLayout: value as AuthPageLayoutType,

+ 1 - 1
packages/effects/layouts/src/widgets/theme-toggle/theme-toggle.vue

@@ -25,7 +25,7 @@ withDefaults(defineProps<{ shouldOnHover?: boolean }>(), {
   shouldOnHover: false,
 });
 
-function handleChange(isDark: boolean) {
+function handleChange(isDark: boolean | undefined) {
   updatePreferences({
     theme: { mode: isDark ? 'dark' : 'light' },
   });

+ 1 - 1
playground/src/adapter/component/index.ts

@@ -73,8 +73,8 @@ const withDefaultPlaceholder = <T extends Component>(
   componentProps: Recordable<any> = {},
 ) => {
   return defineComponent({
-    inheritAttrs: false,
     name: component.name,
+    inheritAttrs: false,
     setup: (props: any, { attrs, expose, slots }) => {
       const placeholder =
         props?.placeholder ||

文件差異過大導致無法顯示
+ 264 - 126
pnpm-lock.yaml


+ 17 - 17
pnpm-workspace.yaml

@@ -21,22 +21,22 @@ catalog:
   '@commitlint/cli': ^19.8.0
   '@commitlint/config-conventional': ^19.8.0
   '@ctrl/tinycolor': ^4.1.0
-  '@eslint/js': ^9.25.1
+  '@eslint/js': ^9.26.0
   '@faker-js/faker': ^9.7.0
-  '@iconify/json': ^2.2.332
+  '@iconify/json': ^2.2.334
   '@iconify/tailwind': ^1.2.0
-  '@iconify/vue': ^4.3.0
+  '@iconify/vue': ^5.0.0
   '@intlify/core-base': ^11.1.3
   '@intlify/unplugin-vue-i18n': ^6.0.8
   '@jspm/generator': ^2.5.1
-  '@manypkg/get-packages': ^2.2.2
+  '@manypkg/get-packages': ^3.0.0
   '@nolebase/vitepress-plugin-git-changelog': ^2.17.0
   '@playwright/test': ^1.52.0
   '@pnpm/workspace.read-manifest': ^1000.1.4
   '@stylistic/stylelint-plugin': ^3.1.2
   '@tailwindcss/nesting': 0.0.0-insiders.565cd3e
   '@tailwindcss/typography': ^0.5.16
-  '@tanstack/vue-query': ^5.74.7
+  '@tanstack/vue-query': ^5.75.1
   '@tanstack/vue-store': ^0.7.0
   '@types/archiver': ^6.0.3
   '@types/eslint': ^9.6.1
@@ -46,14 +46,14 @@ catalog:
   '@types/lodash.get': ^4.4.9
   '@types/lodash.isequal': ^4.5.8
   '@types/lodash.set': ^4.3.9
-  '@types/node': ^22.15.2
+  '@types/node': ^22.15.3
   '@types/nprogress': ^0.2.3
   '@types/postcss-import': ^14.0.3
   '@types/qrcode': ^1.5.5
   '@types/qs': ^6.9.18
   '@types/sortablejs': ^1.15.8
-  '@typescript-eslint/eslint-plugin': ^8.31.0
-  '@typescript-eslint/parser': ^8.31.0
+  '@typescript-eslint/eslint-plugin': ^8.31.1
+  '@typescript-eslint/parser': ^8.31.1
   '@vee-validate/zod': ^4.15.0
   '@vite-pwa/vitepress': ^1.0.0
   '@vitejs/plugin-vue': ^5.2.3
@@ -88,7 +88,7 @@ catalog:
   dotenv: ^16.5.0
   echarts: ^5.6.0
   element-plus: ^2.9.9
-  eslint: ^9.25.1
+  eslint: ^9.26.0
   eslint-config-turbo: ^2.5.2
   eslint-plugin-command: ^3.2.0
   eslint-plugin-eslint-comments: ^3.2.0
@@ -103,13 +103,13 @@ catalog:
   eslint-plugin-unicorn: ^59.0.0
   eslint-plugin-unused-imports: ^4.1.4
   eslint-plugin-vitest: ^0.5.4
-  eslint-plugin-vue: ^10.0.0
+  eslint-plugin-vue: ^10.1.0
   execa: ^9.5.2
   find-up: ^7.0.0
   get-port: ^7.1.0
   globals: ^16.0.0
   h3: ^1.15.3
-  happy-dom: ^17.4.4
+  happy-dom: ^17.4.6
   html-minifier-terser: ^7.2.0
   husky: ^9.1.7
   is-ci: ^4.1.0
@@ -120,7 +120,7 @@ catalog:
   lodash.get: ^4.4.2
   lodash.set: ^4.3.2
   lodash.isequal: ^4.5.0
-  lucide-vue-next: ^0.503.0
+  lucide-vue-next: ^0.507.0
   medium-zoom: ^1.1.0
   naive-ui: ^2.41.0
   nitropack: ^2.11.11
@@ -144,7 +144,7 @@ catalog:
   radix-vue: ^1.9.17
   resolve.exports: ^2.0.3
   rimraf: ^6.0.1
-  rollup: ^4.40.0
+  rollup: ^4.40.1
   rollup-plugin-visualizer: ^5.14.0
   sass: ^1.87.0
   secure-ls: ^2.0.0
@@ -168,7 +168,7 @@ catalog:
   unbuild: ^3.5.0
   unplugin-element-plus: ^0.10.0
   vee-validate: ^4.15.0
-  vite: ^6.3.3
+  vite: ^6.3.4
   vite-plugin-compression: ^0.5.1
   vite-plugin-dts: ^4.5.3
   vite-plugin-html: ^3.2.2
@@ -184,9 +184,9 @@ catalog:
   vue-json-viewer: ^3.0.4
   vue-router: ^4.5.1
   vue-tippy: ^6.7.0
-  vue-tsc: 2.1.10
-  vxe-pc-ui: ^4.5.14
-  vxe-table: ^4.13.14
+  vue-tsc: 2.2.10
+  vxe-pc-ui: ^4.5.35
+  vxe-table: ^4.13.16
   watermark-js-plus: ^1.6.0
   zod: ^3.24.3
   zod-defaults: ^0.1.3

部分文件因文件數量過多而無法顯示