Merge pull request #486 from goatslacker/use-airbnb-eslint-config

Update to use airbnb eslint config
goatslacker · Sep 12, 2015 · 4452deb · 4452deb
2 parents b7ab806 + 4df074d
commit 4452deb
Show file tree

Hide file tree

Showing 31 changed files with 116 additions and 262 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,4 +1,5 @@
 {
+  "extends": "airbnb",
   "env": {
     "node": true,
     "browser": true,
@@ -13,172 +14,8 @@
     "react"
   ],
   "rules": {
-    /* airbnb javascript style guide rules */
-    "strict": [2, "never"],
-    // es6
-    "no-var": 0,
-    // variables
-    "no-shadow": 2,
-    "no-shadow-restricted-names": 2,
-    "no-unused-vars": [2, {
-      "vars": "local",
-      "args": "after-used"
-    }],
-    "no-use-before-define": 2,
-    // possible errors
-    "comma-dangle": [0, "always"],
-    "no-cond-assign": [2, "always"],
-    "no-debugger": 1,
-    "no-alert": 1,
-    "no-constant-condition": 1,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-empty": 2,
-    "no-ex-assign": 2,
-    "no-extra-boolean-cast": 0,
-    "no-extra-semi": 2,
-    "no-func-assign": 2,
-    "no-inner-declarations": 2,
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-obj-calls": 2,
-    "no-reserved-keys": 2,
-    "no-sparse-arrays": 2,
-    "no-unreachable": 2,
-    "use-isnan": 2,
-    "block-scoped-var": 2,
-    // best practices
-    "consistent-return": 2,
-    "curly": [2, "multi-line"],
-    "default-case": 2,
-    "dot-notation": [2, {
-      "allowKeywords": true
-    }],
-    "eqeqeq": 2,
-    "guard-for-in": 2,
-    "no-caller": 2,
-    "no-eq-null": 0,
-    "no-eval": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-implied-eval": 2,
-    "no-lone-blocks": 2,
-    "no-loop-func": 2,
-    "no-multi-str": 2,
-    "no-native-reassign": 2,
-    "no-new": 2,
-    "no-new-func": 2,
-    "no-new-wrappers": 2,
-    "no-octal": 2,
-    "no-octal-escape": 2,
-    "no-param-reassign": 2,
-    "no-proto": 2,
-    "no-redeclare": 2,
-    "no-return-assign": 2,
-    "no-script-url": 2,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-throw-literal": 2,
-    "no-with": 2,
-    "radix": 2,
-    "vars-on-top": 2,
-    "wrap-iife": [2, "any"],
-    "yoda": 2,
-    // style
-    "indent": [2, 2],
-    "brace-style": [2,
-      "1tbs", {
-        "allowSingleLine": true
-      }],
-      "quotes": [
-        2, "single", "avoid-escape"
-      ],
-      "camelcase": [2, {
-        "properties": "never"
-      }],
-      "comma-spacing": [2, {
-        "before": false,
-        "after": true
-      }],
-      "comma-style": [2, "last"],
-      "eol-last": 2,
-      "key-spacing": [2, {
-        "beforeColon": false,
-        "afterColon": true
-      }],
-      "new-cap": [2, {
-        "newIsCap": true
-      }],
-      "no-multiple-empty-lines": [2, {
-        "max": 2
-      }],
-      "no-nested-ternary": 2,
-      "no-new-object": 2,
-      "no-spaced-func": 2,
-      "no-trailing-spaces": 2,
-      "no-wrap-func": 2,
-      "no-underscore-dangle": 0,
-      "one-var": [2, "never"],
-      "padded-blocks": [2, "never"],
-      "semi-spacing": [2, {
-        "before": false,
-        "after": true
-      }],
-      "space-after-keywords": 2,
-      "space-before-blocks": 2,
-      "space-infix-ops": 2,
-      "space-return-throw-case": 2,
-      "spaced-line-comment": 2,
-
-    /* custom rules */
-    "no-console": 0,
-    "space-before-function-paren": [2, {
-      "named": "never",
-      "anonymous": "always"
-    }],
     "semi": [2, "never"],
-    "func-names": 0,
-    "consistent-this": [2, "this"],
-    "func-style": [0, "expression"],
-    "generator-star": [2, "end"],
-    "max-nested-callbacks": [2, 3],
-    "new-parens": 2,
-    "no-array-constructor": 2,
-    "no-else-return": 0,
-    "no-inline-comments": 2,
-    "no-lonely-if": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multiple-empty-lines": [1, {
-      "max": 2
-    }],
-    "no-ternary": 0,
-    "operator-assignment": 0,
-    "quote-props": [2, "as-needed"],
-    "sort-vars": [0, {
-      "ignoreCase": true
-    }],
-    "space-in-brackets": [0, "never",
-      {
-        "arraysInArrays": false,
-        "arraysInObjects": false,
-        "singleValue": false,
-        "objectsInArrays": false,
-        "objectsInObjects": false,
-        "propertyName": false
-      }
-    ],
-    "space-in-parens": [2, "never"],
-    "space-unary-ops": [2,
-      {
-        "words": true,
-        "nonwords": false
-      }
-    ],
-    "wrap-regex": 2,
-
-    /* react rules */
-    "react/jsx-uses-vars": 1
+    "no-eq-null": 0,
+    "space-before-function-paren": 2
   }
 }
diff --git a/components/AltContainer.js b/components/AltContainer.js
@@ -1,3 +1,4 @@
+/*eslint-disable*/
 /**
  * AltContainer.
  *

diff --git a/components/AltNativeContainer.js b/components/AltNativeContainer.js
@@ -1,3 +1,4 @@
+/*eslint-disable*/
 /**
  * AltNativeContainer.
  *

diff --git a/components/mixinContainer.js b/components/mixinContainer.js
@@ -1,3 +1,4 @@
+/*eslint-disable*/
 var Subscribe = require('../mixins/Subscribe')
 var assign = require('../utils/functions').assign
 

diff --git a/package.json b/package.json
@@ -18,7 +18,8 @@
     "coveralls": "2.11.4",
     "envify": "^3.4.0",
     "es6-promise": "^2.1.1",
-    "eslint": "0.24.1",
+    "eslint": "1.4.1",
+    "eslint-config-airbnb": "0.0.8",
     "eslint-plugin-react": "2.5.2",
     "ghooks": "^0.3.2",
     "immutable": "^3.7.2",

diff --git a/src/alt/addons.js b/src/alt/addons.js
@@ -21,7 +21,7 @@ Alt.addons = {
   chromeDebug,
   connectToStores,
   makeFinalStore,
-  withAltContext
+  withAltContext,
 }
 
 export default Alt
diff --git a/src/alt/index.js b/src/alt/index.js
@@ -1,4 +1,4 @@
-/*global window*/
+/* global window */
 import { Dispatcher } from 'flux'
 
 import * as StateFunctions from './utils/StateFunctions'
@@ -30,7 +30,7 @@ class Alt {
         id,
         action,
         data,
-        details
+        details,
       })
     })
   }
@@ -50,7 +50,7 @@ class Alt {
     store.createStoreConfig(this.config, StoreModel)
     const Store = store.transformStore(this.storeTransforms, StoreModel)
 
-    /*istanbul ignore next*/
+    /* istanbul ignore next */
     if (module.hot) delete this.stores[key]
 
     if (this.stores[key] || !key) {

diff --git a/src/alt/store/AltStore.js b/src/alt/store/AltStore.js
@@ -28,12 +28,12 @@ class AltStore {
           this.lifecycle('error', {
             error: e,
             payload,
-            state: this.state
+            state: this.state,
           })
           return false
-        } else {
-          throw e
         }
+
+        throw e
       }
     }
 
@@ -45,7 +45,7 @@ class AltStore {
 
       this.lifecycle('beforeEach', {
         payload,
-        state: this.state
+        state: this.state,
       })
 
       const actionHandlers = model.actionListeners[payload.action]
@@ -77,7 +77,7 @@ class AltStore {
 
       this.lifecycle('afterEach', {
         payload,
-        state: this.state
+        state: this.state,
       })
     })
 

diff --git a/src/alt/store/StoreMixin.js b/src/alt/store/StoreMixin.js
@@ -46,7 +46,9 @@ const StoreMixin = {
         const value = spec.local && spec.local(state, ...args)
         const shouldFetch = spec.shouldFetch
           ? spec.shouldFetch(state, ...args)
+          /*eslint-disable*/
           : value == null
+          /*eslint-enable*/
         const intercept = spec.interceptResponse || (x => x)
 
         const makeActionHandler = (action, isError) => {
@@ -56,7 +58,7 @@ const StoreMixin = {
               action(intercept(x, action, args))
               if (isError) throw x
             }
-            return this.alt.trapAsync ? (() => fire()) : fire()
+            return this.alt.trapAsync ? () => fire() : fire()
           }
         }
 
@@ -69,19 +71,19 @@ const StoreMixin = {
             makeActionHandler(spec.success),
             makeActionHandler(spec.error, 1)
           )
-        } else {
-          // otherwise emit the change now
-          this.emitChange()
-          return value
         }
+
+        // otherwise emit the change now
+        this.emitChange()
+        return value
       }
 
       return publicMethods
     }, {})
 
     this.exportPublicMethods(toExport)
     this.exportPublicMethods({
-      isLoading: () => loadCounter > 0
+      isLoading: () => loadCounter > 0,
     })
   },
 
@@ -170,7 +172,7 @@ const StoreMixin = {
         this.bindAction(symbol, listener)
       }
     }, [obj])
-  }
+  },
 }
 
 export default StoreMixin
diff --git a/src/alt/store/index.js b/src/alt/store/index.js
@@ -38,7 +38,7 @@ function createPrototype(proto, alt, key, extras) {
     dispatcher: alt.dispatcher,
     preventDefault() {
       this.getInstance().preventDefault = true
-    }
+    },
   }, extras)
 }
 
@@ -49,11 +49,11 @@ export function createStoreConfig(globalConfig, StoreModel) {
         return state.slice()
       } else if (Object.prototype.toString.call(state) === '[object Object]') {
         return fn.assign({}, state)
-      } else {
-        return state
       }
+
+      return state
     },
-    setState: fn.assign
+    setState: fn.assign,
   }, globalConfig, StoreModel.config)
 }
 
@@ -70,22 +70,22 @@ export function createStoreFromObject(alt, StoreModel, key) {
     },
     setState(nextState) {
       doSetState(this, storeInstance, nextState)
-    }
+    },
   }, StoreModel))
 
   // bind the store listeners
   /* istanbul ignore else */
   if (StoreProto.bindListeners) {
     StoreMixin.bindListeners.call(
       StoreProto,
-      StoreProto.bindListeners
+      StoreProto.bindListeners,
     )
   }
   /* istanbul ignore else */
   if (StoreProto.observe) {
     StoreMixin.bindListeners.call(
       StoreProto,
-      StoreProto.observe(alt)
+      StoreProto.observe(alt),
     )
   }
 
@@ -131,7 +131,7 @@ export function createStoreFromClass(alt, StoreModel, key, ...argsForClass) {
     },
     setState(nextState) {
       doSetState(this, storeInstance, nextState)
-    }
+    },
   })
 
   const store = new Store(...argsForClass)
@@ -148,7 +148,7 @@ export function createStoreFromClass(alt, StoreModel, key, ...argsForClass) {
     ),
     utils.getInternalMethods(StoreModel),
     config.publicMethods,
-    { displayName: key }
+    { displayName: key },
   )
 
   return storeInstance