@@ -11,11 +11,22 @@ const {
1111 flags : { buildPath, publicPath, reactScriptsVersion, verbose } ,
1212} = require ( '../utils/cliHandler' ) ;
1313const { getReactScriptsVersion, isEjected } = require ( '../utils' ) ;
14+
15+ const { major, minor, patch } = getReactScriptsVersion ( reactScriptsVersion ) ;
16+
1417const paths = isEjected ? importCwd ( './config/paths' ) : importCwd ( 'react-scripts/config/paths' ) ;
1518const webpack = importCwd ( 'webpack' ) ;
16- const config = isEjected
17- ? importCwd ( './config/webpack.config.dev' )
18- : importCwd ( 'react-scripts/config/webpack.config.dev' ) ;
19+
20+ const config = ( major >= 2 && minor >= 1 && patch >= 2 ) ?
21+ ( isEjected
22+ ? importCwd ( './config/webpack.config' )
23+ : importCwd ( 'react-scripts/config/webpack.config' ) ) ( 'development' )
24+ :
25+ isEjected
26+ ? importCwd ( './config/webpack.config.dev' )
27+ : importCwd ( 'react-scripts/config/webpack.config.dev' ) ;
28+
29+
1930const HtmlWebpackPlugin = importCwd ( 'html-webpack-plugin' ) ;
2031const InterpolateHtmlPlugin = importCwd ( 'react-dev-utils/InterpolateHtmlPlugin' ) ;
2132const getClientEnvironment = isEjected
@@ -50,8 +61,6 @@ config.output.filename = `js/bundle.js`;
5061config . output . chunkFilename = `js/[name].chunk.js` ;
5162
5263// update media path destination
53- const { major, minor, patch } = getReactScriptsVersion ( reactScriptsVersion ) ;
54-
5564if ( major >= 2 ) {
5665 const oneOfIndex = minor >= 1 || patch >= 4 ? 2 : 3 ;
5766 config . module . rules [ oneOfIndex ] . oneOf [ 0 ] . options . name = `media/[name].[hash:8].[ext]` ;
0 commit comments