diff --git a/.editorconfig b/.editorconfig
index f1cc3ad329..bdf56a35bf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +1,30 @@
-# http://editorconfig.org
+# For more information about the properties used in
+# this file, please see the EditorConfig documentation:
+# https://editorconfig.org/
 
 root = true
 
 [*]
 charset = utf-8
-indent_style = space
-indent_size = 2
 end_of_line = lf
+indent_style = tab
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{js,jsx,ts,tsx,mjs}]
+quote_type = single
+
+[package.json]
+# The indent size used in the `package.json` file cannot be changed
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
+indent_size = 2
+indent_style = space
+
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
diff --git a/.prettierrc.json b/.prettierrc.json
index e9c0f50f6a..1da97fada5 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,4 +1,12 @@
 {
-  "trailingComma": "none",
-  "singleQuote": true
+	"trailingComma": "none",
+	"overrides": [
+		{
+			"files": ["*.js", "*.jsx", "*.ts", "*.tsx"],
+			"options": {
+				"bracketSameLine": true
+			}
+		}
+	],
+	"bracketSpacing": true
 }