From e1699c4851f6ca397cd0ad1ff63f32c737654836 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 02 Apr 2025 19:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 .prettierrc.json |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index 53cd5bc..aaa321c 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,9 +1,24 @@
 {
-  "printWidth": 120,
+  "printWidth": 100,
   "tabWidth": 2,
-  "semi": true,
+  "semi": false,
   "singleAttributePerLine": false,
   "bracketSpacing": true,
   "singleQuote": true,
-  "arrowParens": "avoid"
-}
+  "arrowParens": "avoid",
+  "endOfLine": "crlf",
+  "bracketSameLine": false,
+  "proseWrap": "preserve",
+  "useTabs": true,
+  "trailingComma": "es5",
+  "overrides": [
+    {
+      "files": "*.scss",
+      "options": {
+        "parser": "scss",
+        "tabWidth": 4,
+        "singleQuote": false
+      }
+    }
+  ]
+}
\ No newline at end of file

--
Gitblit v1.9.3