Merge pull request airbnb#526 from taion/eslint-config-defaults

Eslint config defaults

Author: justjake

packages/eslint-config-airbnb/.eslintrc

@@ -3,9 +3,6 @@
   "rules": {
     // disable requiring trailing commas because it might be nice to revert to
     // being JSON at some point, and I don't want to make big changes now.
-    "comma-dangle": 0,
-    // disabled because I find it tedious to write tests while following this
-    // rule
-    "no-shadow": 0
+    "comma-dangle": 0
   }
 }

packages/eslint-config-airbnb/base.js

@@ -0,0 +1,23 @@
+module.exports = {
+  'extends': [
+    './rules/best-practices.js',
+    './rules/errors.js',
+    './rules/es6.js',
+    './rules/legacy.js',
+    './rules/node.js',
+    './rules/strict.js',
+    './rules/style.js',
+    './rules/variables.js'
+  ],
+  'parser': 'babel-eslint',
+  'env': {
+    'browser': true,
+    'node': true,
+    'amd': false,
+    'mocha': false,
+    'jasmine': false
+  },
+  'ecmaFeatures': {},
+  'globals': {},
+  'rules': {}
+};

packages/eslint-config-airbnb/base/index.js

@@ -1,13 +1,7 @@
-const reactRules = require('./react');
-const base = require('./base');
-
-// clone this so we aren't mutating a module
-const eslintrc = JSON.parse(JSON.stringify(base));
-
-// manually merge in React rules
-eslintrc.plugins = reactRules.plugins;
-Object.keys(reactRules.rules).forEach(function assignRule(ruleId) {
-  eslintrc.rules[ruleId] = reactRules.rules[ruleId];
-});
-
-module.exports = eslintrc;
+module.exports = {
+  'extends': [
+    // Need to qualify these here for ESLint to resolve them properly.
+    'airbnb/base',
+    'airbnb/rules/react.js'
+  ]
+};

packages/eslint-config-airbnb/index.js

@@ -4,8 +4,8 @@
   "description": "Airbnb's ESLint config, following our styleguide",
   "main": "index.js",
   "scripts": {
-    "lint": "./node_modules/.bin/eslint .",
-    "test": "./node_modules/.bin/babel-tape-runner ./test/test-*.js"
+    "lint": "eslint .",
+    "test": "babel-tape-runner ./test/test-*.js"
   },
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
   },
   "homepage": "https://github.com/airbnb/javascript",
   "devDependencies": {
-    "babel-eslint": "4.0.10",
+    "babel-eslint": "4.1.3",
     "babel-tape-runner": "1.2.0",
-    "eslint": "1.3.0",
-    "eslint-plugin-react": "3.2.3",
+    "eslint": "1.5.1",
+    "eslint-plugin-react": "3.4.2",
     "react": "0.13.3",
     "tape": "4.2.0"
   }