Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed the clrf configuration. #714

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
54 changes: 29 additions & 25 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"printWidth": 100,
"endOfLine": "crlf",
"endOfLine": "lf",
"trailingComma": "es5",
"singleQuote": true,
"semi": true,
Expand Down
4 changes: 0 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down
Loading