From 8bd1556b80903b0d1349da733ae09b16529ab045 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com> Date: Tue, 22 Nov 2022 10:38:08 +0100 Subject: [PATCH 1/4] refactor: aligned code styles through projects --- .editorconfig | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index f1cc3ad329..270337bbbc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,15 +1,30 @@ -# http://editorconfig.org +# For more information about the properties used in +# this file, please see the EditorConfig documentation: +# https://editorconfig.org/ root = true [*] charset = utf-8 -indent_style = space -indent_size = 2 end_of_line = lf +indent_style = tab +indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true +[*.{js,jsx,ts,tsx,.mjs}] +quote_type = single + +[package.json] +# The indent size used in the `package.json` file cannot be changed +# https://github.com/npm/npm/pull/3180#issuecomment-16336516 +indent_size = 2 +indent_style = space + +[*.{yaml,yml}] +indent_style = space +indent_size = 2 + [*.md] insert_final_newline = false trim_trailing_whitespace = false From 899d31c332392f56789756c0dafc3f3bb99511e5 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com> Date: Tue, 22 Nov 2022 10:43:26 +0100 Subject: [PATCH 2/4] Update .prettierrc.json --- .prettierrc.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.prettierrc.json b/.prettierrc.json index e9c0f50f6a..15e18d74f1 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,4 +1,13 @@ { - "trailingComma": "none", - "singleQuote": true + "trailingComma": "none", + "overrides": [ + { + "files": ["*.js", "*.jsx", "*.ts", "*.tsx"], + "options": { + "bracketSameLine": true + } + } + ], + "editorconfig": true, + "bracketSpacing": true } From 6c93158a9216bfe21577628f38c4fc5ae1cbdb01 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com> Date: Wed, 23 Nov 2022 17:54:33 +0100 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20we=20don't=20need=20another=20dot=20?= =?UTF-8?q?here=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 270337bbbc..bdf56a35bf 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true -[*.{js,jsx,ts,tsx,.mjs}] +[*.{js,jsx,ts,tsx,mjs}] quote_type = single [package.json] From a47e5e792e39927dfe50ae26058ae535b3c23cc8 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com> Date: Wed, 23 Nov 2022 17:58:04 +0100 Subject: [PATCH 4/4] fix: this is not an option for the config --- .prettierrc.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.prettierrc.json b/.prettierrc.json index 15e18d74f1..1da97fada5 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -8,6 +8,5 @@ } } ], - "editorconfig": true, "bracketSpacing": true }