Skip to content

Commit

Permalink
fix(server): set port before instantiating server (#2143)
Browse files Browse the repository at this point in the history
  • Loading branch information
joeldenning authored and evilebottnawi committed Jul 30, 2019
1 parent f80e2ae commit cfbf229
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 14 deletions.
16 changes: 4 additions & 12 deletions bin/webpack-dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const setupExitSignals = require('../lib/utils/setupExitSignals');
const colors = require('../lib/utils/colors');
const processOptions = require('../lib/utils/processOptions');
const createLogger = require('../lib/utils/createLogger');
const findPort = require('../lib/utils/findPort');
const getVersions = require('../lib/utils/getVersions');
const options = require('./options');

Expand Down Expand Up @@ -148,18 +147,11 @@ function startDevServer(config, options) {
});
});
} else {
findPort(options.port)
.then((port) => {
options.port = port;
server.listen(options.port, options.host, (err) => {
if (err) {
throw err;
}
});
})
.catch((err) => {
server.listen(options.port, options.host, (err) => {
if (err) {
throw err;
});
}
});
}
}

Expand Down
17 changes: 16 additions & 1 deletion lib/utils/processOptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const createConfig = require('./createConfig');
const defaultPort = require('./defaultPort');
const findPort = require('./findPort');

function processOptions(config, argv, callback) {
// processOptions {Promise}
Expand All @@ -23,7 +24,21 @@ function processOptions(config, argv, callback) {
// we should use portfinder.
const options = createConfig(config, argv, { port: defaultPort });

callback(config, options);
if (options.socket) {
callback(config, options);
} else {
findPort(options.port)
.then((port) => {
options.port = port;
callback(config, options);
})
.catch((err) => {
// eslint-disable-next-line no-console
console.error(err.stack || err);
// eslint-disable-next-line no-process-exit
process.exit(1);
});
}
}

module.exports = processOptions;
11 changes: 10 additions & 1 deletion test/cli/cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,22 @@ describe('CLI', () => {
testBin('--sockPath /mysockPath')
.then((output) => {
expect(
output.stdout.includes('http://localhost&sockPath=/mysockPath')
/http:\/\/localhost:[0-9]+&sockPath=\/mysockPath/.test(output.stdout)
).toEqual(true);
done();
})
.catch(done);
});

it('unspecified port', (done) => {
testBin('')
.then((output) => {
expect(/http:\/\/localhost:[0-9]+/.test(output.stdout)).toEqual(true);
done();
})
.catch(done);
});

it('--color', (done) => {
testBin('--color')
.then((output) => {
Expand Down

0 comments on commit cfbf229

Please sign in to comment.