Merge pull request #134 from angular/master

Update upstream

Author: GulajavaMinistudio

package-lock.json

@@ -122,6 +122,33 @@ function setValueFromPath<T extends JsonArray | JsonObject>(
   }
 }
 
+function normalizeValue(value: string, path: string): JsonValue {
+  const cliOptionType = validCliPaths.get(path);
+  if (cliOptionType) {
+    switch (cliOptionType) {
+      case 'boolean':
+        if (value.trim() === 'true') {
+          return true;
+        } else if (value.trim() === 'false') {
+          return false;
+        }
+        break;
+      case 'number':
+        const numberValue = Number(value);
+        if (!Number.isNaN(numberValue)) {
+          return numberValue;
+        }
+        break;
+      case 'string':
+        return value;
+    }
+
+    throw new Error(`Invalid value type; expected a ${cliOptionType}.`);
+  }
+
+  return parseJson(value, JsonParseMode.Loose);
+}
+
 export default class ConfigCommand extends Command {
   public readonly name = 'config';
   public readonly description = 'Get/set configuration values.';
@@ -178,14 +205,7 @@ export default class ConfigCommand extends Command {
     // TODO: Modify & save without destroying comments
     const configValue = config.value;
 
-    const value = parseJson(options.value, JsonParseMode.Loose);
-    const pathType = validCliPaths.get(options.jsonPath);
-    if (pathType) {
-      if (typeof value != pathType) {
-        throw new Error(`Invalid value type; expected a ${pathType}.`);
-      }
-    }
-
+    const value = normalizeValue(options.value, options.jsonPath);
     const result = setValueFromPath(configValue, options.jsonPath, value);
 
     if (result === undefined) {

packages/@angular/cli/commands/config.ts

@@ -12,7 +12,7 @@ export default class ServeCommand extends ArchitectCommand {
   public readonly name = 'serve';
   public readonly target = 'serve';
   public readonly description = 'Builds and serves your app, rebuilding on file changes.';
-  public static aliases = ['server', 's'];
+  public static aliases = ['s'];
   public readonly scope = CommandScope.inProject;
   public readonly options: Option[] = [
     this.prodOption,

packages/@angular/cli/commands/serve.ts

@@ -31,6 +31,7 @@ export default class VersionCommand extends Command {
       /^@schematics\/.*/,
       /^rxjs$/,
       /^typescript$/,
+      /^ng-packagr$/,
       /^webpack$/,
     ];