From e19bbb15851668dc268fc0837ca5b578e427362a Mon Sep 17 00:00:00 2001 From: Trung Dinh Quang Date: Thu, 6 Jul 2017 16:31:19 +0700 Subject: [PATCH 1/5] Update eslint-loader 1.7.1 -> 1.9.0 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 5c1225e1d3..39f3b1e102 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -34,7 +34,7 @@ "dotenv": "4.0.0", "eslint": "3.19.0", "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", From 02fa3fcd3a971ae47f306366d8e5ebe91fca8bc5 Mon Sep 17 00:00:00 2001 From: Trung Dinh Quang Date: Thu, 6 Jul 2017 16:37:44 +0700 Subject: [PATCH 2/5] Add eslintPath option --- packages/react-scripts/config/webpack.config.dev.js | 1 + packages/react-scripts/config/webpack.config.prod.js | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js index 987e7a3570..c131c54d09 100644 --- a/packages/react-scripts/config/webpack.config.dev.js +++ b/packages/react-scripts/config/webpack.config.dev.js @@ -142,6 +142,7 @@ module.exports = { }, ignore: false, useEslintrc: false, + eslintPath: require.resolve('eslint'), // @remove-on-eject-end }, loader: require.resolve('eslint-loader'), diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js index 1ba1307bb3..5fcdcb14cb 100644 --- a/packages/react-scripts/config/webpack.config.prod.js +++ b/packages/react-scripts/config/webpack.config.prod.js @@ -144,6 +144,7 @@ module.exports = { }, ignore: false, useEslintrc: false, + eslintPath: require.resolve('eslint'), // @remove-on-eject-end }, loader: require.resolve('eslint-loader'), From 4595eef10f1f3a0608fa8bf7e22e88c684747368 Mon Sep 17 00:00:00 2001 From: Trung Dinh Quang Date: Fri, 7 Jul 2017 01:23:17 +0700 Subject: [PATCH 3/5] Update eslint 3.19.0 -> 4.1.1 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 39f3b1e102..ea1a8c1896 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -32,7 +32,7 @@ "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.9.0", "eslint-plugin-flowtype": "2.34.0", From 9939836e88a55d21b93385dca96f0cf83f5e7fcd Mon Sep 17 00:00:00 2001 From: Trung Dinh Quang Date: Fri, 7 Jul 2017 01:37:53 +0700 Subject: [PATCH 4/5] Update peer dependencies --- packages/eslint-config-react-app/package.json | 2 +- packages/react-scripts/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 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/package.json b/packages/react-scripts/package.json index ea1a8c1896..d0eddad69e 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -36,8 +36,8 @@ "eslint-config-react-app": "^1.0.5", "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", From a37d5b43a5e5ee35b93b3f45eb383d5b2f10de27 Mon Sep 17 00:00:00 2001 From: Trung Dinh Quang Date: Fri, 7 Jul 2017 08:40:53 +0700 Subject: [PATCH 5/5] Move eslintPath config to outside @remove-on-eject --- packages/react-scripts/config/webpack.config.dev.js | 2 +- packages/react-scripts/config/webpack.config.prod.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js index c131c54d09..ea749495b5 100644 --- a/packages/react-scripts/config/webpack.config.dev.js +++ b/packages/react-scripts/config/webpack.config.dev.js @@ -136,13 +136,13 @@ module.exports = { { options: { formatter: eslintFormatter, + eslintPath: require.resolve('eslint'), // @remove-on-eject-begin baseConfig: { extends: [require.resolve('eslint-config-react-app')], }, ignore: false, useEslintrc: false, - eslintPath: require.resolve('eslint'), // @remove-on-eject-end }, loader: require.resolve('eslint-loader'), diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js index 5fcdcb14cb..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. @@ -144,7 +145,6 @@ module.exports = { }, ignore: false, useEslintrc: false, - eslintPath: require.resolve('eslint'), // @remove-on-eject-end }, loader: require.resolve('eslint-loader'),