From 00712c279ddb1ed4ec42fda57fd5535c429b1319 Mon Sep 17 00:00:00 2001
From: ruan-cat <1219043956@qq.com>
Date: Fri, 10 May 2024 17:43:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20config:=20=E6=96=B0?=
=?UTF-8?q?=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.prettierignore | 7 +++++++
.vscode/settings.json | 0
2 files changed, 7 insertions(+)
create mode 100644 .prettierignore
create mode 100644 .vscode/settings.json
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..57a7617
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,7 @@
+# https://prettier.io/docs/en/ignore.html#ignoring-files-prettierignore
+
+# 忽略掉全部的json文件
+# **/*.json
+
+tsconfig.json
+tsconfig.{*}.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..e69de29
From 953c7add47bc2876e55bd945b4e4c1269b1c29fd Mon Sep 17 00:00:00 2001
From: ruan-cat <1219043956@qq.com>
Date: Fri, 10 May 2024 17:46:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=A4=94=20save-file:=20=E6=AD=A3?=
=?UTF-8?q?=E5=9C=A8=E7=BB=83=E4=B9=A0=E5=BF=BD=E7=95=A5=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 +++
.prettierignore | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index b54518a..57b75fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,6 @@ dist
.idea
.vercel
+
+# tsconfig.json
+# tsconfig.[*].json
diff --git a/.prettierignore b/.prettierignore
index 57a7617..462d6a9 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,7 +1,7 @@
# https://prettier.io/docs/en/ignore.html#ignoring-files-prettierignore
# 忽略掉全部的json文件
-# **/*.json
+**/*.json
-tsconfig.json
-tsconfig.{*}.json
+# !tsconfig.json
+# !tsconfig.[*].json
From 7fcb256c30e6d685c82f8e69e428ae1303e9aa85 Mon Sep 17 00:00:00 2001
From: ruan-cat <1219043956@qq.com>
Date: Fri, 10 May 2024 19:31:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20config:=20=E6=8F=90?=
=?UTF-8?q?=E4=BE=9B=E9=85=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 2 --
.prettierignore | 9 +++++----
.vscode/settings.json | 3 +++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 57b75fc..ff1c47e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,5 +134,3 @@ dist
.vercel
-# tsconfig.json
-# tsconfig.[*].json
diff --git a/.prettierignore b/.prettierignore
index 462d6a9..596562a 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,7 +1,8 @@
# https://prettier.io/docs/en/ignore.html#ignoring-files-prettierignore
-# 忽略掉全部的json文件
-**/*.json
+# 全部的json文件 都默认不忽略 都要做格式化
+!**/*.json
+
+# 全部以tsconfig开头的 尾缀为json的配置文件 都被忽略
+tsconfig*.json
-# !tsconfig.json
-# !tsconfig.[*].json
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e69de29..fd772c5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "prettier.ignorePath": "../.prettierignore"
+}
\ No newline at end of file
From d545f143f626c41dad0a78bc4c77e73829a06787 Mon Sep 17 00:00:00 2001
From: ruan-cat <1219043956@qq.com>
Date: Fri, 10 May 2024 19:42:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=94=A7=20build:=20pnpm=20-w=20up=20pr?=
=?UTF-8?q?ettier@latest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
pnpm-lock.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 958f690..1621df8 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"@vuepress/bundler-vite": "2.0.0-rc.9",
"cpx2": "^7.0.1",
"markdown-it": "^14.1.0",
- "prettier": "^2.8.8",
+ "prettier": "^3.2.5",
"rimraf": "^5.0.5",
"vue": "^3.4.26",
"vuepress": "2.0.0-rc.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 998e8dc..f51601d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
specifier: ^14.1.0
version: 14.1.0
prettier:
- specifier: ^2.8.8
- version: 2.8.8
+ specifier: ^3.2.5
+ version: 3.2.5
rimraf:
specifier: ^5.0.5
version: 5.0.5
@@ -2434,9 +2434,9 @@ packages:
source-map-js: 1.2.0
dev: true
- /prettier@2.8.8:
- resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
- engines: {node: '>=10.13.0'}
+ /prettier@3.2.5:
+ resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+ engines: {node: '>=14'}
hasBin: true
dev: true