Skip to content

fix: avoid unnecessary searching port #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2021
Merged

fix: avoid unnecessary searching port #2648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions packages/serve/src/startDevServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@ export default async function startDevServer(
cliOptions: any,
logger: any,
): Promise<Record<string, unknown>[]> {
let devServerVersion, Server, findPort;
let devServerVersion, Server;

try {
// eslint-disable-next-line node/no-extraneous-require
devServerVersion = require('webpack-dev-server/package.json').version;
// eslint-disable-next-line node/no-extraneous-require
Server = require('webpack-dev-server/lib/Server');
// eslint-disable-next-line node/no-extraneous-require
findPort = require('webpack-dev-server/lib/utils/findPort');
} catch (err) {
logger.error(`You need to install 'webpack-dev-server' for running 'webpack serve'.\n${err}`);
process.exit(2);
Expand Down Expand Up @@ -71,9 +69,7 @@ export default async function startDevServer(
for (const compilerWithDevServerOption of compilersWithDevServerOption) {
const options = mergeOptions(compilerWithDevServerOption.options.devServer || {}, devServerCliOptions);

if (isDevServer4) {
options.port = await findPort(options.port);
} else {
if (!isDevServer4) {
const getPublicPathOption = (): string => {
const normalizePublicPath = (publicPath): string =>
typeof publicPath === 'undefined' || publicPath === 'auto' ? '/' : publicPath;
Expand All @@ -87,11 +83,6 @@ export default async function startDevServer(
return normalizePublicPath(options.publicPath);
}

// webpack-dev-server@4
if (options.dev && options.dev.publicPath) {
return normalizePublicPath(options.dev.publicPath);
}

return normalizePublicPath(compilerWithDevServerOption.options.output.publicPath);
};
const getStatsOption = (): string | boolean => {
Expand Down