Skip to content

Commit b577420

Browse files
committed
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
1 parent 9f7e06e commit b577420

2 files changed

Lines changed: 26 additions & 26 deletions

File tree

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ insert_final_newline = true
1313
trim_trailing_whitespace = true
1414
indent_style = tab
1515

16-
[{.jshintrc,*.json,*.yml}]
16+
[{package.json,*.yml}]
1717
indent_style = space
1818
indent_size = 2
1919

.jshintrc

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
2-
"boss": true,
3-
"curly": true,
4-
"eqeqeq": true,
5-
"eqnull": true,
6-
"es3": true,
7-
"expr": true,
8-
"immed": true,
9-
"noarg": true,
10-
"nonbsp": true,
11-
"onevar": true,
12-
"quotmark": "single",
13-
"trailing": true,
14-
"undef": true,
15-
"unused": true,
2+
"boss": true,
3+
"curly": true,
4+
"eqeqeq": true,
5+
"eqnull": true,
6+
"es3": true,
7+
"expr": true,
8+
"immed": true,
9+
"noarg": true,
10+
"nonbsp": true,
11+
"onevar": true,
12+
"quotmark": "single",
13+
"trailing": true,
14+
"undef": true,
15+
"unused": true,
1616

17-
"browser": true,
17+
"browser": true,
1818

19-
"globals": {
20-
"_": false,
21-
"Backbone": false,
22-
"jQuery": false,
23-
"JSON": false,
24-
"wp": false,
25-
"export": false,
26-
"module": false,
27-
"require": false
28-
}
19+
"globals": {
20+
"_": false,
21+
"Backbone": false,
22+
"jQuery": false,
23+
"JSON": false,
24+
"wp": false,
25+
"export": false,
26+
"module": false,
27+
"require": false
28+
}
2929
}

0 commit comments

Comments
 (0)