From d768581f0ab915450fc125bdec976d440f35e93d Mon Sep 17 00:00:00 2001
From: cruldra <cruldra@gmail.com>
Date: Fri, 4 Apr 2025 17:24:06 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Typescript/=E9=9B=86?=
 =?UTF-8?q?=E6=88=90eslint=E5=92=8Cprettier2.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Typescript/集成eslint和prettier2.patch | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 Typescript/集成eslint和prettier2.patch

diff --git a/Typescript/集成eslint和prettier2.patch b/Typescript/集成eslint和prettier2.patch
new file mode 100644
index 0000000..c8b54c7
--- /dev/null
+++ b/Typescript/集成eslint和prettier2.patch
@@ -0,0 +1,46 @@
+diff --git a/eslint.config.mjs b/eslint.config.mjs
+index a7be3cf..d1eb034 100644
+--- a/eslint.config.mjs
++++ b/eslint.config.mjs
+@@ -2,17 +2,10 @@
+ 
+ import eslint from '@eslint/js';
+ import tseslint from 'typescript-eslint';
+-import prettier from 'eslint-plugin-prettier';
++import prettierConfig from 'eslint-config-prettier';
+ 
+ export default tseslint.config(
+   eslint.configs.recommended,
+   tseslint.configs.recommended,
+-  {
+-    plugins: {
+-      prettier,
+-    },
+-    rules: {
+-      'prettier/prettier': 'error',
+-    },
+-  }
++  prettierConfig
+ );
+\ No newline at end of file
+diff --git a/package.json b/package.json
+index 30b1f40..7bc29f9 100644
+--- a/package.json
++++ b/package.json
+@@ -12,7 +12,7 @@
+     "tauri:dev": "tauri dev",
+     "tauri:build": "tauri build",
+     "format": "prettier --write \"{src,tests}/**/*.{js,jsx,ts,tsx}\"",
+-     "prepare": "husky install"
++    "prepare": "husky install"
+   },
+   "dependencies": {
+     "@emotion/react": "^11.14.0",
+@@ -57,6 +57,7 @@
+     "@unocss/reset": "^65.4.3",
+     "@vitejs/plugin-react": "^4.3.4",
+     "eslint": "^9.23.0",
++    "eslint-config-prettier": "^10.1.1",
+     "eslint-plugin-prettier": "^5.2.6",
+     "husky": "^9.1.7",
+     "lint-staged": "^15.5.0",