Skip to content

Commit 94e1b64

Browse files
committed
Fix ESLint output formatting
The `formatter` option is incompatible with with `thread-loader`. The `formatter` option previously accepted a function which was lost during JSON serialization.
1 parent 060f6dd commit 94e1b64

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

config/webpack.config.dev.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
1515
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
1616
const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
1717
const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
18-
const eslintFormatter = require('react-dev-utils/eslintFormatter');
1918
const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
2019
const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
2120
const getClientEnvironment = require('./env');
@@ -181,7 +180,7 @@ module.exports = {
181180
use: [
182181
{
183182
options: {
184-
formatter: eslintFormatter,
183+
formatter: require.resolve('react-dev-utils/eslintFormatter'),
185184
eslintPath: require.resolve('eslint'),
186185
baseConfig: {
187186
extends: [require.resolve('eslint-config-react-app')],
@@ -225,7 +224,7 @@ module.exports = {
225224
{
226225
loader: require.resolve('thread-loader'),
227226
options: {
228-
poolTimeout: Infinity // keep workers alive for more effective watch mode
227+
poolTimeout: Infinity, // keep workers alive for more effective watch mode
229228
},
230229
},
231230
{
@@ -266,7 +265,7 @@ module.exports = {
266265
{
267266
loader: require.resolve('thread-loader'),
268267
options: {
269-
poolTimeout: Infinity // keep workers alive for more effective watch mode
268+
poolTimeout: Infinity, // keep workers alive for more effective watch mode
270269
},
271270
},
272271
{

config/webpack.config.prod.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
1818
const ManifestPlugin = require('webpack-manifest-plugin');
1919
const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
2020
const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
21-
const eslintFormatter = require('react-dev-utils/eslintFormatter');
2221
const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
2322
const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
2423
const paths = require('./paths');
@@ -219,7 +218,7 @@ module.exports = {
219218
use: [
220219
{
221220
options: {
222-
formatter: eslintFormatter,
221+
formatter: require.resolve('react-dev-utils/eslintFormatter'),
223222
eslintPath: require.resolve('eslint'),
224223
// TODO: consider separate config for production,
225224
// e.g. to enable no-console and no-debugger only in production.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"dotenv-expand": "4.2.0",
3939
"eslint": "4.19.1",
4040
"eslint-config-react-app": "^2.1.0",
41-
"eslint-loader": "2.0.0",
41+
"eslint-loader": "Timer/eslint-loader#e242479990d520213425a0180e5c749b2e71c1ce",
4242
"eslint-plugin-flowtype": "2.46.3",
4343
"eslint-plugin-import": "2.11.0",
4444
"eslint-plugin-jsx-a11y": "6.0.3",

0 commit comments

Comments
 (0)