From d268e0e38d5a2abf8bf6d2dd84c0733a927bfd2c Mon Sep 17 00:00:00 2001 From: CI Bot Date: Sat, 18 Jul 2026 17:27:14 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E9=9B=86=E6=88=90=20eslint-config-pretti?= =?UTF-8?q?er=EF=BC=8C=E8=A7=A3=E5=86=B3=20ESLint=20=E4=B8=8E=20Prettier?= =?UTF-8?q?=20=E8=A7=84=E5=88=99=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/.eslintrc.cjs | 1 + apps/web/package.json | 1 + 2 files changed, 2 insertions(+) mode change 100644 => 100755 apps/web/.eslintrc.cjs diff --git a/apps/web/.eslintrc.cjs b/apps/web/.eslintrc.cjs old mode 100644 new mode 100755 index 5c754786b..e7e2c0c69 --- a/apps/web/.eslintrc.cjs +++ b/apps/web/.eslintrc.cjs @@ -8,6 +8,7 @@ module.exports = { "eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:react-hooks/recommended", + "prettier", // 关掉与 Prettier 冲突的 ESLint 规则 ], ignorePatterns: ["dist", ".eslintrc.cjs"], parser: "@typescript-eslint/parser", diff --git a/apps/web/package.json b/apps/web/package.json index 1c7e2a45d..5ec9b37a9 100755 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -41,6 +41,7 @@ "@vitejs/plugin-react": "^4.3.1", "@vitest/ui": "^1.6.0", "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-react-hooks": "^4.6.2", "eslint-plugin-react-refresh": "^0.4.7", "jsdom": "^24.1.0",