Skip to content
This repository was archived by the owner on Sep 12, 2019. It is now read-only.

Commit a24c783

Browse files
author
sw-yx
committed
bugfixes for no-detector netlify dev setup
1 parent 50c9ed3 commit a24c783

File tree

1 file changed

+29
-12
lines changed

1 file changed

+29
-12
lines changed

src/detect-server.js

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,27 +86,48 @@ module.exports.serverSettings = async devConfig => {
8686
}
8787

8888
/** 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+
);
8996

9097
if (devConfig) {
9198
settings = settings || {};
9299
if (devConfig.command) {
93100
settings.command = assignLoudly(
94101
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
97105
settings.args = assignLoudly(
98106
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
101110
}
102111
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
104117
const regexp =
105118
devConfig.urlRegexp ||
106119
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+
);
108125
}
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
110131
}
111132
return settings;
112133
};
@@ -115,11 +136,7 @@ module.exports.serverSettings = async devConfig => {
115136
function assignLoudly(
116137
optionalValue,
117138
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)
123140
) {
124141
if (defaultValue === undefined) throw new Error("must have a defaultValue");
125142
if (defaultValue !== optionalValue && optionalValue === undefined) {

0 commit comments

Comments
 (0)