diff --git a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts index d4fd0bb8c9ef531d0668f488f83f33660b2f5661..faedc690b2e9f046bbfd30bc8b7aafe7770909ab 100644 --- a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts +++ b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts @@ -24,28 +24,33 @@ export async function perfectionist(): Promise { { customGroups: { type: { - 'vben-core-type': ['^@vben-core/.+'], - 'vben-type': ['^@vben/.+'], - 'vue-type': ['^vue$', '^vue-.+', '^@vue/.+'], + 'type-adapter': ['^#/adapter/.+'], + 'type-api': ['^#/api/.+'], + 'type-others': ['.*'], }, value: { - vben: ['^@vben/.+'], - 'vben-core': ['^@vben-core/.+'], - vue: ['^vue$', '^vue-.+', '^@vue/.+'], + '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$'], }, }, environment: 'node', groups: [ - ['external-type', 'builtin-type', 'type'], - 'vue-type', - 'vben-type', - 'vben-core-type', - ['parent-type', 'sibling-type', 'index-type'], - ['internal-type'], + ['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'], + '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 f6a20c8b4b6a413759421dea99b007e86d743bd9..91416aa10d642cd54e7eee5bbe8d972a10162e5b 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: 80, + printWidth: 120, proseWrap: 'never', semi: true, singleQuote: true,