Skip to content

Commit 6033411

Browse files
authored
Merge pull request #145 from magento-commerce/imported-fredden-magento-coding-standard-349
[Imported] Simplify file structure for ESLint ruleset
2 parents 9b5eee9 + 491084e commit 6033411

File tree

3 files changed

+17
-66
lines changed

3 files changed

+17
-66
lines changed

Diff for: 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
}

Diff for: eslint/.eslintrc-jscs

-64
This file was deleted.

Diff for: eslint/.eslintrc-magento

+16
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212
"node": true
1313
},
1414
"rules": {
15+
"comma-dangle": [2, "never"],
16+
"comma-style": [2, "last"],
17+
"curly": [2, "all"],
18+
"eol-last": 2,
1519
"eqeqeq": [2, "smart"],
1620
"guard-for-in": 2,
21+
"keyword-spacing": [2, {}],
1722
"lines-around-comment": [
1823
2,
1924
{
@@ -34,6 +39,7 @@
3439
"no-constant-condition": 2,
3540
"no-debugger": 2,
3641
"no-else-return": 2,
42+
"no-empty": [2, {"allowEmptyCatch": true}],
3743
"no-eval": 2,
3844
"no-ex-assign": 2,
3945
"no-extend-native": 2,
@@ -50,7 +56,9 @@
5056
"no-lone-blocks": 2,
5157
"no-lonely-if": 2,
5258
"no-loop-func": 2,
59+
"no-mixed-spaces-and-tabs": 2,
5360
"no-multi-str": 2,
61+
"no-multiple-empty-lines": 2,
5462
"no-native-reassign": 2,
5563
"no-negated-in-lhs": 2,
5664
"no-new-object": 2,
@@ -60,6 +68,7 @@
6068
"no-return-assign": 2,
6169
"no-self-compare": 2,
6270
"no-shadow": 2,
71+
"no-trailing-spaces": 2,
6372
"no-undef": 2,
6473
"no-undef-init": 2,
6574
"no-unreachable": 2,
@@ -73,10 +82,17 @@
7382
],
7483
"no-use-before-define": 2,
7584
"no-with": 2,
85+
"one-var": [2, "always"],
7686
"operator-assignment": [2, "always"],
87+
"quotes": [2, "single"],
7788
"radix": 2,
7889
"semi": [2, "always"],
7990
"semi-spacing": 2,
91+
"space-before-blocks": [2, "always"],
92+
"space-before-function-paren": [2, {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
93+
"space-in-parens": [2, "never"],
94+
"space-infix-ops": 2,
95+
"space-unary-ops": [2, {"words": false, "nonwords": false}],
8096
"strict": ["error", "function"],
8197
"use-isnan": 2,
8298
"valid-typeof": 2,

0 commit comments

Comments
 (0)