Merge pull request #13129 from adobe/eslint-no-else-return-warning

zaggino · web-flow · commit d7f94523d451 · 2017-03-05T07:26:52.000+11:00
introduce no-else-return rule as a warning
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,11 +1,44 @@
-{
+module.exports = {
     "rules": {
-        "no-bitwise": 2,
+        // the rules below should be sorted in a same way they are sorted on https://eslint.org/docs/rules page
+        // https://eslint.org/docs/rules/#possible-errors
+        "no-caller": 2,
+        "no-control-regex": 2,
+        "no-empty": 1,
+        "no-invalid-regexp": 2,
+        "no-regex-spaces": 2,
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+        // https://eslint.org/docs/rules/#best-practices
         "curly": 2,
-        "eqeqeq": 2,
+        "eqeqeq": [2, "smart"],
         "guard-for-in": 0,
+        "no-else-return": 1,
+        "no-fallthrough": 2,
+        "no-invalid-this": 1,
+        "no-iterator": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-new-func": 2,
+        "no-new-wrappers": 2,
+        "no-new": 2,
+        "no-proto": 2,
+        "no-script-url": 2,
         "wrap-iife": [2, "outside"],
+        // https://eslint.org/docs/rules/#strict-mode
+        "strict": 2,
+        // https://eslint.org/docs/rules/#variables
+        "no-shadow-restricted-names": 2,
+        "no-shadow": 1,
+        "no-undef": 2,
+        "no-unused-vars": [1, {"vars": "all", "args": "none"}],
         "no-use-before-define": 0,
+        // https://eslint.org/docs/rules/#nodejs-and-commonjs
+        "no-new-require": 2,
+        // https://eslint.org/docs/rules/#stylistic-issues
+        "eol-last": 1,
+        "indent": [1, 4],
+        "max-len": [1, 120],
         "new-cap": [0, {
             "capIsNewExceptions": [
                 "$.Deferred",
@@ -14,56 +47,27 @@
                 "Immutable.Map",
                 "Immutable.List",
                 "JSLINT"
-            ]}],
-        "no-caller": 2,
-        "no-empty": 0,
-        "no-new": 2,
-        "no-invalid-regexp": 2,
-        "no-control-regex": 2,
-        "no-regex-spaces": 2,
-        "no-undef": 2,
-        "strict": 2,
-        "no-unused-vars": [0, {"vars": "all", "args": "none"}],
-        "semi": 2,
-
-        "no-iterator": 2,
-        "no-loop-func": 2,
-        "no-multi-str": 2,
-        "no-fallthrough": 2,
-        "no-proto": 2,
-        "no-script-url": 2,
-        "no-shadow": 0,
-        "no-shadow-restricted-names": 2,
-        "no-new-func": 2,
-        "no-new-wrappers": 2,
-        "no-new-require": 2,
+            ]
+        }],
         "new-parens": 2,
+        "no-bitwise": 2,
         "no-new-object": 2,
-        "no-invalid-this": 0,
-        "indent": [0, 4],
-
-        "valid-jsdoc": 0,
-        "valid-typeof": 2,
-
-        "no-trailing-spaces": 0,
-        "eol-last": 0,
-        "max-len": [1, 120]
+        "no-trailing-spaces": 1,
+        "semi-spacing": 1,
+        "semi": 2
     },
     "globals": {
-        "brackets": false,
-
-        "require": false,
-        "define": false,
         "$": false,
-
-        "window": false,
+        "brackets": false,
+        "clearTimeout": false,
         "console": false,
+        "define": false,
+        "require": false,
         "setTimeout": false,
-        "clearTimeout": false,
-
+        "window": false,
         "ArrayBuffer": false,
-        "XMLHttpRequest": false,
         "Uint32Array": false,
-        "WebSocket": false
+        "WebSocket": false,
+        "XMLHttpRequest": false
     }
-}
+};
diff --git a/package.json b/package.json
@@ -51,7 +51,8 @@
     },
     "scripts": {
         "postinstall": "grunt install",
-        "test": "grunt test cla-check-pull"
+        "test": "grunt test cla-check-pull",
+        "eslint": "grunt eslint"
     },
     "licenses": [
         {
