From 1d26ba67ea68bb68e921434d8e87a65053729836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=97=D0=BB=20=D0=93=D1=80=D0=B8?= =?UTF-8?q?=D0=B3=D0=BE=D1=80=27=D1=94=D0=B2?= Date: Thu, 20 Jun 2024 12:43:30 +0300 Subject: [PATCH] Update formatting configurations EditorConfig applies to all files, LF is enforced instead of CRLF, Prettier configuration moved to JSON, properties are inherited from EditorConfig. --- .editorconfig | 4 ++-- .prettierrc | 9 +++++++++ .prettierrc.yaml | 11 ----------- 3 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 .prettierrc delete mode 100644 .prettierrc.yaml diff --git a/.editorconfig b/.editorconfig index 9a3e06f4..dc610a65 100755 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,7 @@ root = true -[{src, translations}/*] -end_of_line = crlf +[*] +end_of_line = lf insert_final_newline = true indent_style = space indent_size = 4 diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..ec6ce6df --- /dev/null +++ b/.prettierrc @@ -0,0 +1,9 @@ +{ + "arrowParens": "avoid", + "bracketSpacing": true, + "printWidth": 110, + "quoteProps": "consistent", + "semi": true, + "singleQuote": false, + "trailingComma": "es5" +} diff --git a/.prettierrc.yaml b/.prettierrc.yaml deleted file mode 100644 index 0b5b2dba..00000000 --- a/.prettierrc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# .prettierrc or .prettierrc.yaml -trailingComma: "es5" -tabWidth: 4 -semi: true -singleQuote: false -printWidth: 110 -useTabs: false -quoteProps: "consistent" -bracketSpacing: true -arrowParens: avoid -endOfLine: auto