diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..fee0a318
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{php,js,md}]
+indent_size = 4
diff --git a/resources/assets/src/js/__tests__/.editorconfig b/resources/assets/src/js/__tests__/.editorconfig
new file mode 100644
index 00000000..0382a6f8
--- /dev/null
+++ b/resources/assets/src/js/__tests__/.editorconfig
@@ -0,0 +1,4 @@
+# http://editorconfig.org
+
+[*.js]
+indent_size = 2