diff --git a/.editorconfig b/.editorconfig index 77d25060..d79c0b12 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,13 +1,19 @@ -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 = lf +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 + +[*.html] +end_of_line = lf + +[*.ts] +end_of_line = lf diff --git a/.gitattributes b/.gitattributes index 5383927f..d29c5a0f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,25 +1,29 @@ - -# 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=lf +*.html text eol=lf +*.ts text eol=lf + +# +# 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 +*.ts text eol=lf +*.html text eol=lf + +# +# Exclude files from exporting +# + +.gitattributes export-ignore +.gitignore export-ignore diff --git a/.prettierrc.json b/.prettierrc.json index d8e32c8c..6b33e486 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,6 +1,6 @@ { "printWidth": 100, - "endOfLine": "crlf", + "endOfLine": "lf", "trailingComma": "es5", "singleQuote": true, "semi": true, diff --git a/.vscode/settings.json b/.vscode/settings.json index 4a90936f..55f2e9c1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,18 +1,14 @@ { - "files.eol": "\r\n", "editor.insertSpaces": false, "[json]": { - "files.eol": "\n", "editor.insertSpaces": true, "editor.tabSize": 2 }, "[yaml]": { - "files.eol": "\n", "editor.insertSpaces": true, "editor.tabSize": 2 }, "[shellscript]": { - "files.eol": "\n", "editor.insertSpaces": true, "editor.tabSize": 2 },