Skip to content

Commit 491084e

Browse files
committed
Simplify file structure for ESLint ruleset
There are no changes to the rule definitions here.
1 parent 33e41e4 commit 491084e

File tree

3 files changed

+17
-66
lines changed

3 files changed

+17
-66
lines changed

eslint/.eslintrc

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"./.eslintrc-reset",
44
"./.eslintrc-magento",
55
"./.eslintrc-jquery",
6-
"./.eslintrc-misc",
7-
"./.eslintrc-jscs"
6+
"./.eslintrc-misc"
87
]
98
}

eslint/.eslintrc-jscs

-64
This file was deleted.

eslint/.eslintrc-magento

+16
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
"node": true
99
},
1010
"rules": {
11+
"comma-dangle": [2, "never"],
12+
"comma-style": [2, "last"],
13+
"curly": [2, "all"],
14+
"eol-last": 2,
1115
"eqeqeq": [2, "smart"],
1216
"guard-for-in": 2,
17+
"keyword-spacing": [2, {}],
1318
"lines-around-comment": [
1419
2,
1520
{
@@ -30,6 +35,7 @@
3035
"no-constant-condition": 2,
3136
"no-debugger": 2,
3237
"no-else-return": 2,
38+
"no-empty": [2, {"allowEmptyCatch": true}],
3339
"no-eval": 2,
3440
"no-ex-assign": 2,
3541
"no-extend-native": 2,
@@ -46,7 +52,9 @@
4652
"no-lone-blocks": 2,
4753
"no-lonely-if": 2,
4854
"no-loop-func": 2,
55+
"no-mixed-spaces-and-tabs": 2,
4956
"no-multi-str": 2,
57+
"no-multiple-empty-lines": 2,
5058
"no-native-reassign": 2,
5159
"no-negated-in-lhs": 2,
5260
"no-new-object": 2,
@@ -56,6 +64,7 @@
5664
"no-return-assign": 2,
5765
"no-self-compare": 2,
5866
"no-shadow": 2,
67+
"no-trailing-spaces": 2,
5968
"no-undef": 2,
6069
"no-undef-init": 2,
6170
"no-unreachable": 2,
@@ -69,10 +78,17 @@
6978
],
7079
"no-use-before-define": 2,
7180
"no-with": 2,
81+
"one-var": [2, "always"],
7282
"operator-assignment": [2, "always"],
83+
"quotes": [2, "single"],
7384
"radix": 2,
7485
"semi": [2, "always"],
7586
"semi-spacing": 2,
87+
"space-before-blocks": [2, "always"],
88+
"space-before-function-paren": [2, {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
89+
"space-in-parens": [2, "never"],
90+
"space-infix-ops": 2,
91+
"space-unary-ops": [2, {"words": false, "nonwords": false}],
7692
"strict": ["error", "function"],
7793
"use-isnan": 2,
7894
"valid-typeof": 2,

0 commit comments

Comments
 (0)