Skip to content

Commit 63e8924

Browse files
trungdq88JohnNilsson
authored andcommitted
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
1 parent 31e3ffe commit 63e8924

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

packages/eslint-config-react-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"peerDependencies": {
1414
"babel-eslint": "^7.2.3",
15-
"eslint": "^3.19.0",
15+
"eslint": "^4.1.1",
1616
"eslint-plugin-flowtype": "^2.33.0",
1717
"eslint-plugin-import": "^2.2.0",
1818
"eslint-plugin-jsx-a11y": "^5.0.3",

packages/react-scripts/config/webpack.config.dev.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,8 @@ module.exports = {
162162
{
163163
exclude: [
164164
/\.html$/,
165-
// We have to write /\.(js|jsx)(\?.*)?$/ rather than just /\.(js|jsx)$/
166-
// because you might change the hot reloading server from the custom one
167-
// to Webpack's built-in webpack-dev-server/client?/, which would not
168-
// get properly excluded by /\.(js|jsx)$/ because of the query string.
169-
// Webpack 2 fixes this, but for now we include this hack.
170-
// https://github.com/facebookincubator/create-react-app/issues/1713
171-
/\.(js|jsx)(\?.*)?$/,
172-
/\.(ts|tsx)(\?.*)?$/,
165+
/\.(js|jsx)$/,
166+
/\.(ts|tsx)$/,
173167
/\.css$/,
174168
/\.json$/,
175169
/\.bmp$/,
@@ -237,7 +231,7 @@ module.exports = {
237231
],
238232
},
239233
// ** STOP ** Are you adding a new loader?
240-
// Remember to add the new extension(s) to the "url" loader exclusion list.
234+
// Remember to add the new extension(s) to the "file" loader exclusion list.
241235
],
242236
},
243237
plugins: [

packages/react-scripts/config/webpack.config.prod.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ module.exports = {
189189
{
190190
test: /\.(ts|tsx)$/,
191191
include: paths.appSrc,
192-
loader: require.resolve('ts-loader')
192+
loader: require.resolve('ts-loader'),
193193
},
194194
// The notation here is somewhat confusing.
195195
// "postcss" loader applies autoprefixer to our CSS.

0 commit comments

Comments
 (0)