Changeset 41835

Timestamp:

10/12/2017 01:57:45 AM (8 years ago)

Author:

pento

Message:

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.

Location:

trunk

Files:

• .editorconfig (modified) (1 diff)
• .jshintrc (modified) (1 diff)

trunk/.editorconfig

@@ -14 +14 @@
 indent_style = tab
 
-[{.jshintrc,*.json,*.yml}]
+[{package.json,*.yml}]
 indent_style = space
 indent_size = 2

trunk/.jshintrc

@@ -1 +1 @@
 {
-  "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
+    }
 }