From 521dddbdffd0056216655e4c91779f3e17f58ed7 Mon Sep 17 00:00:00 2001
From: 0xCHERRY <rd77cc4x@yandex.ru>
Date: Sat, 11 Feb 2017 20:18:03 +0100
Subject: [PATCH] fix(@angular/cli): serve --live-reload option

---
 docs/documentation/serve.md               |  2 ++
 packages/@angular/cli/commands/serve.ts   | 10 +++++++++-
 packages/@angular/cli/custom-typings.d.ts |  1 +
 packages/@angular/cli/tasks/serve.ts      |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/documentation/serve.md b/docs/documentation/serve.md
index d1b836c0c186..232146b5003c 100644
--- a/docs/documentation/serve.md
+++ b/docs/documentation/serve.md
@@ -12,6 +12,8 @@
 
 `--proxy-config` (`-pc`) proxy configuration file
 
+`--watch` (`-w`) flag to turn off watch mode
+
 `--live-reload` (`-lr`) flag to turn off live reloading
 
 `--live-reload-host` (`-lrh`) specify the host for live reloading
diff --git a/packages/@angular/cli/commands/serve.ts b/packages/@angular/cli/commands/serve.ts
index f736ce16f1f8..2d353d9ba969 100644
--- a/packages/@angular/cli/commands/serve.ts
+++ b/packages/@angular/cli/commands/serve.ts
@@ -17,6 +17,7 @@ const defaultPort = process.env.PORT || config.get('defaults.serve.port');
 const defaultHost = config.get('defaults.serve.host');
 
 export interface ServeTaskOptions extends BuildOptions {
+  watch?: boolean;
   port?: number;
   host?: string;
   proxyConfig?: string;
@@ -43,6 +44,7 @@ export const baseServeCommandOptions: any = baseBuildCommandOptions.concat([
     description: `Listens only on ${defaultHost} by default`
   },
   { name: 'proxy-config', type: 'Path', aliases: ['pc'] },
+  { name: 'watch', type: Boolean, default: true, aliases: ['w'] },
   { name: 'ssl', type: Boolean, default: false },
   { name: 'ssl-key', type: String, default: 'ssl/server.key' },
   { name: 'ssl-cert', type: String, default: 'ssl/server.crt' },
@@ -61,7 +63,12 @@ const ServeCommand = Command.extend({
   aliases: ['server', 's'],
 
   availableOptions: baseServeCommandOptions.concat([
-    { name: 'live-reload', type: Boolean, default: true, aliases: ['lr'] },
+    {
+      name: 'live-reload',
+      type: Boolean,
+      aliases: ['lr'],
+      description: 'Defaults to watch'
+    },
     {
       name: 'live-reload-host',
       type: String,
@@ -99,6 +106,7 @@ const ServeCommand = Command.extend({
 
     Version.assertAngularVersionIs2_3_1OrHigher(this.project.root);
     commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host;
+    commandOptions.liveReload = commandOptions.liveReload || commandOptions.watch;
 
     return checkExpressPort(commandOptions)
       .then(() => autoFindLiveReloadPort(commandOptions))
diff --git a/packages/@angular/cli/custom-typings.d.ts b/packages/@angular/cli/custom-typings.d.ts
index c82e20002580..99b7ca666e5a 100644
--- a/packages/@angular/cli/custom-typings.d.ts
+++ b/packages/@angular/cli/custom-typings.d.ts
@@ -9,6 +9,7 @@ interface IWebpackDevServerConfigurationOptions {
   noInfo?: boolean;
   lazy?: boolean;
   filename?: string;
+  watch?: boolean;
   watchOptions?: {
     aggregateTimeout?: number;
     poll?: number;
diff --git a/packages/@angular/cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts
index 287d237596cb..a822dfc7bebf 100644
--- a/packages/@angular/cli/tasks/serve.ts
+++ b/packages/@angular/cli/tasks/serve.ts
@@ -109,6 +109,7 @@ export default Task.extend({
       inline: true,
       proxy: proxyConfig,
       compress: serveTaskOptions.target === 'production',
+      watch: serveTaskOptions.liveReload,
       watchOptions: {
         poll: projectConfig.defaults && projectConfig.defaults.poll
       },