diff --git a/packages/eslint-config-airbnb-base/package.json b/packages/eslint-config-airbnb-base/package.json index 959c88a5..4efe9b93 100644 --- a/packages/eslint-config-airbnb-base/package.json +++ b/packages/eslint-config-airbnb-base/package.json @@ -49,7 +49,7 @@ "babel-preset-airbnb": "^2.2.3", "babel-tape-runner": "^2.0.1", "editorconfig-tools": "^0.1.1", - "eslint": "^3.16.1", + "eslint": "^3.17.0", "eslint-find-rules": "^1.14.3", "eslint-plugin-import": "^2.2.0", "in-publish": "^2.0.0", @@ -57,7 +57,7 @@ "tape": "^4.6.3" }, "peerDependencies": { - "eslint": "^3.16.1", + "eslint": "^3.17.0", "eslint-plugin-import": "^2.2.0" }, "engines": { diff --git a/packages/eslint-config-airbnb-base/rules/errors.js b/packages/eslint-config-airbnb-base/rules/errors.js index bade2a1c..8f618e06 100644 --- a/packages/eslint-config-airbnb-base/rules/errors.js +++ b/packages/eslint-config-airbnb-base/rules/errors.js @@ -13,6 +13,11 @@ module.exports = { // http://eslint.org/docs/rules/no-await-in-loop 'no-await-in-loop': 'error', + // Disallow comparisons to negative zero + // http://eslint.org/docs/rules/no-compare-neg-zero + // TODO: enable (semver-major) + 'no-compare-neg-zero': 'off', + // disallow assignment in conditional expressions 'no-cond-assign': ['error', 'always'], diff --git a/packages/eslint-config-airbnb-base/rules/style.js b/packages/eslint-config-airbnb-base/rules/style.js index 1d315bc5..610caa21 100644 --- a/packages/eslint-config-airbnb-base/rules/style.js +++ b/packages/eslint-config-airbnb-base/rules/style.js @@ -286,6 +286,10 @@ module.exports = { // http://eslint.org/docs/rules/no-whitespace-before-property 'no-whitespace-before-property': 'error', + // enforce the location of single-line statements + // http://eslint.org/docs/rules/nonblock-statement-body-position + 'nonblock-statement-body-position': 'off', + // require padding inside curly braces 'object-curly-spacing': ['error', 'always'],