From 8489ee59c7658d7ed2d1e5eb0b1575aba562210e Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Tue, 15 Nov 2016 09:56:39 -0800
Subject: [PATCH] feat(lint): upgrade linter and add exceptions for dumb new
 rules

---
 build/config/eslint.json | 13 ++++++++++++-
 package.json             | 10 +++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/build/config/eslint.json b/build/config/eslint.json
index c3f709d31..f3d506040 100644
--- a/build/config/eslint.json
+++ b/build/config/eslint.json
@@ -54,7 +54,18 @@
     "react/forbid-prop-types": "off",
     "jsx-a11y/no-static-element-interactions": "off",
     "react/prop-types": ["error", {"ignore": ["children"]}],
-    "react/sort-comp": "error"
+    "react/sort-comp": "error",
+    "no-restricted-syntax": [
+      "error", "ForInStatement", "LabeledStatement", "WithStatement"
+    ],
+    "comma-dangle": ["error", {
+      "arrays": "always-multiline",
+      "objects": "always-multiline",
+      "imports": "always-multiline",
+      "exports": "always-multiline",
+      "functions": "ignore"
+    }],
+    "no-useless-return": "off"
   },
   "settings": {
     "import/core-modules": [ "nylas-exports", "nylas-component-kit", "electron", "nylas-store", "nylas-observables" ],
diff --git a/package.json b/package.json
index de3fbe081..e0eeb5d25 100644
--- a/package.json
+++ b/package.json
@@ -92,13 +92,13 @@
   },
   "devDependencies": {
     "flow-bin": "0.33.0",
-    "babel-eslint": "6.0.4",
-    "eslint": "3.8.0",
+    "babel-eslint": "7.1.0",
+    "eslint": "3.10.1",
     "eslint_d": "4.2.0",
-    "eslint-config-airbnb": "12.0.0",
-    "eslint-plugin-import": "1.16.0",
+    "eslint-config-airbnb": "13.0.0",
+    "eslint-plugin-import": "2.2.0",
     "eslint-plugin-jsx-a11y": "2.2.3",
-    "eslint-plugin-react": "6.4.1"
+    "eslint-plugin-react": "6.7.1"
   },
   "optionalDependencies": {
     "node-mac-notifier": "0.0.13"