Merge pull request #132 from angular/master

Update upstream

Author: GulajavaMinistudio

docs/documentation/serve.md

@@ -74,7 +74,7 @@ All the build Options are available in serve, below are the additional options.
     <code>--port</code> (aliases: <code>-p</code>) <em>default value: 4200</em>
   </p>
   <p>
-    Port to listen to for serving.
+    Port to listen to for serving. <code>--port 0</code> will get a free port
   </p>
 </details>
 

docs/documentation/stories/budgets.md

@@ -49,11 +49,12 @@ of your application stay within boundries which you set.
 ## Specifying sizes
 
 Available formats:
-123 - size in bytes
-123b - size in bytes
-123kb - size in kilobytes
-123mb - size in megabytes
-12% - percentage
+
+- `123` - size in bytes
+- `123b` - size in bytes
+- `123kb` - size in kilobytes
+- `123mb` - size in megabytes
+- `12%` - percentage
 
 ## NOTES
 

packages/@angular/cli/bin/ng-update-message.js

@@ -34,9 +34,9 @@ if (found) {
   // eslint-disable-next-line no-console
   console.error(`\u001b[31m
     ${'='.repeat(80)}
-    An old CLI configuration has been detected, which needs to be updated to the latest version.
+    The Angular CLI configuration format has been changed, and your existing configuration can
+    be updated automatically by running the following command:
 
-    Please run the following command to update this workspace:
       ng update @angular/cli --migrate-only --from=1
     ${'='.repeat(80)}
     \u001b[39m`.replace(/^ {4}/gm, ''));

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

@@ -0,0 +1,22 @@
+import { tags } from '@angular-devkit/core';
+import { Command, Option } from '../models/command';
+
+
+export default class EjectCommand extends Command {
+  public readonly name = 'eject';
+  public readonly description = 'Temporarily disabled. Ejects your app and output the proper '
+                              + 'webpack configuration and scripts.';
+  public readonly arguments: string[] = [];
+  public readonly options: Option[] = [];
+
+  run(_options: any) {
+    this.logger.info(tags.stripIndents`
+      The 'eject' command has been temporarily disabled, as it is not yet compatible with the new
+      angular.json format. The new configuration format provides further flexibility to modify the
+      configuration of your workspace without ejecting. Ejection will be re-enabled in a future
+      release of the CLI.
+
+      If you need to eject today, use CLI 1.7 to eject your project.
+    `);
+  }
+}

packages/@angular/cli/lib/cli/index.ts

@@ -8,26 +8,32 @@ const Project = require('../../ember-cli/lib/models/project');
 
 function loadCommands() {
   return {
+    // Schematics commands.
     'add': require('../../commands/add').default,
-    'build': require('../../commands/build').default,
-    'serve': require('../../commands/serve').default,
     'new': require('../../commands/new').default,
     'generate': require('../../commands/generate').default,
+    'update': require('../../commands/update').default,
+
+    // Architect commands.
+    'build': require('../../commands/build').default,
+    'serve': require('../../commands/serve').default,
     'test': require('../../commands/test').default,
     'e2e': require('../../commands/e2e').default,
-    'help': require('../../commands/help').default,
     'lint': require('../../commands/lint').default,
-    'version': require('../../commands/version').default,
-    'doc': require('../../commands/doc').default,
     'xi18n': require('../../commands/xi18n').default,
-    'update': require('../../commands/update').default,
     'run': require('../../commands/run').default,
 
+    // Disabled commands.
+    'eject': require('../../commands/eject').default,
+
     // Easter eggs.
     'make-this-awesome': require('../../commands/easter-egg').default,
 
-    // Configuration.
+    // Other.
     'config': require('../../commands/config').default,
+    'help': require('../../commands/help').default,
+    'version': require('../../commands/version').default,
+    'doc': require('../../commands/doc').default,
   };
 }
 

packages/@angular/cli/models/command-runner.ts

@@ -165,13 +165,24 @@ export function parseOptions<T = any>(
       return defaults;
     }, {});
 
+  const strings = cmdOpts
+    .filter(o => o.type === String)
+    .map(o => o.name);
+
+  const numbers = cmdOpts
+    .filter(o => o.type === Number)
+    .map(o => o.name);
+
+
   aliases.help = ['h'];
   booleans.push('help');
 
   const yargsOptions = {
     alias: aliases,
     boolean: booleans,
-    default: defaults
+    default: defaults,
+    string: strings,
+    number: numbers
   };
 
   const parsedOptions = parser(args, yargsOptions);
@@ -302,9 +313,9 @@ function verifyWorkspace(command: Command, executionScope: CommandScope, root: s
       // If changing this message, please update the same message in
       // `packages/@angular/cli/bin/ng-update-message.js`
       throw new SilentError(tags.stripIndent`
-        An old CLI configuration has been detected, which needs to be updated to the latest version.
+        The Angular CLI configuration format has been changed, and your existing configuration can
+        be updated automatically by running the following command:
 
-        Please run the following command to update this workspace:
           ng update @angular/cli --migrate-only --from=1
       `);
     }

packages/@angular/cli/upgrade/version.ts

@@ -112,7 +112,7 @@ export class Version {
       && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
     ) {
       console.warn(bold(red(tags.stripIndents`
-          This project uses a temporary compatibility version of RxJs (${rxjsVersion}.
+          This project uses a temporary compatibility version of RxJs (${rxjsVersion}).
 
           Please visit the link below to find instructions on how to update RxJs.
           https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#