sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

General: Remove .jshintrc and *.json from the 2-space-indent .editorconfig group.

Browse Source 
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
This commit is contained in:
Gary Pendergast 2017-10-12 01:57:45 +00:00
parent 9f7e06e855
commit b57742018a
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -13,7 +13,7 @@ insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
indent_style = tab indent_style = tab
[{.jshintrc,*.json,*.yml}] [{package.json,*.yml}]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2

50
.jshintrc
View File

@ -1,29 +1,29 @@
{ {
"boss": true, "boss": true,
"curly": true, "curly": true,
"eqeqeq": true, "eqeqeq": true,
"eqnull": true, "eqnull": true,
"es3": true, "es3": true,
"expr": true, "expr": true,
"immed": true, "immed": true,
"noarg": true, "noarg": true,
"nonbsp": true, "nonbsp": true,
"onevar": true, "onevar": true,
"quotmark": "single", "quotmark": "single",
"trailing": true, "trailing": true,
"undef": true, "undef": true,
"unused": true, "unused": true,
"browser": true, "browser": true,
"globals": { "globals": {
"_": false, "_": false,
"Backbone": false, "Backbone": false,
"jQuery": false, "jQuery": false,
"JSON": false, "JSON": false,
"wp": false, "wp": false,
"export": false, "export": false,
"module": false, "module": false,
"require": false "require": false
} }
} }