From bf668b1e9eda89e45bf6711decc6ee53d76a5880 Mon Sep 17 00:00:00 2001 From: Ryan Christian <33403762+rschristian@users.noreply.github.com> Date: Sat, 6 Mar 2021 09:15:12 -0600 Subject: [PATCH] fix: Bug where port is reassigned after given to devServer (#1530) Co-authored-by: Leah --- .changeset/fuzzy-fans-sin.md | 5 +++++ packages/cli/lib/lib/webpack/run-webpack.js | 7 ++++--- packages/cli/lib/lib/webpack/webpack-client-config.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .changeset/fuzzy-fans-sin.md diff --git a/.changeset/fuzzy-fans-sin.md b/.changeset/fuzzy-fans-sin.md new file mode 100644 index 000000000..4369fd712 --- /dev/null +++ b/.changeset/fuzzy-fans-sin.md @@ -0,0 +1,5 @@ +--- +'preact-cli': patch +--- + +Fixes bug causing wrong port to be given to Webpack config diff --git a/packages/cli/lib/lib/webpack/run-webpack.js b/packages/cli/lib/lib/webpack/run-webpack.js index 430c9ed40..d8818ebb7 100644 --- a/packages/cli/lib/lib/webpack/run-webpack.js +++ b/packages/cli/lib/lib/webpack/run-webpack.js @@ -12,13 +12,14 @@ const transformConfig = require('./transform-config'); const { error, isDir, warn } = require('../../util'); async function devBuild(env) { + let userPort = parseInt(process.env.PORT || env.port, 10) || 8080; + env.port = await getPort({ port: userPort }); + let config = await clientConfig(env); await transformConfig(env, config); - let userPort = - parseInt(process.env.PORT || config.devServer.port, 10) || 8080; - let port = await getPort({ port: userPort }); + let port = config.devServer.port; let compiler = webpack(config); return new Promise((res, rej) => { diff --git a/packages/cli/lib/lib/webpack/webpack-client-config.js b/packages/cli/lib/lib/webpack/webpack-client-config.js index a390d3bf7..00d765a89 100644 --- a/packages/cli/lib/lib/webpack/webpack-client-config.js +++ b/packages/cli/lib/lib/webpack/webpack-client-config.js @@ -301,7 +301,7 @@ function isDev(config) { publicPath: '/', contentBase: src, https: config.https, - port: process.env.PORT || config.port || 8080, + port: config.port, host: process.env.HOST || config.host || '0.0.0.0', disableHostCheck: true, historyApiFallback: true,