From 0223193037923cbe1fbb50fb84c6001a39757d27 Mon Sep 17 00:00:00 2001 From: elclanrs Date: Sat, 3 Dec 2016 23:23:57 -0500 Subject: [PATCH] add --inline-client command option to customize inline client URL for livereload in webpack-dev-server --- packages/angular-cli/commands/serve.ts | 10 ++++++++++ packages/angular-cli/tasks/serve-webpack.ts | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/angular-cli/commands/serve.ts b/packages/angular-cli/commands/serve.ts index b9fa384b188e..257a48e365fc 100644 --- a/packages/angular-cli/commands/serve.ts +++ b/packages/angular-cli/commands/serve.ts @@ -32,6 +32,7 @@ export interface ServeTaskOptions { open?: boolean; vendorChunk?: boolean; hmr?: boolean; + inlineClient?: string; } const ServeCommand = Command.extend({ @@ -103,6 +104,12 @@ const ServeCommand = Command.extend({ default: false, description: 'Enable hot module replacement', }, + { + name: 'inline-client', + type: String, + aliases: ['ic'], + description: '(Defaults to "http://host:port")' + } ], run: function(commandOptions: ServeTaskOptions) { @@ -117,6 +124,9 @@ const ServeCommand = Command.extend({ commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host; + commandOptions.inlineClient = commandOptions.inlineClient || + `http://${commandOptions.host}:${commandOptions.port}/`; + return this._checkExpressPort(commandOptions) .then(this._autoFindLiveReloadPort.bind(this)) .then((opts: ServeTaskOptions) => { diff --git a/packages/angular-cli/tasks/serve-webpack.ts b/packages/angular-cli/tasks/serve-webpack.ts index 7498e25f0f94..916047f9096e 100644 --- a/packages/angular-cli/tasks/serve-webpack.ts +++ b/packages/angular-cli/tasks/serve-webpack.ts @@ -35,8 +35,9 @@ 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.inlineClient}/` ]; + if (serveTaskOptions.hmr) { const webpackHmrLink = 'https://webpack.github.io/docs/hot-module-replacement.html'; ui.writeLine(oneLine`