diff --git a/.editorconfig b/.editorconfig
index 02ff606f3..ca2573dc0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,6 @@
 [*]
 charset=utf-8
-end_of_line=crlf
+end_of_line=lf
 insert_final_newline=false
 indent_style=space
 indent_size=4
@@ -8,12 +8,17 @@ indent_size=4
 [{.babelrc,.stylelintrc,.eslintrc,jest.config,*.json,*.jsb3,*.jsb2,*.bowerrc}]
 indent_style=space
 indent_size=2
+end_of_line=lf
+trim_trailing_whitespace=true
 
-[{*.ats,*.ts}]
+[{*.ats,*.ts,*.js}]
 indent_style=tab
 tab_width=4
+end_of_line=lf
+trim_trailing_whitespace=true
 
 [tslint.json]
 indent_style=space
 indent_size=2
-
+end_of_line=lf
+trim_trailing_whitespace=true