Breaking: Add new rules to eslint:recommended (fixes #12911) (#12920)

eslint · Feb 25, 2020 · 78182e4 · 78182e4
1 parent 8d5c434
commit 78182e4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/conf/eslint-recommended.js b/conf/eslint-recommended.js
@@ -26,6 +26,7 @@ module.exports = {
         "no-delete-var": "error",
         "no-dupe-args": "error",
         "no-dupe-class-members": "error",
+        "no-dupe-else-if": "error",
         "no-dupe-keys": "error",
         "no-duplicate-case": "error",
         "no-empty": "error",
@@ -37,6 +38,7 @@ module.exports = {
         "no-fallthrough": "error",
         "no-func-assign": "error",
         "no-global-assign": "error",
+        "no-import-assign": "error",
         "no-inner-declarations": "error",
         "no-invalid-regexp": "error",
         "no-irregular-whitespace": "error",
@@ -49,6 +51,7 @@ module.exports = {
         "no-redeclare": "error",
         "no-regex-spaces": "error",
         "no-self-assign": "error",
+        "no-setter-return": "error",
         "no-shadow-restricted-names": "error",
         "no-sparse-arrays": "error",
         "no-this-before-super": "error",

diff --git a/lib/rules/indent-legacy.js b/lib/rules/indent-legacy.js
@@ -696,20 +696,6 @@ module.exports = {
             return startLine === endLine;
         }
 
-        /**
-         * Check to see if the first element inside an array is an object and on the same line as the node
-         * If the node is not an array then it will return false.
-         * @param {ASTNode} node node to check
-         * @returns {boolean} success/failure
-         */
-        function isFirstArrayElementOnSameLine(node) {
-            if (node.type === "ArrayExpression" && node.elements[0]) {
-                return node.elements[0].loc.start.line === node.loc.start.line && node.elements[0].type === "ObjectExpression";
-            }
-            return false;
-
-        }
-
         /**
          * Check indent for array block content or object block content
          * @param {ASTNode} node node to examine
@@ -776,8 +762,6 @@ module.exports = {
                             nodeIndent += indentSize;
                         }
                     }
-                } else if (!parentVarNode && !isFirstArrayElementOnSameLine(parent) && parent.type !== "MemberExpression" && parent.type !== "ExpressionStatement" && parent.type !== "AssignmentExpression" && parent.type !== "Property") {
-                    nodeIndent += indentSize;
                 }
 
                 checkFirstNodeLineIndent(node, nodeIndent);

diff --git a/lib/rules/no-dupe-else-if.js b/lib/rules/no-dupe-else-if.js
@@ -53,7 +53,7 @@ module.exports = {
         docs: {
             description: "disallow duplicate conditions in if-else-if chains",
             category: "Possible Errors",
-            recommended: false,
+            recommended: true,
             url: "https://eslint.org/docs/rules/no-dupe-else-if"
         },
 

diff --git a/lib/rules/no-import-assign.js b/lib/rules/no-import-assign.js
@@ -180,7 +180,7 @@ module.exports = {
         docs: {
             description: "disallow assigning to imported bindings",
             category: "Possible Errors",
-            recommended: false,
+            recommended: true,
             url: "https://eslint.org/docs/rules/no-import-assign"
         },
 

diff --git a/lib/rules/no-setter-return.js b/lib/rules/no-setter-return.js
@@ -145,7 +145,7 @@ module.exports = {
         docs: {
             description: "disallow returning values from setters",
             category: "Possible Errors",
-            recommended: false,
+            recommended: true,
             url: "https://eslint.org/docs/rules/no-setter-return"
         },