File tree 1 file changed +15
-1
lines changed
packages/react-scripts/utils
1 file changed +15
-1
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,20 @@ function customizer(objValue, srcValue) {
8
8
}
9
9
}
10
10
11
+ function firstLevelCustomizer ( objValue , srcValue , paramName ) {
12
+ var array = customizer ( objValue , srcValue , paramName ) ;
13
+
14
+ if ( array ) return array ;
15
+
16
+ if ( paramName === 'eslint' && srcValue . configFile ) {
17
+ srcValue . configFile = resolveApp ( srcValue . configFile ) ;
18
+ }
19
+
20
+ if ( typeof srcValue === 'object' ) {
21
+ return mergeWith ( objValue , srcValue , customizer ) ;
22
+ }
23
+ }
24
+
11
25
function getWebpackConfig ( defaultPath ) {
12
26
var configPath = resolveApp ( process . env . WEBPACK_REPLACE , defaultPath ) ;
13
27
@@ -17,7 +31,7 @@ function getWebpackConfig(defaultPath) {
17
31
var resultConfig = extendConfig ? mergeWith (
18
32
initialConfig ,
19
33
require ( extendConfig ) ,
20
- customizer
34
+ firstLevelCustomizer
21
35
) : initialConfig ;
22
36
23
37
var babelConfigPath = resolveApp ( process . env . BABEL_REPLACE ) ;
You can’t perform that action at this time.
0 commit comments