From 00f6be377b17ebabd687b903e7d39e4376c45f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90inh=20Quang=20Trung?= <trungdq88@gmail.com>
Date: Fri, 7 Jul 2017 17:40:29 +0700
Subject: [PATCH] ESLint 4 (#2735)

* Update eslint-loader 1.7.1 -> 1.9.0

* Add eslintPath option

* Update eslint 3.19.0 -> 4.1.1

* Update peer dependencies

* Move eslintPath config to outside @remove-on-eject
---
 packages/eslint-config-react-app/package.json        | 2 +-
 packages/react-scripts/config/webpack.config.dev.js  | 1 +
 packages/react-scripts/config/webpack.config.prod.js | 1 +
 packages/react-scripts/package.json                  | 8 ++++----
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
index cd36a70e5c..559e78b256 100644
--- a/packages/eslint-config-react-app/package.json
+++ b/packages/eslint-config-react-app/package.json
@@ -12,7 +12,7 @@
   ],
   "peerDependencies": {
     "babel-eslint": "^7.2.3",
-    "eslint": "^3.19.0",
+    "eslint": "^4.1.1",
     "eslint-plugin-flowtype": "^2.33.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^5.0.3",
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 987e7a3570..ea749495b5 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -136,6 +136,7 @@ module.exports = {
           {
             options: {
               formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
               // @remove-on-eject-begin
               baseConfig: {
                 extends: [require.resolve('eslint-config-react-app')],
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 1ba1307bb3..f943ef9ece 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -136,6 +136,7 @@ module.exports = {
           {
             options: {
               formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
               // @remove-on-eject-begin
               // TODO: consider separate config for production,
               // e.g. to enable no-console and no-debugger only in production.
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 5c1225e1d3..d0eddad69e 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -32,12 +32,12 @@
     "chalk": "1.1.3",
     "css-loader": "0.28.4",
     "dotenv": "4.0.0",
-    "eslint": "3.19.0",
+    "eslint": "4.1.1",
     "eslint-config-react-app": "^1.0.5",
-    "eslint-loader": "1.7.1",
+    "eslint-loader": "1.9.0",
     "eslint-plugin-flowtype": "2.34.0",
-    "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsx-a11y": "5.0.3",
+    "eslint-plugin-import": "2.7.0",
+    "eslint-plugin-jsx-a11y": "5.1.1",
     "eslint-plugin-react": "7.1.0",
     "extract-text-webpack-plugin": "2.1.2",
     "file-loader": "0.11.2",