From 86aba89411cef38e8d085765729d70749355cf8d Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Fri, 11 Dec 2015 15:22:18 -0800
Subject: [PATCH] Upgrade babel and eslint

---
 .babelrc     |  4 ++--
 .eslintrc    |  5 -----
 package.json | 22 ++++++++++------------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.babelrc b/.babelrc
index ce840ab8..3f0c62bb 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "stage": 0
-}
\ No newline at end of file
+  "presets": ["airbnb", "stage-0"]
+}
diff --git a/.eslintrc b/.eslintrc
index e30c8a92..ea5ab18c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -10,12 +10,7 @@
     "modules": true,
     "jsx": true
   },
-  "plugins": [
-    "react"
-  ],
   "rules": {
     "semi": [2, "never"],
-    "no-eq-null": 0,
-    "space-before-function-paren": 2
   }
 }
diff --git a/package.json b/package.json
index 346bf39f..32234c28 100644
--- a/package.json
+++ b/package.json
@@ -11,18 +11,17 @@
   },
   "devDependencies": {
     "alt-search-docs": "1.0.6",
-    "babel": "5.8.23",
-    "babel-core": "5.8.24",
-    "babel-eslint": "4.1.1",
-    "babel-loader": "5.3.2",
-    "babelify": "6.3.0",
+    "babel-cli": "6.3.17",
+    "babel-core": "6.3.17",
+    "babel-eslint": "5.0.0-beta6",
+    "babel-preset-airbnb": "1.0.1",
+    "babel-preset-stage-0": "6.3.13",
     "chai": "^2.3.0",
     "coveralls": "2.11.4",
-    "envify": "^3.4.0",
     "es6-promise": "^2.1.1",
-    "eslint": "1.4.1",
-    "eslint-config-airbnb": "0.0.8",
-    "eslint-plugin-react": "2.5.2",
+    "eslint": "1.10.3",
+    "eslint-config-airbnb": "2.0.0",
+    "eslint-plugin-react": "3.11.3",
     "ghooks": "^0.3.2",
     "immutable": "^3.7.2",
     "iso": "^4.1.0",
@@ -51,7 +50,7 @@
     "build": "npm run clean && npm run transpile && npm run build-alt-browser",
     "build-alt-browser": "webpack --config dist.config.js && webpack -p --config dist.min.config.js",
     "clean": "rimraf lib",
-    "coverage": "npm run transpile-cover && istanbul cover node_modules/mocha/bin/_mocha -- -u exports -R tap --require ./test/babel test",
+    "coverage": "npm run transpile-cover && babel-node node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -u exports -R tap test",
     "lint": "eslint src components",
     "postversion": "git push && git push --tags",
     "prepublish": "npm run lint && npm run build",
@@ -60,8 +59,7 @@
     "release": "npm run build && mversion patch -m",
     "size": "npm run transpile; browserify flux.js > flux-build.js; uglifyjs -m -c 'comparisons=false,keep_fargs=true,unsafe=true,unsafe_comps=true,warnings=false' flux-build.js  > flux-build.min.js",
     "test": "npm run test-node",
-    "test-browser": "browserify test/browser/index.js -t babelify --outfile test/browser/tests.js",
-    "test-node": "mocha -u exports -R nyan --require ./test/babel test",
+    "test-node": "babel-node node_modules/.bin/_mocha -u exports -R nyan test",
     "transpile": "babel src --out-dir lib",
     "transpile-cover": "babel src --out-dir lib -r",
     "version": "npm run build"