From 43d4e23bf7815f24c6ccf5cd562992f13f18ac6a Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 16 Oct 2017 11:18:12 +0100 Subject: [PATCH 1/2] upgrade to eslint@^4.9.0 --- packages/eslint-config-airbnb-base/package.json | 4 ++-- packages/eslint-config-airbnb/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/eslint-config-airbnb-base/package.json b/packages/eslint-config-airbnb-base/package.json index 81c1011774..db93b0332b 100644 --- a/packages/eslint-config-airbnb-base/package.json +++ b/packages/eslint-config-airbnb-base/package.json @@ -51,7 +51,7 @@ "babel-preset-airbnb": "^2.4.0", "babel-tape-runner": "^2.0.1", "editorconfig-tools": "^0.1.1", - "eslint": "^4.8.0", + "eslint": "^4.9.0", "eslint-find-rules": "^3.1.1", "eslint-plugin-import": "^2.7.0", "in-publish": "^2.0.0", @@ -59,7 +59,7 @@ "tape": "^4.8.0" }, "peerDependencies": { - "eslint": "^4.8.0", + "eslint": "^4.9.0", "eslint-plugin-import": "^2.7.0" }, "engines": { diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json index 041464a23c..eb1c81d1bb 100644 --- a/packages/eslint-config-airbnb/package.json +++ b/packages/eslint-config-airbnb/package.json @@ -54,7 +54,7 @@ "babel-preset-airbnb": "^2.4.0", "babel-tape-runner": "^2.0.1", "editorconfig-tools": "^0.1.1", - "eslint": "^4.8.0", + "eslint": "^4.9.0", "eslint-find-rules": "^3.1.1", "eslint-plugin-import": "^2.7.0", "eslint-plugin-jsx-a11y": "^6.0.2", @@ -65,7 +65,7 @@ "tape": "^4.8.0" }, "peerDependencies": { - "eslint": "^4.8.0", + "eslint": "^4.9.0", "eslint-plugin-import": "^2.7.0", "eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-react": "^7.4.0" From e20c78afe2b3599512dfc60cfa4dfec6b69482a0 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 16 Oct 2017 11:20:04 +0100 Subject: [PATCH 2/2] disallow elseIf in no-else-return --- packages/eslint-config-airbnb-base/rules/best-practices.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/eslint-config-airbnb-base/rules/best-practices.js b/packages/eslint-config-airbnb-base/rules/best-practices.js index 83808bb879..bee4e961e4 100644 --- a/packages/eslint-config-airbnb-base/rules/best-practices.js +++ b/packages/eslint-config-airbnb-base/rules/best-practices.js @@ -56,8 +56,10 @@ module.exports = { // http://eslint.org/docs/rules/no-div-regex 'no-div-regex': 'off', - // disallow else after a return in an if - 'no-else-return': 'error', + // disallow else after a return in an if or else if + 'no-else-return': ['error', { + allowElseIf: false + }], // disallow empty functions, except for standalone funcs/arrows // http://eslint.org/docs/rules/no-empty-function