Merge remote-tracking branch 'DenisIzmaylov/master'

Author: gaearon

.eslintrc

@@ -1,20 +1,17 @@
 {
-  "ecmaFeatures": {
-    "jsx": true,
-    "modules": true
-  },
+  "extends": "eslint-config-airbnb",
   "env": {
     "browser": true,
     "mocha": true,
     "node": true
   },
-  "parser": "babel-eslint",
   "rules": {
-    "quotes": [2, "single"],
-    "strict": [2, "never"],
     "react/jsx-uses-react": 2,
     "react/jsx-uses-vars": 2,
-    "react/react-in-jsx-scope": 2
+    "react/react-in-jsx-scope": 2,
+
+    // Temporarily disabled for test/* until babel/babel-eslint#33 is resolved
+    "padded-blocks": 0
   },
   "plugins": [
     "react"

package.json

@@ -39,7 +39,8 @@
     "babel-core": "^5.5.8",
     "babel-eslint": "^3.1.15",
     "babel-loader": "^5.1.4",
-    "eslint": "^0.22.1",
+    "eslint": "^0.23",
+    "eslint-config-airbnb": "0.0.6",
     "eslint-plugin-react": "^2.3.0",
     "expect": "^1.6.0",
     "istanbul": "^0.3.15",

src/Redux.js

@@ -4,17 +4,18 @@ import thunkMiddleware from './middleware/thunk';
 
 export default class Redux {
   constructor(dispatcher, initialState) {
+    let finalDispatcher = dispatcher;
     if (typeof dispatcher === 'object') {
       // A shortcut notation to use the default dispatcher
-      dispatcher = createDispatcher(
+      finalDispatcher = createDispatcher(
         composeStores(dispatcher),
-        getState => [thunkMiddleware(getState)]
+        (getState) => [thunkMiddleware(getState)]
       );
     }
 
     this.state = initialState;
     this.listeners = [];
-    this.replaceDispatcher(dispatcher);
+    this.replaceDispatcher(finalDispatcher);
   }
 
   getDispatcher() {
@@ -44,7 +45,7 @@ export default class Redux {
     const { listeners } = this;
     listeners.push(listener);
 
-    return function unsubscribe () {
+    return function unsubscribe() {
       const index = listeners.indexOf(listener);
       listeners.splice(index, 1);
     };

src/components/createConnector.js

@@ -31,9 +31,8 @@ export default function createConnector(React) {
         return true;
       } else if (typeof slice !== 'object' || typeof nextSlice !== 'object') {
         return isRefEqual;
-      } else {
-        return shallowEqual(slice, nextSlice);
       }
+      return shallowEqual(slice, nextSlice);
     }
 
     constructor(props, context) {

src/index.js

@@ -1,8 +1,16 @@
 // Core
-export createRedux from './createRedux';
-export createDispatcher from './createDispatcher';
+import createRedux from './createRedux';
+import createDispatcher from './createDispatcher';
 
 // Utilities
-export composeMiddleware from './utils/composeMiddleware';
-export composeStores from './utils/composeStores';
-export bindActionCreators from './utils/bindActionCreators';
+import composeMiddleware from './utils/composeMiddleware';
+import composeStores from './utils/composeStores';
+import bindActionCreators from './utils/bindActionCreators';
+
+export {
+  createRedux,
+  createDispatcher,
+  composeMiddleware,
+  composeStores,
+  bindActionCreators
+};

src/utils/composeStores.js

@@ -2,9 +2,9 @@ import mapValues from '../utils/mapValues';
 import pick from '../utils/pick';
 
 export default function composeStores(stores) {
-  stores = pick(stores, (val) => typeof val === 'function');
+  const finalStores = pick(stores, (val) => typeof val === 'function');
   return function Composition(atom = {}, action) {
-    return mapValues(stores, (store, key) =>
+    return mapValues(finalStores, (store, key) =>
       store(atom[key], action)
     );
   };

src/utils/shallowEqual.js

@@ -3,19 +3,18 @@ export default function shallowEqual(objA, objB) {
     return true;
   }
 
-  var keysA = Object.keys(objA);
-  var keysB = Object.keys(objB);
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(objB);
 
   if (keysA.length !== keysB.length) {
     return false;
   }
 
   // Test for A's keys different from B.
-  var hasOwn = Object.prototype.hasOwnProperty;
-  for (var i = 0; i < keysA.length; i++) {
+  const hasOwn = Object.prototype.hasOwnProperty;
+  for (let i = 0; i < keysA.length; i++) {
     if (!hasOwn.call(objB, keysA[i]) ||
         objA[keysA[i]] !== objB[keysA[i]]) {
-
       return false;
     }
   }

src/utils/shallowEqualScalar.js

@@ -8,22 +8,22 @@ export default function shallowEqualScalar(objA, objB) {
     return false;
   }
 
-  var keysA = Object.keys(objA);
-  var keysB = Object.keys(objB);
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(objB);
 
   if (keysA.length !== keysB.length) {
     return false;
   }
 
   // Test for A's keys different from B.
-  var hasOwn = Object.prototype.hasOwnProperty;
-  for (var i = 0; i < keysA.length; i++) {
+  const hasOwn = Object.prototype.hasOwnProperty;
+  for (let i = 0; i < keysA.length; i++) {
     if (!hasOwn.call(objB, keysA[i])) {
       return false;
     }
 
-    var valA = objA[keysA[i]];
-    var valB = objB[keysA[i]];
+    const valA = objA[keysA[i]];
+    const valB = objB[keysA[i]];
 
     if (valA !== valB || typeof valA === 'object' || typeof valB === 'object') {
       return false;