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 },