From 66815f0762afda35746994a2ff35ba0cd0b8dbbe Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 7 Aug 2015 18:09:35 -0700
Subject: [PATCH] bump eslint

---
 .eslintrc    | 10 +++++-----
 package.json |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index f06a712e01..8b22609201 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -19,7 +19,7 @@
     "router": true
   },
   "rules": {
-    "no-comma-dangle": 2,
+    "comma-dangle": 2,
     "no-cond-assign": 2,
     "no-console": 0,
     "no-constant-condition": 2,
@@ -27,7 +27,7 @@
     "no-debugger": 2,
     "no-dupe-keys": 2,
     "no-empty": 2,
-    "no-empty-class": 2,
+    "no-empty-character-class": 2,
     "no-ex-assign": 2,
     "no-extra-boolean-cast": 2,
     "no-extra-parens": 0,
@@ -163,12 +163,12 @@
     ],
     "no-nested-ternary": 2,
     "no-new-object": 2,
-    "no-space-before-semi": 2,
+    "semi-spacing": [2, { "before": false, "after": true }],
     "no-spaced-func": 2,
     "no-ternary": 0,
     "no-trailing-spaces": 1,
     "no-underscore-dangle": 0,
-    "no-wrap-func": 2,
+    "no-extra-parens": 2,
     "one-var": 0,
     "operator-assignment": 0,
     "padded-blocks": 0,
@@ -206,7 +206,7 @@
         "nonwords": false
       }
     ],
-    "spaced-line-comment": [
+    "spaced-comment": [
       2,
       "always",
       { "exceptions": ["-"] }
diff --git a/package.json b/package.json
index 1b20841b84..b27597c4fb 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "async": "~0.9.0",
     "babel": "5.6.14",
     "babel-core": "5.6.15",
+    "babel-eslint": "^4.0.5",
     "babel-loader": "5.2.2",
     "bcrypt-nodejs": "~0.0.3",
     "body-parser": "^1.13.2",
@@ -44,6 +45,8 @@
     "debug": "~2.1.0",
     "dotenv": "~0.4.0",
     "errorhandler": "~1.3.0",
+    "eslint": "^1.1.0",
+    "eslint-plugin-react": "^3.2.1",
     "express": "~4.10.4",
     "express-flash": "~0.0.2",
     "express-session": "~1.9.2",