Merge pull request #145 from magento-commerce/imported-fredden-magent…

…o-coding-standard-349 [Imported] Simplify file structure for ESLint ruleset
magento · Jan 11, 2022 · 6033411 · 6033411
2 parents 9b5eee9 + 491084e
commit 6033411
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 66 deletions.
diff --git a/eslint/.eslintrc b/eslint/.eslintrc
@@ -3,7 +3,6 @@
     	"./.eslintrc-reset",
     	"./.eslintrc-magento",
     	"./.eslintrc-jquery",
-    	"./.eslintrc-misc",
-    	"./.eslintrc-jscs"
+    	"./.eslintrc-misc"
     ]
 }
diff --git a/eslint/.eslintrc-jscs b/eslint/.eslintrc-jscs
diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
@@ -12,8 +12,13 @@
         "node": true
     },
     "rules": {
+        "comma-dangle": [2, "never"],
+        "comma-style": [2, "last"],
+        "curly": [2, "all"],
+        "eol-last": 2,
         "eqeqeq": [2, "smart"],
         "guard-for-in": 2,
+        "keyword-spacing": [2, {}],
         "lines-around-comment": [
             2,
             {
@@ -34,6 +39,7 @@
         "no-constant-condition": 2,
         "no-debugger": 2,
         "no-else-return": 2,
+        "no-empty": [2, {"allowEmptyCatch": true}],
         "no-eval": 2,
         "no-ex-assign": 2,
         "no-extend-native": 2,
@@ -50,7 +56,9 @@
         "no-lone-blocks": 2,
         "no-lonely-if": 2,
         "no-loop-func": 2,
+        "no-mixed-spaces-and-tabs": 2,
         "no-multi-str": 2,
+        "no-multiple-empty-lines": 2,
         "no-native-reassign": 2,
         "no-negated-in-lhs": 2,
         "no-new-object": 2,
@@ -60,6 +68,7 @@
         "no-return-assign": 2,
         "no-self-compare": 2,
         "no-shadow": 2,
+        "no-trailing-spaces": 2,
         "no-undef": 2,
         "no-undef-init": 2,
         "no-unreachable": 2,
@@ -73,10 +82,17 @@
         ],
         "no-use-before-define": 2,
         "no-with": 2,
+        "one-var": [2, "always"],
         "operator-assignment": [2, "always"],
+        "quotes": [2, "single"],
         "radix": 2,
         "semi": [2, "always"],
         "semi-spacing": 2,
+        "space-before-blocks": [2, "always"],
+        "space-before-function-paren": [2, {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
+        "space-in-parens": [2, "never"],
+        "space-infix-ops": 2,
+        "space-unary-ops": [2, {"words": false, "nonwords": false}],
         "strict": ["error", "function"],
         "use-isnan": 2,
         "valid-typeof": 2,