From b57742018a3f5d7739eda06f3c4d7b148eecd842 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Thu, 12 Oct 2017 01:57:45 +0000
Subject: [PATCH] General: Remove `.jshintrc` and `*.json` from the
 2-space-indent `.editorconfig` group.

JSON files don't need a particular indent style, this was just inherited from the jQuery `.editorconfig`, that we based ours on.

`package.json` is staying in the 2-space-indent group for now, due to npm 3 and 4 having issues. Upgrading to npm 5 will allow us to remove `package.json`, too.

Props netweb.
Fixes #40946.



git-svn-id: https://develop.svn.wordpress.org/trunk@41835 602fd350-edb4-49c9-b593-d223f7449a82
---
 .editorconfig |  2 +-
 .jshintrc     | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e1cc194ebc..56cf8fd4c0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
 
-[{.jshintrc,*.json,*.yml}]
+[{package.json,*.yml}]
 indent_style = space
 indent_size = 2
 
diff --git a/.jshintrc b/.jshintrc
index 278eac22c3..1b7387f4a2 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,29 +1,29 @@
 {
-  "boss": true,
-  "curly": true,
-  "eqeqeq": true,
-  "eqnull": true,
-  "es3": true,
-  "expr": true,
-  "immed": true,
-  "noarg": true,
-  "nonbsp": true,
-  "onevar": true,
-  "quotmark": "single",
-  "trailing": true,
-  "undef": true,
-  "unused": true,
+	"boss": true,
+	"curly": true,
+	"eqeqeq": true,
+	"eqnull": true,
+	"es3": true,
+	"expr": true,
+	"immed": true,
+	"noarg": true,
+	"nonbsp": true,
+	"onevar": true,
+	"quotmark": "single",
+	"trailing": true,
+	"undef": true,
+	"unused": true,
 
-  "browser": true,
+	"browser": true,
 
-  "globals": {
-    "_": false,
-    "Backbone": false,
-    "jQuery": false,
-    "JSON": false,
-    "wp": false,
-    "export": false,
-    "module": false,
-    "require": false
-  }
+	"globals": {
+		"_": false,
+		"Backbone": false,
+		"jQuery": false,
+		"JSON": false,
+		"wp": false,
+		"export": false,
+		"module": false,
+		"require": false
+	}
 }