From d0a134d06a0df77ea20e51ec9a56aec85d0d0c8c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sun, 9 Jul 2017 02:19:36 +0000
Subject: [PATCH 1/2] chore(package): update eslint to version 4.2.0

Closes #360
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d7f2e11f..a80b86ca 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "babel-eslint": "7.2.3",
-    "eslint": "3.19.0",
+    "eslint": "4.2.0",
     "eslint-plugin-import": "2.2.0",
     "eslint-plugin-react": "7.0.0",
     "karma": "1.7.0",

From 69c82e55bfb6f6b94863482ace1e19ed3cc74f83 Mon Sep 17 00:00:00 2001
From: Daniel Stucki <daniel@stucki.me>
Date: Thu, 13 Jul 2017 22:21:22 +0200
Subject: [PATCH 2/2] wrap ecmaFeatures in parserOptions

as suggested here https://github.com/eslint/eslint/issues/8726
---
 .eslintrc.json        | 6 ++++--
 client/.eslintrc.json | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 4efea985..075f4cfb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,6 +1,8 @@
 {
-  "ecmaFeatures": {
-    "modules": true
+  "parserOptions": {
+    "ecmaFeatures": {
+      "modules": true
+    }
   },
   "env": {
     "node": true
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
index 50646154..39fbdecc 100644
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -1,6 +1,8 @@
 {
-  "ecmaFeatures": {
-    "jsx": true
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    }
   },
   "env": {
     "browser": true