From 2c1e643ab9d12153f440cbe94acb69c7b7a9023c Mon Sep 17 00:00:00 2001 From: layhuts Date: Wed, 5 Aug 2026 11:10:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4lint=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用核心 no-nested-ternary 规则替代 Unicorn 自动修复,避免嵌套三元表达式被错误加括号 调整 oxlint、oxfmt、eslint 和 stylelint 的执行顺序,保证commit与format流程一致 --- .../lint-configs/oxlint-config/src/configs/javascript.ts | 2 ++ internal/lint-configs/oxlint-config/src/configs/unicorn.ts | 3 ++- scripts/vsh/src/lint/index.ts | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/lint-configs/oxlint-config/src/configs/javascript.ts b/internal/lint-configs/oxlint-config/src/configs/javascript.ts index 89784dc3..2b75d9bc 100644 --- a/internal/lint-configs/oxlint-config/src/configs/javascript.ts +++ b/internal/lint-configs/oxlint-config/src/configs/javascript.ts @@ -28,6 +28,8 @@ const javascript: OxlintConfig = { 'default-case-last': 'error', eqeqeq: ['error', 'always'], 'eslint/no-unreachable': 'error', + // 抛出嵌套三元运算格式错误,禁止使用嵌套三元运算。 + 'no-nested-ternary': 'error', 'new-cap': [ 'error', { diff --git a/internal/lint-configs/oxlint-config/src/configs/unicorn.ts b/internal/lint-configs/oxlint-config/src/configs/unicorn.ts index 4b52d340..bc141baf 100644 --- a/internal/lint-configs/oxlint-config/src/configs/unicorn.ts +++ b/internal/lint-configs/oxlint-config/src/configs/unicorn.ts @@ -43,7 +43,8 @@ const unicorn: OxlintConfig = { 'unicorn/no-magic-array-flat-depth': 'error', 'unicorn/no-negated-condition': 'error', 'unicorn/no-negation-in-equality-check': 'error', - 'unicorn/no-nested-ternary': 'error', + // 禁止通过“添加括号”自动修复嵌套三元运算 + 'unicorn/no-nested-ternary': 'off', 'unicorn/no-new-array': 'error', 'unicorn/no-new-buffer': 'error', 'unicorn/no-object-as-default-parameter': 'error', diff --git a/scripts/vsh/src/lint/index.ts b/scripts/vsh/src/lint/index.ts index 5661a97e..e19c8f6f 100644 --- a/scripts/vsh/src/lint/index.ts +++ b/scripts/vsh/src/lint/index.ts @@ -112,17 +112,17 @@ async function runLint({ format, threads }: LintCommandOptions) { if (format) { await runSerial([ - ['stylelint', ['**/*.{vue,css,less,scss}', '--cache', '--fix']], - ['oxfmt', [threadsArg]], ['oxlint', ['--fix', '--type-aware', threadsArg]], + ['oxfmt', [threadsArg]], ['eslint', ['.', '--cache', '--fix']], + ['stylelint', ['**/*.{vue,css,less,scss}', '--cache', '--fix']], ]); return; } const commands: Command[] = [ - ['oxfmt', ['--check', threadsArg]], ['oxlint', ['--type-aware', threadsArg]], + ['oxfmt', ['--check', threadsArg]], ['eslint', ['.', '--cache']], ['stylelint', ['**/*.{vue,css,less,scss}', '--cache']], ];