@@ -86,27 +86,48 @@ module.exports.serverSettings = async devConfig => {
86
86
}
87
87
88
88
/** everything below assumes we have settled on one detector */
89
+ const tellUser = settingsField => dV =>
90
+ console . log (
91
+ `${ NETLIFYDEV } Overriding ${ chalk . yellow (
92
+ settingsField
93
+ ) } with setting derived from netlify.toml [dev] block: `,
94
+ dV
95
+ ) ;
89
96
90
97
if ( devConfig ) {
91
98
settings = settings || { } ;
92
99
if ( devConfig . command ) {
93
100
settings . command = assignLoudly (
94
101
devConfig . command . split ( / \s / ) [ 0 ] ,
95
- settings . command
96
- ) ;
102
+ settings . command || null ,
103
+ tellUser ( "command" )
104
+ ) ; // if settings.command is empty, its bc no settings matched
97
105
settings . args = assignLoudly (
98
106
devConfig . command . split ( / \s / ) . slice ( 1 ) ,
99
- settings . command
100
- ) ;
107
+ settings . command || null ,
108
+ tellUser ( "command" )
109
+ ) ; // if settings.command is empty, its bc no settings matched
101
110
}
102
111
if ( devConfig . port ) {
103
- settings . proxyPort = assignLoudly ( devConfig . port , settings . proxyPort ) ;
112
+ settings . proxyPort = assignLoudly (
113
+ devConfig . port ,
114
+ settings . proxyPort || null ,
115
+ tellUser ( "proxyPort" )
116
+ ) ; // if settings.proxyPort is empty, its bc no settings matched
104
117
const regexp =
105
118
devConfig . urlRegexp ||
106
119
new RegExp ( `(http://)([^:]+:)${ devConfig . port } (/)?` , "g" ) ;
107
- settings . urlRegexp = assignLoudly ( settings . urlRegexp , regexp ) ;
120
+ settings . urlRegexp = assignLoudly (
121
+ settings . urlRegexp ,
122
+ regexp ,
123
+ tellUser ( "urlRegexp" )
124
+ ) ;
108
125
}
109
- settings . dist = assignLoudly ( devConfig . publish , settings . dist ) ;
126
+ settings . dist = assignLoudly (
127
+ devConfig . publish ,
128
+ settings . dist || null ,
129
+ tellUser ( "dist" )
130
+ ) ; // if settings.dist is empty, its bc no settings matched
110
131
}
111
132
return settings ;
112
133
} ;
@@ -115,11 +136,7 @@ module.exports.serverSettings = async devConfig => {
115
136
function assignLoudly (
116
137
optionalValue ,
117
138
defaultValue ,
118
- tellUser = dV =>
119
- console . log (
120
- `${ NETLIFYDEV } Overriding ${ settingsField } with setting derived from netlify.toml [dev] block: ` ,
121
- dV
122
- )
139
+ tellUser = dV => console . log ( `No value specified, using fallback of ` , dV )
123
140
) {
124
141
if ( defaultValue === undefined ) throw new Error ( "must have a defaultValue" ) ;
125
142
if ( defaultValue !== optionalValue && optionalValue === undefined ) {
0 commit comments