Merge branch 'dev' of https://github.com/RuanZhongNan/vercel-monorepo…

…-test into dev
ruan-cat · May 12, 2024 · 028b3e6 · 028b3e6
2 parents aa9f0bd + d545f14
commit 028b3e6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -133,3 +133,4 @@ dist
 .idea
 
 .vercel
+
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,8 @@
+# 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
@@ -0,0 +1,3 @@
+{
+  "prettier.ignorePath": "../.prettierignore"
+}
diff --git 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