diff --git a/packages/cra-template/template/.editorconfig b/packages/cra-template/template/.editorconfig
new file mode 100644
index 00000000000..be61ce6ae19
--- /dev/null
+++ b/packages/cra-template/template/.editorconfig
@@ -0,0 +1,14 @@
+# https://github.com/facebook/react/blob/main/.editorconfig
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/test/integration/create-react-app/index.test.js b/test/integration/create-react-app/index.test.js
index f18d791ee3e..25d28e54ed2 100644
--- a/test/integration/create-react-app/index.test.js
+++ b/test/integration/create-react-app/index.test.js
@@ -16,6 +16,7 @@ const generatedFiles = [
   'package.json',
   'src',
   'package-lock.json',
+  '.editorconfig',
 ];
 
 beforeEach(() => remove(genPath));