From aad3a8a301e6cbe5aea143ac24a0f3a954b1bfad Mon Sep 17 00:00:00 2001 From: Kesha Patel Date: Thu, 5 Sep 2024 09:54:21 +0530 Subject: [PATCH 1/6] Removed the clrf configuration. --- .editorconfig | 26 ++++++++++++------------- .gitattributes | 50 ++++++++++++++++++++++++------------------------ .prettierrc.json | 1 - 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/.editorconfig b/.editorconfig index 77d25060..a4c5024a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,13 +1,13 @@ -root = true - -[*] -end_of_line = crlf -indent_style = tab -trim_trailing_whitespace = true -insert_final_newline = true - -[*.{json,yml,sh}] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf +root = true + +[*] +# end_of_line = crlf +indent_style = tab +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{json,yml,sh}] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf diff --git a/.gitattributes b/.gitattributes index 5383927f..b84cc9f3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,25 +1,25 @@ - -# Enforce CRLF to all files by default -* text=auto eol=crlf - -# -# The above will handle all files NOT found below -# - -# Graphics -*.png binary -*.jpg binary - -# Scripts -*.sh text eol=lf - -# Serialisation -*.json text eol=lf -*.yml text eol=lf - -# -# Exclude files from exporting -# - -.gitattributes export-ignore -.gitignore export-ignore + +# Enforce CRLF to all files by default +* #text=auto eol=crlf + +# +# The above will handle all files NOT found below +# + +# Graphics +*.png binary +*.jpg binary + +# Scripts +#*.sh text eol=lf + +# Serialisation +# *.json text eol=lf +# *.yml text eol=lf + +# +# Exclude files from exporting +# + +.gitattributes export-ignore +.gitignore export-ignore diff --git a/.prettierrc.json b/.prettierrc.json index d8e32c8c..f609a075 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,6 +1,5 @@ { "printWidth": 100, - "endOfLine": "crlf", "trailingComma": "es5", "singleQuote": true, "semi": true, From f6caa7500a70578d1de9d1f97991d4aa282b3066 Mon Sep 17 00:00:00 2001 From: Kesha Patel Date: Thu, 5 Sep 2024 11:26:02 +0530 Subject: [PATCH 2/6] removed lf configuration also --- .editorconfig | 2 +- .prettierrc.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index a4c5024a..da768e35 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,4 +10,4 @@ insert_final_newline = true charset = utf-8 indent_style = space indent_size = 2 -end_of_line = lf +# end_of_line = lf diff --git a/.prettierrc.json b/.prettierrc.json index f609a075..f819f303 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -12,7 +12,6 @@ "options": { "singleQuote": false, "useTabs": false, - "endOfLine": "lf", "tabWidth": 2 } }, From 4e9c7efd9393660a08a747a8d1011bc65f7e1780 Mon Sep 17 00:00:00 2001 From: Kesha Patel Date: Thu, 5 Sep 2024 11:35:51 +0530 Subject: [PATCH 3/6] test --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4a90936f..1853fb94 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,4 @@ { - "files.eol": "\r\n", "editor.insertSpaces": false, "[json]": { "files.eol": "\n", @@ -7,12 +6,10 @@ "editor.tabSize": 2 }, "[yaml]": { - "files.eol": "\n", "editor.insertSpaces": true, "editor.tabSize": 2 }, "[shellscript]": { - "files.eol": "\n", "editor.insertSpaces": true, "editor.tabSize": 2 }, From 8122702e476ce894f95e77aa2d673f97e132b083 Mon Sep 17 00:00:00 2001 From: Kesha Patel Date: Thu, 5 Sep 2024 11:52:33 +0530 Subject: [PATCH 4/6] test --- .gitattributes | 10 ++++++---- .prettierrc.json | 2 ++ .vscode/settings.json | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index b84cc9f3..89fa1591 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ # Enforce CRLF to all files by default -* #text=auto eol=crlf +# * text=auto eol=crlf # # The above will handle all files NOT found below @@ -11,11 +11,13 @@ *.jpg binary # Scripts -#*.sh text eol=lf +*.sh text eol=lf # Serialisation -# *.json text eol=lf -# *.yml text eol=lf +*.json text eol=lf +*.yml text eol=lf +*.ts text eol=lf +*.html text eol=lf # # Exclude files from exporting diff --git a/.prettierrc.json b/.prettierrc.json index f819f303..6b33e486 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,5 +1,6 @@ { "printWidth": 100, + "endOfLine": "lf", "trailingComma": "es5", "singleQuote": true, "semi": true, @@ -12,6 +13,7 @@ "options": { "singleQuote": false, "useTabs": false, + "endOfLine": "lf", "tabWidth": 2 } }, diff --git a/.vscode/settings.json b/.vscode/settings.json index 1853fb94..55f2e9c1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,6 @@ { "editor.insertSpaces": false, "[json]": { - "files.eol": "\n", "editor.insertSpaces": true, "editor.tabSize": 2 }, From 435dca0c925503795a1a2f924c6f09f9de0410ca Mon Sep 17 00:00:00 2001 From: Kesha Patel Date: Thu, 5 Sep 2024 12:04:30 +0530 Subject: [PATCH 5/6] test --- .editorconfig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index da768e35..d79c0b12 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,7 @@ root = true [*] -# end_of_line = crlf +end_of_line = lf indent_style = tab trim_trailing_whitespace = true insert_final_newline = true @@ -10,4 +10,10 @@ insert_final_newline = true charset = utf-8 indent_style = space indent_size = 2 -# end_of_line = lf +end_of_line = lf + +[*.html] +end_of_line = lf + +[*.ts] +end_of_line = lf From caa5d8565529a734fcab23daf67a96acecb46f23 Mon Sep 17 00:00:00 2001 From: Kesha Patel Date: Thu, 5 Sep 2024 12:14:31 +0530 Subject: [PATCH 6/6] test --- .gitattributes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 89fa1591..d29c5a0f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,8 @@ # Enforce CRLF to all files by default -# * text=auto eol=crlf +* text=auto eol=lf +*.html text eol=lf +*.ts text eol=lf # # The above will handle all files NOT found below