diff --git a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts index faedc690b..d4fd0bb8c 100644 --- a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts +++ b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts @@ -24,33 +24,28 @@ export async function perfectionist(): Promise { { customGroups: { type: { - 'type-adapter': ['^#/adapter/.+'], - 'type-api': ['^#/api/.+'], - 'type-others': ['.*'], + 'vben-core-type': ['^@vben-core/.+'], + 'vben-type': ['^@vben/.+'], + 'vue-type': ['^vue$', '^vue-.+', '^@vue/.+'], }, value: { - 'ui-common': ['^@vben/common-ui'], - 'ui-antd': ['^ant-design-vue'], - 'ui-icons': ['^@vben/icons'], - 'local-components': ['^\\./modules/.+\\.vue$', '^\\./components/.+\\.vue$'], - 'other-components': ['^#/components/.+'], - 'utils-locale': ['^#/locales'], - 'vue-core': ['^vue$'], - 'utils-adapter': ['^#/adapter/.+'], - 'utils-api': ['^#/api/system/.+', '^#/api/.+'], - 'utils-functions': ['^#/utils/.+'], - 'local-data': ['^\\./data$', '^\\./data.ts$'], + vben: ['^@vben/.+'], + 'vben-core': ['^@vben-core/.+'], + vue: ['^vue$', '^vue-.+', '^@vue/.+'], }, }, environment: 'node', groups: [ - ['type-adapter', 'type-api', 'type-others', 'external-type', 'builtin-type', 'type', 'parent-type', 'sibling-type', 'index-type', 'internal-type'], - - ['ui-common', 'ui-antd', 'ui-icons', 'local-components', 'other-components'], - - ['utils-locale', 'vue-core', 'utils-adapter', 'utils-api', 'utils-functions', 'local-data'], - + ['external-type', 'builtin-type', 'type'], + 'vue-type', + 'vben-type', + 'vben-core-type', + ['parent-type', 'sibling-type', 'index-type'], + ['internal-type'], 'builtin', + 'vue', + 'vben', + 'vben-core', 'external', 'internal', ['parent', 'sibling', 'index'], diff --git a/internal/lint-configs/prettier-config/index.mjs b/internal/lint-configs/prettier-config/index.mjs index 91416aa10..f6a20c8b4 100644 --- a/internal/lint-configs/prettier-config/index.mjs +++ b/internal/lint-configs/prettier-config/index.mjs @@ -10,7 +10,7 @@ export default { }, ], plugins: ['prettier-plugin-tailwindcss'], - printWidth: 120, + printWidth: 80, proseWrap: 'never', semi: true, singleQuote: true,