Merge pull request #1 from airbnb/master

David Sorrentino · David Sorrentino · commit e075bd3d9374 · 2016-01-25T17:58:11.000+01:00
Update from original
diff --git a/README.md b/README.md
@@ -2003,7 +2003,7 @@ Other Style Guides
     const val = inputValue >> 0;
     ```
 
-  - [21.5](#21.5) <a name='21.5'></a> **Note:** Be careful when using bitshift operations. Numbers are represented as [64-bit values](http://es5.github.io/#x4.3.19), but Bitshift operations always return a 32-bit integer ([source](http://es5.github.io/#x11.7)). Bitshift can lead to unexpected behavior for integer values larger than 32 bits. [Discussion](https://github.com/airbnb/javascript/issues/109). Largest signed 32-bit Int is 2,147,483,647:
+  - [21.5](#21.5) <a name='21.5'></a> **Note:** Be careful when using bitshift operations. Numbers are represented as [64-bit values](http://es5.github.io/#x4.3.19), but bitshift operations always return a 32-bit integer ([source](http://es5.github.io/#x11.7)). Bitshift can lead to unexpected behavior for integer values larger than 32 bits. [Discussion](https://github.com/airbnb/javascript/issues/109). Largest signed 32-bit Int is 2,147,483,647:
 
     ```javascript
     2147483647 >> 0 //=> 2147483647
diff --git a/packages/eslint-config-airbnb/CHANGELOG.md b/packages/eslint-config-airbnb/CHANGELOG.md
@@ -1,3 +1,11 @@
+4.0.0 / 2016-01-22
+==================
+ - [breaking] require outer IIFE wrapping; flesh out guide section
+ - [minor] Add missing `arrow-body-style`, `prefer-template` rules (#678)
+ - [minor] Add `prefer-arrow-callback` to ES6 rules (to match the guide) (#677)
+ - [Tests] run `npm run lint` as part of tests; fix errors
+ - [Tests] use `parallelshell` to parallelize npm run-scripts
+
 3.1.0 / 2016-01-07
 ==================
  - [minor] Allow multiple stateless components in a single file
diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-airbnb",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "description": "Airbnb's ESLint config, following our styleguide",
   "main": "index.js",
   "scripts": {
diff --git a/packages/eslint-config-airbnb/rules/best-practices.js b/packages/eslint-config-airbnb/rules/best-practices.js
@@ -1,6 +1,6 @@
 module.exports = {
   'rules': {
-    // Enforces getter/setter pairs in objects
+    // enforces getter/setter pairs in objects
     'accessor-pairs': 0,
     // treat var statements as if they were block scoped
     'block-scoped-var': 2,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-config-airbnb",`
`3`		`- "version": "3.1.0",`
	`3`	`+ "version": "4.0.0",`
`4`	`4`	`"description": "Airbnb's ESLint config, following our styleguide",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`