Merge branch 'master' of https://github.com/airbnb/javascript into update

Author: ong

README.md

@@ -34,8 +34,8 @@
   // Prohibit use of a variable before it is defined.
   "latedef": true,
 
-  // Enforce line length to 80 characters
-  "maxlen": 80,
+  // Enforce line length to 100 characters
+  "maxlen": 100,
 
   // Require capitalized names for constructor functions.
   "newcap": true,

linters/jshintrc renamed to linters/.jshintrc

@@ -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/.eslintrc

@@ -0,0 +1,88 @@
+3.1.0 / 2016-01-07
+==================
+ - [minor] Allow multiple stateless components in a single file
+
+3.0.2 / 2016-01-06
+==================
+ - [fix] Ignore URLs in `max-len` (#664)
+
+3.0.1 / 2016-01-06
+==================
+ - [fix] because we use babel, keywords should not be quoted
+
+3.0.0 / 2016-01-04
+==================
+ - [breaking] enable `quote-props` rule (#632)
+ - [breaking] Define a max line length of 100 characters (#639)
+ - [breaking] [react] Minor cleanup for the React styleguide, add `react/jsx-no-bind` (#619)
+ - [breaking] update best-practices config to prevent parameter object manipulation (#627)
+ - [minor] Enable react/no-is-mounted rule (#635, #633)
+ - [minor] Sort react/prefer-es6-class alphabetically (#634)
+ - [minor] enable react/prefer-es6-class rule
+ - Permit strict mode in "legacy" config
+ - [react] add missing rules from eslint-plugin-react (enforcing where necessary) (#581)
+ - [dev deps] update `eslint-plugin-react`
+
+2.1.1 / 2015-12-15
+==================
+ - [fix] Remove deprecated react/jsx-quotes (#622)
+
+2.1.0 / 2015-12-15
+==================
+ - [fix] use `require.resolve` to allow nested `extend`s (#582)
+ - [new] enable `object-shorthand` rule (#621)
+ - [new] enable `arrow-spacing` rule (#517)
+ - [docs] flesh out react rule defaults (#618)
+
+2.0.0 / 2015-12-03
+==================
+ - [breaking] `space-before-function-paren`: require function spacing: `function <optional name>(` (#605)
+ - [breaking] `indent`: Fix switch statement indentation rule (#606)
+ - [breaking] `array-bracket-spacing`, `computed-property-spacing`: disallow spacing inside brackets (#594)
+ - [breaking] `object-curly-spacing`: require padding inside curly braces (#594)
+ - [breaking] `space-in-parens`: disallow spaces in parens (#594)
+
+1.0.2 / 2015-11-25
+==================
+ - [breaking] `no-multiple-empty-lines`: only allow 1 blank line at EOF (#578)
+ - [new] `restParams`: enable rest params (#592)
+
+1.0.1 / 2015-11-25
+==================
+ - *erroneous publish*
+
+1.0.0 / 2015-11-08
+==================
+ - require `eslint` `v1.0.0` or higher
+ - remove `babel-eslint` dependency
+
+0.1.1 / 2015-11-05
+==================
+ - remove id-length rule (#569)
+ - enable `no-mixed-spaces-and-tabs` (#539)
+ - enable `no-const-assign` (#560)
+ - enable `space-before-keywords` (#554)
+
+0.1.0 / 2015-11-05
+==================
+ - switch to modular rules files courtesy the [eslint-config-default][ecd] project and [@taion][taion]. [PR][pr-modular]
+ - export `eslint-config-airbnb/legacy` for ES5-only users. `eslint-config-airbnb/legacy` does not require the `babel-eslint` parser. [PR][pr-legacy]
+
+0.0.9 / 2015-09-24
+==================
+- add rule `no-undef`
+- add rule `id-length`
+
+0.0.8 / 2015-08-21
+==================
+ - now has a changelog
+ - now is modular (see instructions above for with react and without react versions)
+
+0.0.7 / 2015-07-30
+==================
+ - TODO: fill in
+
+[ecd]: https://github.com/walmartlabs/eslint-config-defaults
+[taion]: https://github.com/taion
+[pr-modular]: https://github.com/airbnb/javascript/pull/526
+[pr-legacy]: https://github.com/airbnb/javascript/pull/527

packages/eslint-config-airbnb/CHANGELOG.md

@@ -1,19 +1,35 @@
 # eslint-config-airbnb
 
+[![npm version](https://badge.fury.io/js/eslint-config-airbnb.svg)](http://badge.fury.io/js/eslint-config-airbnb)
+
 This package provides Airbnb's .eslintrc as an extensible shared config.
 
 ## Usage
 
-### With React Style
+We export three ESLint configurations for your usage.
+
+### eslint-config-airbnb
+
+Our default export contains all of our ESLint rules, including EcmaScript 6+
+and React. It requires `eslint` and `eslint-plugin-react`.
 
-1. `npm install --save-dev eslint-config-airbnb babel-eslint eslint-plugin-react`
+1. `npm install --save-dev eslint-config-airbnb eslint-plugin-react eslint`
 2. add `"extends": "airbnb"` to your .eslintrc
 
-### Without React Style
+### eslint-config-airbnb/base
 
-1. `npm install --save-dev eslint-config-airbnb babel-eslint `
+Lints ES6+ but does not lint React. Requires `eslint`.
+
+1. `npm install --save-dev eslint-config-airbnb eslint`
 2. add `"extends": "airbnb/base"` to your .eslintrc
 
+### eslint-config-airbnb/legacy
+
+Lints ES5 and below. Only requires `eslint`.
+
+1. `npm install --save-dev eslint-config-airbnb eslint`
+2. add `"extends": "airbnb/legacy"` to your .eslintrc
+
 See [Airbnb's Javascript styleguide](https://github.com/airbnb/javascript) and
 the [ESlint config docs](http://eslint.org/docs/user-guide/configuring#extending-configuration-files)
 for more information.
@@ -27,9 +43,3 @@ programming to structure our README as test cases for our .eslintrc?
 You can run tests with `npm test`.
 
 You can make sure this module lints with itself using `npm run lint`.
-
-## Changelog
-
-### 0.0.8
- - now has a changelog
- - now is modular (see instructions above for with react and without react versions)

packages/eslint-config-airbnb/README.md

@@ -0,0 +1,7 @@
+module.exports = {
+  'extends': [
+    'eslint-config-airbnb/legacy',
+    'eslint-config-airbnb/rules/es6',
+  ].map(require.resolve),
+  'rules': {}
+};

packages/eslint-config-airbnb/base.js

@@ -1,13 +1,8 @@
-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': [
+    'eslint-config-airbnb/base',
+    'eslint-config-airbnb/rules/strict',
+    'eslint-config-airbnb/rules/react',
+  ].map(require.resolve),
+  rules: {}
+};

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

@@ -0,0 +1,20 @@
+module.exports = {
+  'extends': [
+    'eslint-config-airbnb/rules/best-practices',
+    'eslint-config-airbnb/rules/errors',
+    'eslint-config-airbnb/rules/legacy',
+    'eslint-config-airbnb/rules/node',
+    'eslint-config-airbnb/rules/style',
+    'eslint-config-airbnb/rules/variables'
+  ].map(require.resolve),
+  'env': {
+    'browser': true,
+    'node': true,
+    'amd': false,
+    'mocha': false,
+    'jasmine': false
+  },
+  'ecmaFeatures': {},
+  'globals': {},
+  'rules': {}
+};