[eslint config] [base] [deps] [breaking] update eslint

ljharb · ljharb · commit a23a3efba9d1 · 2016-10-31T01:36:15.000-07:00
- enable `no-useless-return`
 - tighten up `indent`
 - loosen `max-len` with `ignoreRegExpLiterals` option
diff --git a/packages/eslint-config-airbnb-base/package.json b/packages/eslint-config-airbnb-base/package.json
@@ -47,15 +47,15 @@
   "devDependencies": {
     "babel-preset-airbnb": "^2.1.1",
     "babel-tape-runner": "^2.0.1",
-    "eslint": "^3.8.1",
+    "eslint": "^3.9.0",
     "eslint-find-rules": "^1.14.0",
     "eslint-plugin-import": "^2.0.1",
     "in-publish": "^2.0.0",
     "safe-publish-latest": "^1.1.1",
     "tape": "^4.6.2"
   },
   "peerDependencies": {
-    "eslint": "^3.8.1",
+    "eslint": "^3.9.0",
     "eslint-plugin-import": "^2.0.1"
   },
   "engines": {
diff --git a/packages/eslint-config-airbnb-base/rules/best-practices.js b/packages/eslint-config-airbnb-base/rules/best-practices.js
@@ -232,6 +232,10 @@ module.exports = {
     // http://eslint.org/docs/rules/no-useless-escape
     'no-useless-escape': 'error',
 
+    // disallow redundant return; keywords
+    // http://eslint.org/docs/rules/no-useless-return
+    'no-useless-return': 'error',
+
     // disallow use of void operator
     // http://eslint.org/docs/rules/no-void
     'no-void': 'error',
diff --git a/packages/eslint-config-airbnb-base/rules/style.js b/packages/eslint-config-airbnb-base/rules/style.js
@@ -35,7 +35,10 @@ module.exports = {
     // requires function names to match the name of the variable or property to which they are
     // assigned
     // http://eslint.org/docs/rules/func-name-matching
-    'func-name-matching': ['off', { includeCommonJSModuleExports: false }],
+    'func-name-matching': ['off', {
+       includeCommonJSModuleExports: false,
+       nameMatches: 'always'
+     }],
 
     // require function expressions to have a name
     // http://eslint.org/docs/rules/func-names
@@ -59,7 +62,23 @@ module.exports = {
 
     // this option sets a specific tab width for your code
     // http://eslint.org/docs/rules/indent
-    indent: ['error', 2, { SwitchCase: 1, VariableDeclarator: 1, outerIIFEBody: 1 }],
+    indent: ['error', 2, {
+      SwitchCase: 1,
+      VariableDeclarator: 1,
+      outerIIFEBody: 1,
+      // MemberExpression: null,
+      // CallExpression: {
+        // parameters: null,
+      // },
+      FunctionDeclaration: {
+        parameters: 1,
+        body: 1
+      },
+      FunctionExpression: {
+        parameters: 1,
+        body: 1
+      }
+    }],
 
     // specify whether double or single quotes should be used in JSX attributes
     // http://eslint.org/docs/rules/jsx-quotes
@@ -110,6 +129,7 @@ module.exports = {
     'max-len': ['error', 100, 2, {
       ignoreUrls: true,
       ignoreComments: false,
+      ignoreRegExpLiterals: true,
       ignoreStrings: true,
       ignoreTemplateLiterals: true,
     }],
