diff --git a/.editorconfig b/.editorconfig
index a3f6ab3b0..83742aaab 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,7 @@ trim_trailing_whitespace = true
 insert_final_newline = false
 
 
-[*.{js,json,css,html}]
+[*.{js,mjs,json,css,html}]
 indent_style = space
 indent_size = 4
 
@@ -13,7 +13,7 @@ indent_size = 4
 # EOL for ESLint
 # newline follows Airbnb style guide
 # mix of indent size between ES5 and ES6 syntax files
-[*.js]
+[*.{js,mjs}]
 end_of_line = lf
 insert_final_newline = true
-indent_size = tab_width
\ No newline at end of file
+indent_size = tab_width
diff --git a/.gitattributes b/.gitattributes
index af49967a6..2ebc0b176 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 * text=auto
 *.bat eol=crlf
 *.js eol=lf
+*.mjs eol=lf