Skip to content

fix(@angular-devkit/build-angular): ensure correct dev server path with public host option #13838

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
Mar 29, 2019
Merged

fix(@angular-devkit/build-angular): ensure correct dev server path with public host option #13838

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
18 changes: 12 additions & 6 deletions packages/angular_devkit/build_angular/src/dev-server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,14 @@ export function serveWebpackBrowser(
options.port = port;

// Resolve public host and client address.
let clientAddress = `${options.ssl ? 'https' : 'http'}://0.0.0.0:0`;
let clientAddress = url.parse(`${options.ssl ? 'https' : 'http'}://0.0.0.0:0`);
if (options.publicHost) {
let publicHost = options.publicHost;
if (!/^\w+:\/\//.test(publicHost)) {
publicHost = `${options.ssl ? 'https' : 'http'}://${publicHost}`;
}
const clientUrl = url.parse(publicHost);
options.publicHost = clientUrl.host;
clientAddress = url.format(clientUrl);
clientAddress = url.parse(publicHost);
options.publicHost = clientAddress.host;
}

// Resolve serve address.
Expand Down Expand Up @@ -338,7 +337,7 @@ function _addLiveReload(
options: DevServerBuilderSchema,
browserOptions: BrowserBuilderSchema,
webpackConfig: webpack.Configuration,
clientAddress: string,
clientAddress: url.UrlWithStringQuery,
logger: logging.LoggerApi,
) {
if (webpackConfig.plugins === undefined) {
Expand All @@ -353,7 +352,14 @@ function _addLiveReload(
} catch {
throw new Error('The "webpack-dev-server" package could not be found.');
}
const entryPoints = [`${webpackDevServerPath}?${clientAddress}`];

// If a custom path is provided the webpack dev server client drops the sockjs-node segment.
// This adds it back so that behavior is consistent when using a custom URL path
if (clientAddress.pathname) {
clientAddress.pathname = path.posix.join(clientAddress.pathname, 'sockjs-node');
}

const entryPoints = [`${webpackDevServerPath}?${url.format(clientAddress)}`];
if (options.hmr) {
const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';

Expand Down