From 5b228ea04a0d4a4aea272bfca4f03f0365803fa3 Mon Sep 17 00:00:00 2001 From: tsm91 Date: Thu, 5 Jan 2017 23:15:50 +0100 Subject: [PATCH 1/2] feat(serve): add ability to set websocket client URL for webpack-dev-server --- packages/angular-cli/commands/serve.run.ts | 1 + packages/angular-cli/commands/serve.ts | 9 ++++++++- packages/angular-cli/tasks/serve-webpack.ts | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/angular-cli/commands/serve.run.ts b/packages/angular-cli/commands/serve.run.ts index 037d4062df15..d8f792b44026 100644 --- a/packages/angular-cli/commands/serve.run.ts +++ b/packages/angular-cli/commands/serve.run.ts @@ -23,6 +23,7 @@ export default function serveRun(commandOptions: ServeTaskOptions) { // Check angular version. Version.assertAngularVersionIs2_3_1OrHigher(this.project.root); commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host; + commandOptions.public = commandOptions.public || `http://${commandOptions.host}:${commandOptions.port}`; return checkExpressPort(commandOptions) .then(() => autoFindLiveReloadPort(commandOptions)) diff --git a/packages/angular-cli/commands/serve.ts b/packages/angular-cli/commands/serve.ts index a9ce848d13ae..fad7372f16fe 100644 --- a/packages/angular-cli/commands/serve.ts +++ b/packages/angular-cli/commands/serve.ts @@ -30,6 +30,7 @@ export interface ServeTaskOptions { i18nFile?: string; i18nFormat?: string; locale?: string; + public?: string; } const ServeCommand = Command.extend({ @@ -103,7 +104,13 @@ const ServeCommand = Command.extend({ }, { name: 'i18n-file', type: String, default: null }, { name: 'i18n-format', type: String, default: null }, - { name: 'locale', type: String, default: null } + { name: 'locale', type: String, default: null }, + { + name: 'public', + type: String, + default: '', + description: 'Websocket client URL for webpack-dev-server inline client' + } ], run: function(commandOptions: ServeTaskOptions) { diff --git a/packages/angular-cli/tasks/serve-webpack.ts b/packages/angular-cli/tasks/serve-webpack.ts index 43f13b233f13..5cea9b29e3c8 100644 --- a/packages/angular-cli/tasks/serve-webpack.ts +++ b/packages/angular-cli/tasks/serve-webpack.ts @@ -41,7 +41,7 @@ export default Task.extend({ // This allows for live reload of page when changes are made to repo. // https://webpack.github.io/docs/webpack-dev-server.html#inline-mode let entryPoints = [ - `webpack-dev-server/client?http://${serveTaskOptions.host}:${serveTaskOptions.port}/` + `webpack-dev-server/client?${serveTaskOptions.public}/` ]; if (serveTaskOptions.hmr) { const webpackHmrLink = 'https://webpack.github.io/docs/hot-module-replacement.html'; From 5942854399f0360fd2dd61dd8a46bda27c43ab61 Mon Sep 17 00:00:00 2001 From: tsm91 Date: Sat, 14 Jan 2017 20:44:43 +0100 Subject: [PATCH 2/2] merge fix --- packages/angular-cli/commands/serve.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angular-cli/commands/serve.ts b/packages/angular-cli/commands/serve.ts index c3c426f6141d..f4cf63c952f5 100644 --- a/packages/angular-cli/commands/serve.ts +++ b/packages/angular-cli/commands/serve.ts @@ -106,7 +106,7 @@ const ServeCommand = Command.extend({ { name: 'i18n-file', type: String, default: null }, { name: 'i18n-format', type: String, default: null }, { name: 'locale', type: String, default: null }, - { name: 'extract-css', type: Boolean, default: null } + { name: 'extract-css', type: Boolean, default: null }, { name: 'locale', type: String, default: null }, { name: 'public',