Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-17 19:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.

Fixes #13627
This commit is contained in:
Charles Lyding 2019-03-06 15:00:25 -05:00 committed by Minko Gechev
parent 1a484c368f
commit 36d78debdb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/angular_devkit/build_angular/src/dev-server/index.ts
View File

@ -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.
@ -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) {
@ -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';