From ccc68ee416e6da9aa1cba7aa6f3b56b589812640 Mon Sep 17 00:00:00 2001
From: Charles Lyding <charles@thunderpos.com>
Date: Mon, 9 Jan 2017 02:16:02 -0500
Subject: [PATCH] refactor(serve): cleanup command options

---
 packages/angular-cli/commands/serve.run.ts | 31 +--------------
 packages/angular-cli/commands/serve.ts     | 44 +++-------------------
 2 files changed, 7 insertions(+), 68 deletions(-)

diff --git a/packages/angular-cli/commands/serve.run.ts b/packages/angular-cli/commands/serve.run.ts
index 037d4062df15..f9cd5ced61af 100644
--- a/packages/angular-cli/commands/serve.run.ts
+++ b/packages/angular-cli/commands/serve.run.ts
@@ -1,5 +1,4 @@
 import * as denodeify from 'denodeify';
-const assign = require('lodash/assign');
 const SilentError = require('silent-error');
 const PortFinder = require('portfinder');
 import ServeWebpackTask from '../tasks/serve-webpack';
@@ -11,7 +10,7 @@ PortFinder.basePort = 49152;
 const getPort = <any>denodeify(PortFinder.getPort);
 
 export default function serveRun(commandOptions: ServeTaskOptions) {
-  if (commandOptions.environment === '') {
+  if (!commandOptions.environment) {
     if (commandOptions.target === 'development') {
       commandOptions.environment = 'dev';
     }
@@ -22,15 +21,9 @@ export default function serveRun(commandOptions: ServeTaskOptions) {
 
   // Check angular version.
   Version.assertAngularVersionIs2_3_1OrHigher(this.project.root);
-  commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host;
 
   return checkExpressPort(commandOptions)
-    .then(() => autoFindLiveReloadPort(commandOptions))
     .then((opts: ServeTaskOptions) => {
-      commandOptions = assign({}, opts, {
-        baseURL: this.project.config(commandOptions.target).baseURL || '/'
-      });
-
       const serve = new ServeWebpackTask({
         ui: this.ui,
         project: this.project,
@@ -54,25 +47,3 @@ function checkExpressPort(commandOptions: ServeTaskOptions) {
 
     });
 }
-
-function autoFindLiveReloadPort(commandOptions: ServeTaskOptions) {
-  return getPort({ port: commandOptions.liveReloadPort, host: commandOptions.liveReloadHost })
-    .then((foundPort: number) => {
-
-      // if live reload port matches express port, try one higher
-      if (foundPort === commandOptions.port) {
-        commandOptions.liveReloadPort = foundPort + 1;
-        return autoFindLiveReloadPort(commandOptions);
-      }
-
-      // port was already open
-      if (foundPort === commandOptions.liveReloadPort) {
-        return commandOptions;
-      }
-
-      // use found port as live reload port
-      commandOptions.liveReloadPort = foundPort;
-      return commandOptions;
-
-    });
-}
diff --git a/packages/angular-cli/commands/serve.ts b/packages/angular-cli/commands/serve.ts
index a9ce848d13ae..82a22daaf111 100644
--- a/packages/angular-cli/commands/serve.ts
+++ b/packages/angular-cli/commands/serve.ts
@@ -1,20 +1,12 @@
-const PortFinder = require('portfinder');
 const Command = require('../ember-cli/lib/models/command');
 
-PortFinder.basePort = 49152;
-
 const defaultPort = process.env.PORT || 4200;
 
 export interface ServeTaskOptions {
   port?: number;
   host?: string;
   proxyConfig?: string;
-  watcher?: string;
   liveReload?: boolean;
-  liveReloadHost?: string;
-  liveReloadPort?: number;
-  liveReloadBaseUrl?: string;
-  liveReloadLiveCss?: boolean;
   target?: string;
   environment?: string;
   ssl?: boolean;
@@ -47,39 +39,15 @@ const ServeCommand = Command.extend({
       description: 'Listens only on localhost by default'
     },
     { name: 'proxy-config',         type: 'Path',                          aliases: ['pc'] },
-    { name: 'watcher',              type: String,  default: 'events',      aliases: ['w'] },
-    { name: 'live-reload',          type: Boolean, default: true,          aliases: ['lr'] },
-    {
-      name: 'live-reload-host',
-      type: String,
-      aliases: ['lrh'],
-      description: 'Defaults to host'
-    },
-    {
-      name: 'live-reload-base-url',
-      type: String,
-      aliases: ['lrbu'],
-      description: 'Defaults to baseURL'
-    },
-    {
-      name: 'live-reload-port',
-      type: Number,
-      aliases: ['lrp'],
-      description: '(Defaults to port number within [49152...65535])'
-    },
-    {
-      name: 'live-reload-live-css',
-      type: Boolean,
-      default: true,
-      description: 'Whether to live reload CSS (default true)'
-    },
+    { name: 'live-reload',          type: Boolean, default: true },
     {
       name: 'target',
       type: String,
+      values: ['development', 'production'],
       default: 'development',
       aliases: ['t', { 'dev': 'development' }, { 'prod': 'production' }]
     },
-    { name: 'environment',          type: String,  default: '', aliases: ['e'] },
+    { name: 'environment',          type: String,  aliases: ['e'] },
     { name: 'ssl',                  type: Boolean, default: false },
     { name: 'ssl-key',              type: String,  default: 'ssl/server.key' },
     { name: 'ssl-cert',             type: String,  default: 'ssl/server.crt' },
@@ -101,9 +69,9 @@ const ServeCommand = Command.extend({
       default: false,
       description: 'Enable hot module replacement',
     },
-    { name: 'i18n-file',       type: String, default: null },
-    { name: 'i18n-format',     type: String, default: null },
-    { name: 'locale',         type: String, default: null }
+    { name: 'i18n-file',       type: String },
+    { name: 'i18n-format',     type: String },
+    { name: 'locale',          type: String }
   ],
 
   run: function(commandOptions: ServeTaskOptions) {