Merge branch 'main' into fix/scss

traPtitech · Oct 24, 2024 · 19f731b · 19f731b
1 parent 1c22e90
commit 19f731b
Show file tree

Hide file tree

Showing 31 changed files with 304 additions and 939 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -17,5 +17,6 @@
   "proseWrap": "preserve",
   "htmlWhitespaceSensitivity": "css",
   "vueIndentScriptAndStyle": false,
-  "endOfLine": "auto"
+  "endOfLine": "auto",
+  "singleAttributePerLine": true
 }
diff --git a/eslint.config.js b/eslint.config.js
@@ -32,17 +32,21 @@ const vueLint = {
 
     'vue/custom-event-name-casing': ['error', 'camelCase'],
 
-    'vue/max-attributes-per-line': [
-      'warn',
+    'vue/html-self-closing': [
+      'error',
       {
-        singleline: {
-          max: 1
+        html: {
+          void: 'always',
+          normal: 'always',
+          component: 'always'
         },
-        multiline: {
-          max: 1
-        }
+        svg: 'always',
+        math: 'always'
       }
-    ]
+    ],
+
+    'vue/singleline-html-element-content-newline': ['off'],
+    'vue/html-indent': ['off']
   }
 }