@angular/cli 8.0.0-rc.1 → 8.0.0

package/commands/analytics.d.ts

@@ -1,6 +1,6 @@
 /**
  * Configures the gathering of Angular CLI usage metrics. See
- * https://next.angular.io/cli/usage-analytics-gathering.
+ * https://v8.angular.io/cli/usage-analytics-gathering.
  */
 export interface Schema {
     /**

package/commands/analytics.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/analytics.json",
-  "description": "Configures the gathering of Angular CLI usage metrics. See https://next.angular.io/cli/usage-analytics-gathering.",
+  "description": "Configures the gathering of Angular CLI usage metrics. See https://v8.angular.io/cli/usage-analytics-gathering.",
   "$longDescription": "",
 
   "$aliases": [],

package/commands/build.d.ts

@@ -10,6 +10,7 @@ export interface Schema {
     /**
      * A named build target, as specified in the "configurations" section of angular.json.
      * Each named target is accompanied by a configuration of option defaults for that target.
+     * Setting this explicitly overrides the "--prod" flag
      */
     configuration?: string;
     /**
@@ -17,13 +18,14 @@ export interface Schema {
      */
     help?: HelpUnion;
     /**
+     * Shorthand for "--configuration=production".
      * When true, sets the build configuration to the production target.
-     * All builds make use of bundling and limited tree-shaking. A production build also runs
-     * limited dead code elimination.
+     * By default, the production target is set up in the workspace configuration such that all
+     * builds make use of bundling, limited tree-shaking, and also limited dead code elimination.
      */
     prod?: boolean;
     /**
-     * The name of the project to build. Can be an app or a library.
+     * The name of the project to build. Can be an application or a library.
      */
     project?: string;
 }

package/commands/config-impl.js

@@ -70,7 +70,7 @@ const validCliPaths = new Map([
  * by the path. For example, a path of "a[3].foo.bar[2]" would give you a fragment array of
  * ["a", 3, "foo", "bar", 2].
  * @param path The JSON string to parse.
- * @returns {string[]} The fragments for the string.
+ * @returns {(string|number)[]} The fragments for the string.
  * @private
  */
 function parseJsonPath(path) {
@@ -87,11 +87,14 @@ function parseJsonPath(path) {
         }
         result.push(match[1]);
         if (match[2]) {
-            const indices = match[2].slice(1, -1).split('][');
+            const indices = match[2]
+                .slice(1, -1)
+                .split('][')
+                .map(x => /^\d$/.test(x) ? +x : x.replace(/\"|\'/g, ''));
             result.push(...indices);
         }
     }
-    return result.filter(fragment => !!fragment);
+    return result.filter(fragment => fragment != null);
 }
 function getValueFromPath(root, path) {
     const fragments = parseJsonPath(path);

package/commands/definitions.json

@@ -7,21 +7,21 @@
       "properties": {
         "project": {
           "type": "string",
-          "description": "The name of the project to build. Can be an app or a library.",
+          "description": "The name of the project to build. Can be an application or a library.",
           "$default": {
             "$source": "argv",
             "index": 0
           }
         },
         "configuration": {
-          "description": "A named build target, as specified in the \"configurations\" section of angular.json.\nEach named target is accompanied by a configuration of option defaults for that target.",
+          "description": "A named build target, as specified in the \"configurations\" section of angular.json.\nEach named target is accompanied by a configuration of option defaults for that target.\nSetting this explicitly overrides the \"--prod\" flag",
           "type": "string",
           "aliases": [
             "c"
           ]
         },
         "prod": {
-          "description": "When true, sets the build configuration to the production target.\nAll builds make use of bundling and limited tree-shaking. A production build also runs limited dead code elimination.",
+          "description": "Shorthand for \"--configuration=production\".\nWhen true, sets the build configuration to the production target.\nBy default, the production target is set up in the workspace configuration such that all builds make use of bundling, limited tree-shaking, and also limited dead code elimination.",
           "type": "boolean"
         }
       }

package/commands/e2e.d.ts

@@ -5,6 +5,7 @@ export interface Schema {
     /**
      * A named build target, as specified in the "configurations" section of angular.json.
      * Each named target is accompanied by a configuration of option defaults for that target.
+     * Setting this explicitly overrides the "--prod" flag
      */
     configuration?: string;
     /**
@@ -12,13 +13,14 @@ export interface Schema {
      */
     help?: HelpUnion;
     /**
+     * Shorthand for "--configuration=production".
      * When true, sets the build configuration to the production target.
-     * All builds make use of bundling and limited tree-shaking. A production build also runs
-     * limited dead code elimination.
+     * By default, the production target is set up in the workspace configuration such that all
+     * builds make use of bundling, limited tree-shaking, and also limited dead code elimination.
      */
     prod?: boolean;
     /**
-     * The name of the project to build. Can be an app or a library.
+     * The name of the project to build. Can be an application or a library.
      */
     project?: string;
 }

package/commands/generate-impl.js

@@ -7,15 +7,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-// tslint:disable:no-global-tslint-disable no-any
 const core_1 = require("@angular-devkit/core");
 const schematic_command_1 = require("../models/schematic-command");
 const json_schema_1 = require("../utilities/json-schema");
 class GenerateCommand extends schematic_command_1.SchematicCommand {
     async initialize(options) {
-        await super.initialize(options);
         // Fill up the schematics property of the command description.
         const [collectionName, schematicName] = this.parseSchematicInfo(options);
+        this.collectionName = collectionName;
+        this.schematicName = schematicName;
+        await super.initialize(options);
         const collection = this.getCollection(collectionName);
         const subcommands = {};
         const schematicNames = schematicName ? [schematicName] : collection.listSchematicNames();
@@ -45,13 +46,12 @@ class GenerateCommand extends schematic_command_1.SchematicCommand {
         });
     }
     async run(options) {
-        const [collectionName, schematicName] = this.parseSchematicInfo(options);
-        if (!schematicName || !collectionName) {
+        if (!this.schematicName || !this.collectionName) {
             return this.printHelp(options);
         }
         return this.runSchematic({
-            collectionName,
-            schematicName,
+            collectionName: this.collectionName,
+            schematicName: this.schematicName,
             schematicOptions: options['--'] || [],
             debug: !!options.debug || false,
             dryRun: !!options.dryRun || false,

package/commands/new-impl.d.ts

@@ -11,6 +11,7 @@ import { Schema as NewCommandSchema } from './new';
 export declare class NewCommand extends SchematicCommand<NewCommandSchema> {
     readonly allowMissingWorkspace = true;
     schematicName: string;
+    initialize(options: NewCommandSchema & Arguments): Promise<void>;
     run(options: NewCommandSchema & Arguments): Promise<number | void>;
     private parseCollectionName;
 }

package/commands/new-impl.js

@@ -14,20 +14,22 @@ class NewCommand extends schematic_command_1.SchematicCommand {
         this.allowMissingWorkspace = true;
         this.schematicName = 'ng-new';
     }
-    async run(options) {
-        let collectionName;
+    async initialize(options) {
         if (options.collection) {
-            collectionName = options.collection;
+            this.collectionName = options.collection;
         }
         else {
-            collectionName = this.parseCollectionName(options);
+            this.collectionName = this.parseCollectionName(options);
         }
+        return super.initialize(options);
+    }
+    async run(options) {
         // Register the version of the CLI in the registry.
         const packageJson = require('../package.json');
         const version = packageJson.version;
         this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
         return this.runSchematic({
-            collectionName: collectionName,
+            collectionName: this.collectionName,
             schematicName: this.schematicName,
             schematicOptions: options['--'] || [],
             debug: !!options.debug,

package/commands/serve.d.ts

@@ -9,6 +9,7 @@ export interface Schema {
     /**
      * A named build target, as specified in the "configurations" section of angular.json.
      * Each named target is accompanied by a configuration of option defaults for that target.
+     * Setting this explicitly overrides the "--prod" flag
      */
     configuration?: string;
     /**
@@ -16,13 +17,14 @@ export interface Schema {
      */
     help?: HelpUnion;
     /**
+     * Shorthand for "--configuration=production".
      * When true, sets the build configuration to the production target.
-     * All builds make use of bundling and limited tree-shaking. A production build also runs
-     * limited dead code elimination.
+     * By default, the production target is set up in the workspace configuration such that all
+     * builds make use of bundling, limited tree-shaking, and also limited dead code elimination.
      */
     prod?: boolean;
     /**
-     * The name of the project to build. Can be an app or a library.
+     * The name of the project to build. Can be an application or a library.
      */
     project?: string;
 }

package/commands/test.d.ts

@@ -5,6 +5,7 @@ export interface Schema {
     /**
      * A named build target, as specified in the "configurations" section of angular.json.
      * Each named target is accompanied by a configuration of option defaults for that target.
+     * Setting this explicitly overrides the "--prod" flag
      */
     configuration?: string;
     /**
@@ -12,13 +13,14 @@ export interface Schema {
      */
     help?: HelpUnion;
     /**
+     * Shorthand for "--configuration=production".
      * When true, sets the build configuration to the production target.
-     * All builds make use of bundling and limited tree-shaking. A production build also runs
-     * limited dead code elimination.
+     * By default, the production target is set up in the workspace configuration such that all
+     * builds make use of bundling, limited tree-shaking, and also limited dead code elimination.
      */
     prod?: boolean;
     /**
-     * The name of the project to build. Can be an app or a library.
+     * The name of the project to build. Can be an application or a library.
      */
     project?: string;
 }

package/commands/update-impl.d.ts

@@ -3,8 +3,7 @@ import { SchematicCommand } from '../models/schematic-command';
 import { Schema as UpdateCommandSchema } from './update';
 export declare class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
     readonly allowMissingWorkspace = true;
-    collectionName: string;
-    schematicName: string;
-    parseArguments(schematicOptions: string[], schema: Option[]): Promise<Arguments>;
+    parseArguments(_schematicOptions: string[], _schema: Option[]): Promise<Arguments>;
     run(options: UpdateCommandSchema & Arguments): Promise<number | void>;
+    checkCleanGit(): boolean;
 }

package/commands/update-impl.js

@@ -7,55 +7,234 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-const core_1 = require("@angular-devkit/core");
+const child_process_1 = require("child_process");
+const path = require("path");
+const semver = require("semver");
 const schematic_command_1 = require("../models/schematic-command");
 const find_up_1 = require("../utilities/find-up");
 const package_manager_1 = require("../utilities/package-manager");
+const package_metadata_1 = require("../utilities/package-metadata");
+const package_tree_1 = require("../utilities/package-tree");
+const npa = require('npm-package-arg');
+const oldConfigFileNames = [
+    '.angular-cli.json',
+    'angular-cli.json',
+];
 class UpdateCommand extends schematic_command_1.SchematicCommand {
     constructor() {
         super(...arguments);
         this.allowMissingWorkspace = true;
-        this.collectionName = '@schematics/update';
-        this.schematicName = 'update';
     }
-    async parseArguments(schematicOptions, schema) {
-        const args = await super.parseArguments(schematicOptions, schema);
-        const maybeArgsLeftovers = args['--'];
-        if (maybeArgsLeftovers
-            && maybeArgsLeftovers.length == 1
-            && maybeArgsLeftovers[0] == '@angular/cli'
-            && args.migrateOnly === undefined
-            && args.from === undefined) {
-            // Check for a 1.7 angular-cli.json file.
-            const oldConfigFileNames = [
-                core_1.normalize('.angular-cli.json'),
-                core_1.normalize('angular-cli.json'),
-            ];
-            const oldConfigFilePath = find_up_1.findUp(oldConfigFileNames, process.cwd())
-                || find_up_1.findUp(oldConfigFileNames, __dirname);
-            if (oldConfigFilePath) {
-                args.migrateOnly = true;
-                args.from = '1.0.0';
-            }
-        }
-        // Move `--` to packages.
-        if (args.packages == undefined && args['--']) {
-            args.packages = args['--'];
-            delete args['--'];
-        }
-        return args;
+    async parseArguments(_schematicOptions, _schema) {
+        return {};
     }
+    // tslint:disable-next-line:no-big-function
     async run(options) {
+        const packages = [];
+        for (const request of options['--'] || []) {
+            try {
+                const packageIdentifier = npa(request);
+                // only registry identifiers are supported
+                if (!packageIdentifier.registry) {
+                    this.logger.error(`Package '${request}' is not a registry package identifer.`);
+                    return 1;
+                }
+                if (packages.some(v => v.name === packageIdentifier.name)) {
+                    this.logger.error(`Duplicate package '${packageIdentifier.name}' specified.`);
+                    return 1;
+                }
+                // If next option is used and no specifier supplied, use next tag
+                if (options.next && !packageIdentifier.rawSpec) {
+                    packageIdentifier.fetchSpec = 'next';
+                }
+                packages.push(packageIdentifier);
+            }
+            catch (e) {
+                this.logger.error(e.message);
+                return 1;
+            }
+        }
+        if (options.all && packages.length > 0) {
+            this.logger.error('Cannot specify packages when using the "all" option.');
+            return 1;
+        }
+        else if (options.all && options.migrateOnly) {
+            this.logger.error('Cannot use "all" option with "migrate-only" option.');
+            return 1;
+        }
+        else if (!options.migrateOnly && (options.from || options.to)) {
+            this.logger.error('Can only use "from" or "to" options with "migrate-only" option.');
+            return 1;
+        }
+        // If not asking for status then check for a clean git repository.
+        // This allows the user to easily reset any changes from the update.
+        if ((packages.length !== 0 || options.all) && !this.checkCleanGit()) {
+            this.logger.error('Repository is not clean.  Please commit or stash any changes before updating.');
+            return 2;
+        }
         const packageManager = package_manager_1.getPackageManager(this.workspace.root);
+        this.logger.info(`Using package manager: '${packageManager}'`);
+        // Special handling for Angular CLI 1.x migrations
+        if (options.migrateOnly === undefined && options.from === undefined) {
+            if (!options.all && packages.length === 1 && packages[0].name === '@angular/cli') {
+                const oldConfigFilePath = find_up_1.findUp(oldConfigFileNames, process.cwd());
+                if (oldConfigFilePath) {
+                    options.migrateOnly = true;
+                    options.from = '1.0.0';
+                }
+            }
+        }
+        this.logger.info('Collecting installed dependencies...');
+        const packageTree = await package_tree_1.readPackageTree(this.workspace.root);
+        const rootDependencies = package_tree_1.findNodeDependencies(packageTree);
+        this.logger.info(`Found ${Object.keys(rootDependencies).length} dependencies.`);
+        if (options.all || packages.length === 0) {
+            // Either update all packages or show status
+            return this.runSchematic({
+                collectionName: '@schematics/update',
+                schematicName: 'update',
+                dryRun: !!options.dryRun,
+                showNothingDone: false,
+                additionalOptions: {
+                    force: options.force || false,
+                    next: options.next || false,
+                    packageManager,
+                    packages: options.all ? Object.keys(rootDependencies) : [],
+                },
+            });
+        }
+        if (options.migrateOnly) {
+            if (!options.from) {
+                this.logger.error('"from" option is required when using the "migrate-only" option.');
+                return 1;
+            }
+            else if (packages.length !== 1) {
+                this.logger.error('A single package must be specified when using the "migrate-only" option.');
+                return 1;
+            }
+            if (options.next) {
+                this.logger.warn('"next" option has no effect when using "migrate-only" option.');
+            }
+            const packageName = packages[0].name;
+            let packageNode = rootDependencies[packageName];
+            if (typeof packageNode === 'string') {
+                this.logger.error('Package found in package.json but is not installed.');
+                return 1;
+            }
+            else if (!packageNode) {
+                // Allow running migrations on transitively installed dependencies
+                // There can technically be nested multiple versions
+                // TODO: If multiple, this should find all versions and ask which one to use
+                const child = packageTree.children.find(c => c.name === packageName);
+                if (child) {
+                    // A link represents a symlinked package so use the actual in this case
+                    packageNode = child.isLink ? child.target : child;
+                }
+                if (!packageNode) {
+                    this.logger.error('Package is not installed.');
+                    return 1;
+                }
+            }
+            const updateMetadata = packageNode.package['ng-update'];
+            let migrations = updateMetadata && updateMetadata.migrations;
+            if (migrations === undefined) {
+                this.logger.error('Package does not provide migrations.');
+                return 1;
+            }
+            else if (typeof migrations !== 'string') {
+                this.logger.error('Package contains a malformed migrations field.');
+                return 1;
+            }
+            // if not non-relative, add package name
+            if (migrations.startsWith('.') || migrations.startsWith('/')) {
+                migrations = path.join(packageName, migrations);
+            }
+            return this.runSchematic({
+                collectionName: '@schematics/update',
+                schematicName: 'migrate',
+                dryRun: !!options.dryRun,
+                force: false,
+                showNothingDone: false,
+                additionalOptions: {
+                    package: packageName,
+                    collection: migrations,
+                    from: options.from,
+                    to: options.to || packageNode.package.version,
+                },
+            });
+        }
+        const requests = [];
+        // Validate packages actually are part of the workspace
+        for (const pkg of packages) {
+            const node = rootDependencies[pkg.name];
+            if (!node) {
+                this.logger.error(`Package '${pkg.name}' is not a dependency.`);
+                return 1;
+            }
+            // If a specific version is requested and matches the installed version, skip.
+            if (pkg.type === 'version' &&
+                typeof node === 'object' &&
+                node.package.version === pkg.fetchSpec) {
+                this.logger.info(`Package '${pkg.name}' is already at '${pkg.fetchSpec}'.`);
+                continue;
+            }
+            requests.push(pkg);
+        }
+        if (requests.length === 0) {
+            return 0;
+        }
+        this.logger.info('Fetching dependency metadata from registry...');
+        for (const requestIdentifier of requests) {
+            let metadata;
+            try {
+                // Metadata requests are internally cached; multiple requests for same name
+                // does not result in additional network traffic
+                metadata = await package_metadata_1.fetchPackageMetadata(requestIdentifier.name, this.logger);
+            }
+            catch (e) {
+                this.logger.error(`Error fetching metadata for '${requestIdentifier.name}': ` + e.message);
+                return 1;
+            }
+            // Try to find a package version based on the user requested package specifier
+            // registry specifier types are either version, range, or tag
+            let manifest;
+            if (requestIdentifier.type === 'version') {
+                manifest = metadata.versions.get(requestIdentifier.fetchSpec);
+            }
+            else if (requestIdentifier.type === 'range') {
+                const maxVersion = semver.maxSatisfying(Array.from(metadata.versions.keys()), requestIdentifier.fetchSpec);
+                if (maxVersion) {
+                    manifest = metadata.versions.get(maxVersion);
+                }
+            }
+            else if (requestIdentifier.type === 'tag') {
+                manifest = metadata.tags[requestIdentifier.fetchSpec];
+            }
+            if (!manifest) {
+                this.logger.error(`Package specified by '${requestIdentifier.raw}' does not exist within the registry.`);
+                return 1;
+            }
+        }
         return this.runSchematic({
-            collectionName: this.collectionName,
-            schematicName: this.schematicName,
-            schematicOptions: options['--'],
+            collectionName: '@schematics/update',
+            schematicName: 'update',
             dryRun: !!options.dryRun,
-            force: false,
             showNothingDone: false,
-            additionalOptions: { packageManager },
+            additionalOptions: {
+                force: options.force || false,
+                packageManager,
+                packages: requests.map(p => p.toString()),
+            },
         });
     }
+    checkCleanGit() {
+        try {
+            const result = child_process_1.execSync('git status --porcelain', { encoding: 'utf8', stdio: 'pipe' });
+            return result.trim().length === 0;
+        }
+        catch (_a) {
+            return true;
+        }
+    }
 }
 exports.UpdateCommand = UpdateCommand;

package/commands/update-long.md

@@ -1,7 +1,9 @@
-Perform a basic update to v7 of the core framework and CLI by running the following command.
+Perform a basic update to the current stable release of the core framework and CLI by running the following command.
 
 ```
 ng update @angular/cli @angular/core
 ```
 
+To update to the next beta or pre-release version, use the `--next=true` option.
+
 For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.io/).

package/commands/update.d.ts

@@ -2,10 +2,41 @@
  * Updates your application and its dependencies. See https://update.angular.io/
  */
 export interface Schema {
+    /**
+     * Whether to update all packages in package.json.
+     */
+    all?: boolean;
+    /**
+     * If false, will error out if installed packages are incompatible with the update.
+     */
+    force?: boolean;
+    /**
+     * Version from which to migrate from. Only available with a single package being updated,
+     * and only on migration only.
+     */
+    from?: string;
     /**
      * Shows a help message for this command in the console.
      */
     help?: HelpUnion;
+    /**
+     * Only perform a migration, does not update the installed version.
+     */
+    migrateOnly?: boolean;
+    /**
+     * Use the largest version, including beta and RCs.
+     */
+    next?: boolean;
+    /**
+     * The names of package(s) to update.
+     */
+    packages?: string[];
+    /**
+     * Version up to which to apply migrations. Only available with a single package being
+     * updated, and only on migrations only. Requires from to be specified. Default to the
+     * installed version detected.
+     */
+    to?: string;
 }
 /**
  * Shows a help message for this command in the console.

package/commands/update.json

@@ -13,6 +13,48 @@
   "allOf": [
     {
       "$ref": "./definitions.json#/definitions/base"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "packages": {
+          "description": "The names of package(s) to update.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "$default": {
+            "$source": "argv"
+          }
+        },
+        "force": {
+          "description": "If false, will error out if installed packages are incompatible with the update.",
+          "default": false,
+          "type": "boolean"
+        },
+        "all": {
+          "description": "Whether to update all packages in package.json.",
+          "default": false,
+          "type": "boolean"
+        },
+        "next": {
+          "description": "Use the largest version, including beta and RCs.",
+          "default": false,
+          "type": "boolean"
+        },
+        "migrateOnly": {
+          "description": "Only perform a migration, does not update the installed version.",
+          "type": "boolean"
+        },
+        "from": {
+          "description": "Version from which to migrate from. Only available with a single package being updated, and only on migration only.",
+          "type": "string"
+        },
+        "to": {
+          "description": "Version up to which to apply migrations. Only available with a single package being updated, and only on migrations only. Requires from to be specified. Default to the installed version detected.",
+          "type": "string"
+        }
+      }
     }
   ]
 }

package/commands/version-impl.js

@@ -26,6 +26,7 @@ class VersionCommand extends command_1.Command {
         const patterns = [
             /^@angular\/.*/,
             /^@angular-devkit\/.*/,
+            /^@bazel\/.*/,
             /^@ngtools\/.*/,
             /^@nguniversal\/.*/,
             /^@schematics\/.*/,

package/commands/xi18n-impl.js

@@ -14,6 +14,12 @@ class Xi18nCommand extends architect_command_1.ArchitectCommand {
         this.target = 'extract-i18n';
     }
     async run(options) {
+        const version = process.version.substr(1).split('.');
+        if (Number(version[0]) === 12 && Number(version[1]) === 0) {
+            this.logger.error('Due to a defect in Node.js 12.0, the command is not supported on this Node.js version. '
+                + 'Please upgrade to Node.js 12.1 or later.');
+            return 1;
+        }
         return this.runArchitectTarget(options);
     }
 }

package/commands/xi18n.d.ts

@@ -5,6 +5,7 @@ export interface Schema {
     /**
      * A named build target, as specified in the "configurations" section of angular.json.
      * Each named target is accompanied by a configuration of option defaults for that target.
+     * Setting this explicitly overrides the "--prod" flag
      */
     configuration?: string;
     /**
@@ -12,13 +13,14 @@ export interface Schema {
      */
     help?: HelpUnion;
     /**
+     * Shorthand for "--configuration=production".
      * When true, sets the build configuration to the production target.
-     * All builds make use of bundling and limited tree-shaking. A production build also runs
-     * limited dead code elimination.
+     * By default, the production target is set up in the workspace configuration such that all
+     * builds make use of bundling, limited tree-shaking, and also limited dead code elimination.
      */
     prod?: boolean;
     /**
-     * The name of the project to build. Can be an app or a library.
+     * The name of the project to build. Can be an application or a library.
      */
     project?: string;
 }

package/models/analytics.js

@@ -16,6 +16,7 @@ const os = require("os");
 const ua = require("universal-analytics");
 const uuid_1 = require("uuid");
 const config_1 = require("../utilities/config");
+const tty_1 = require("../utilities/tty");
 const analyticsDebug = debug('ng:analytics'); // Generate analytics, including settings and users.
 const analyticsLogDebug = debug('ng:analytics:log'); // Actual logs of events.
 const BYTES_PER_MEGABYTES = 1024 * 1024;
@@ -309,7 +310,7 @@ exports.setAnalyticsConfig = setAnalyticsConfig;
  */
 async function promptGlobalAnalytics(force = false) {
     analyticsDebug('prompting global analytics.');
-    if (force || (process.stdout.isTTY && process.stdin.isTTY)) {
+    if (force || tty_1.isTTY()) {
         const answers = await inquirer.prompt([
             {
                 type: 'confirm',
@@ -353,7 +354,7 @@ async function promptProjectAnalytics(force = false) {
     if (!config || !configPath) {
         throw new Error(`Could not find a local workspace. Are you in a project?`);
     }
-    if (force || (process.stdout.isTTY && process.stdin.isTTY)) {
+    if (force || tty_1.isTTY()) {
         const answers = await inquirer.prompt([
             {
                 type: 'confirm',
@@ -389,7 +390,7 @@ function hasGlobalAnalyticsConfiguration() {
         const analyticsConfig = globalWorkspace
             && globalWorkspace.getCli()
             && globalWorkspace.getCli()['analytics'];
-        if (analyticsConfig !== undefined) {
+        if (analyticsConfig !== null && analyticsConfig !== undefined) {
             return true;
         }
     }

package/models/architect-command.js

@@ -176,7 +176,9 @@ class ArchitectCommand extends command_1.Command {
         const builderDesc = await this._architectHost.resolveBuilder(builderConf);
         const targetOptionArray = await json_schema_1.parseJsonSchemaToOptions(this._registry, builderDesc.optionSchema);
         const overrides = parser_1.parseArguments(targetOptions, targetOptionArray, this.logger);
-        if (overrides['--']) {
+        const allowAdditionalProperties = typeof builderDesc.optionSchema === 'object'
+            && builderDesc.optionSchema.additionalProperties;
+        if (overrides['--'] && !allowAdditionalProperties) {
             (overrides['--'] || []).forEach(additional => {
                 this.logger.fatal(`Unknown option: '${additional.split(/=/)[0]}'`);
             });
@@ -188,7 +190,10 @@ class ArchitectCommand extends command_1.Command {
             return this.runBepTarget(this.description.name, target, overrides, commandOptions.buildEventLog);
         }
         else {
-            const run = await this._architect.scheduleTarget(target, overrides, { logger: this.logger });
+            const run = await this._architect.scheduleTarget(target, overrides, {
+                logger: this.logger,
+                analytics: analytics_1.isPackageNameSafeForAnalytics(builderConf) ? this.analytics : undefined,
+            });
             const result = await run.output.toPromise();
             await run.stop();
             return result.success ? 0 : 1;

package/models/schematic-command.d.ts

@@ -35,6 +35,7 @@ export declare abstract class SchematicCommand<T extends (BaseSchematicSchema &
     private _host;
     private _workspace;
     protected _workflow: NodeWorkflow;
+    private readonly defaultCollectionName;
     protected collectionName: string;
     protected schematicName?: string;
     constructor(context: CommandContext, description: CommandDescription, logger: logging.Logger);

package/models/schematic-command.js

@@ -17,6 +17,7 @@ const workspace_loader_1 = require("../models/workspace-loader");
 const config_1 = require("../utilities/config");
 const json_schema_1 = require("../utilities/json-schema");
 const package_manager_1 = require("../utilities/package-manager");
+const tty_1 = require("../utilities/tty");
 const analytics_1 = require("./analytics");
 const command_1 = require("./command");
 const parser_1 = require("./parser");
@@ -32,7 +33,8 @@ class SchematicCommand extends command_1.Command {
         this.allowPrivateSchematics = false;
         this.allowAdditionalArgs = false;
         this._host = new node_1.NodeJsSyncHost();
-        this.collectionName = '@schematics/angular';
+        this.defaultCollectionName = '@schematics/angular';
+        this.collectionName = this.defaultCollectionName;
     }
     async initialize(options) {
         await this._loadWorkspace();
@@ -172,35 +174,10 @@ class SchematicCommand extends command_1.Command {
                 };
             }
             else {
-                return {
-                    ...context,
-                    analytics: new core_1.analytics.NoopAnalytics(),
-                };
+                return context;
             }
         });
         workflow.engineHost.registerOptionsTransform(tools_1.validateOptionsWithSchema(workflow.registry));
-        // This needs to be the last transform as it reports the flags to analytics (if enabled).
-        workflow.engineHost.registerOptionsTransform(async (schematic, options, context) => {
-            const analytics = context && context.analytics;
-            if (!schematic.schemaJson || !context || !analytics) {
-                return options;
-            }
-            const collectionName = context.schematic.collection.description.name;
-            const schematicName = context.schematic.description.name;
-            if (!analytics_1.isPackageNameSafeForAnalytics(collectionName)) {
-                return options;
-            }
-            const args = await json_schema_1.parseJsonSchemaToOptions(this._workflow.registry, schematic.schemaJson);
-            const dimensions = [];
-            for (const option of args) {
-                const ua = option.userAnalytics;
-                if (option.name in options && ua) {
-                    dimensions[ua] = options[option.name];
-                }
-            }
-            analytics.event('schematics', collectionName + ':' + schematicName, { dimensions });
-            return options;
-        });
         if (options.defaults) {
             workflow.registry.addPreTransform(core_1.schema.transforms.addUndefinedDefaults);
         }
@@ -227,7 +204,7 @@ class SchematicCommand extends command_1.Command {
             }
             return undefined;
         });
-        if (options.interactive !== false && process.stdout.isTTY) {
+        if (options.interactive !== false && tty_1.isTTY()) {
             workflow.registry.usePromptProvider((definitions) => {
                 const questions = definitions.map(definition => {
                     const question = {
@@ -292,7 +269,7 @@ class SchematicCommand extends command_1.Command {
                 return value;
             }
         }
-        return this.collectionName;
+        return this.defaultCollectionName;
     }
     async runSchematic(options) {
         const { schematicOptions, debug, dryRun } = options;
@@ -309,7 +286,7 @@ class SchematicCommand extends command_1.Command {
         collectionName = schematic.collection.description.name;
         schematicName = schematic.description.name;
         // TODO: Remove warning check when 'targets' is default
-        if (collectionName !== this.collectionName) {
+        if (collectionName !== this.defaultCollectionName) {
             const [ast, configPath] = config_1.getWorkspaceRaw('local');
             if (ast) {
                 const projectsKeyValue = ast.properties.find(p => p.key.value === 'projects');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "8.0.0-rc.1",
+  "version": "8.0.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.800.0-rc.1",
-    "@angular-devkit/core": "8.0.0-rc.1",
-    "@angular-devkit/schematics": "8.0.0-rc.1",
-    "@schematics/angular": "8.0.0-rc.1",
-    "@schematics/update": "0.800.0-rc.1",
+    "@angular-devkit/architect": "0.800.0",
+    "@angular-devkit/core": "8.0.0",
+    "@angular-devkit/schematics": "8.0.0",
+    "@schematics/angular": "8.0.0",
+    "@schematics/update": "0.800.0",
     "@yarnpkg/lockfile": "1.1.0",
     "debug": "^4.1.1",
     "ini": "1.3.5",
@@ -40,6 +40,7 @@
     "npm-package-arg": "6.1.0",
     "open": "6.2.0",
     "pacote": "9.5.0",
+    "read-package-tree": "5.2.2",
     "semver": "6.0.0",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
@@ -48,10 +49,10 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "8.0.0-rc.1",
-      "@angular-devkit/build-angular": "0.800.0-rc.1",
-      "@angular-devkit/build-ng-packagr": "0.800.0-rc.1",
-      "@angular-devkit/build-webpack": "0.800.0-rc.1"
+      "@angular/cli": "8.0.0",
+      "@angular-devkit/build-angular": "0.800.0",
+      "@angular-devkit/build-ng-packagr": "0.800.0",
+      "@angular-devkit/build-webpack": "0.800.0"
     }
   },
   "engines": {

package/tasks/npm-install.d.ts

@@ -6,5 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-export declare type NpmInstall = (packageName: string, logger: logging.Logger, packageManager: string, projectRoot: string, save?: boolean) => Promise<void>;
 export default function (packageName: string, logger: logging.Logger, packageManager: string, projectRoot: string, save?: boolean): Promise<void>;

package/tasks/npm-install.js

@@ -15,14 +15,14 @@ async function default_1(packageName, logger, packageManager, projectRoot, save
         case 'cnpm':
         case 'pnpm':
         case 'npm':
-            installArgs.push('install', '--silent');
+            installArgs.push('install');
             break;
         case 'yarn':
             installArgs.push('add');
             break;
         default:
             packageManager = 'npm';
-            installArgs.push('install', '--quiet');
+            installArgs.push('install');
             break;
     }
     logger.info(core_1.terminal.green(`Installing packages for tooling via ${packageManager}.`));
@@ -32,6 +32,7 @@ async function default_1(packageName, logger, packageManager, projectRoot, save
     if (!save) {
         installArgs.push('--no-save');
     }
+    installArgs.push('--quiet');
     await new Promise((resolve, reject) => {
         child_process_1.spawn(packageManager, installArgs, { stdio: 'inherit', shell: true })
             .on('close', (code) => {
@@ -40,9 +41,7 @@ async function default_1(packageName, logger, packageManager, projectRoot, save
                 resolve();
             }
             else {
-                const message = 'Package install failed, see above.';
-                logger.info(core_1.terminal.red(message));
-                reject(message);
+                reject('Package install failed, see above.');
             }
         });
     });

package/utilities/package-metadata.d.ts

@@ -15,6 +15,8 @@ export interface PackageIdentifier {
     scope: string | null;
     registry: boolean;
     raw: string;
+    fetchSpec: string;
+    rawSpec: string;
 }
 export interface PackageManifest {
     name: string;

package/utilities/package-tree.d.ts

@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export interface PackageTreeNodeBase {
+    name: string;
+    path: string;
+    realpath: string;
+    error?: Error;
+    id: number;
+    isLink: boolean;
+    package: {
+        name: string;
+        version: string;
+        dependencies?: Record<string, string>;
+        devDependencies?: Record<string, string>;
+        peerDependencies?: Record<string, string>;
+        'ng-update'?: {
+            migrations?: string;
+        };
+    };
+    children: PackageTreeNode[];
+}
+export interface PackageTreeActual extends PackageTreeNodeBase {
+    isLink: false;
+    parent?: PackageTreeActual;
+}
+export interface PackageTreeLink extends PackageTreeNodeBase {
+    isLink: true;
+    parent: null;
+    target: PackageTreeActual;
+}
+export declare type PackageTreeNode = PackageTreeActual | PackageTreeLink;
+export declare function readPackageTree(path: string): Promise<PackageTreeNode>;
+export declare function findNodeDependencies(root: PackageTreeNode, node?: PackageTreeNode): Record<string, string | PackageTreeActual | undefined>;

package/utilities/package-tree.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function readPackageTree(path) {
+    const rpt = require('read-package-tree');
+    return new Promise((resolve, reject) => {
+        rpt(path, (e, data) => {
+            if (e) {
+                reject(e);
+            }
+            else {
+                resolve(data);
+            }
+        });
+    });
+}
+exports.readPackageTree = readPackageTree;
+function findNodeDependencies(root, node = root) {
+    const actual = node.isLink ? node.target : node;
+    const rawDeps = {
+        ...actual.package.dependencies,
+        ...actual.package.devDependencies,
+        ...actual.package.peerDependencies,
+    };
+    return Object.entries(rawDeps).reduce((deps, [name, version]) => {
+        const depNode = root.children.find(child => {
+            return child.name === name && !child.isLink && child.parent === node;
+        });
+        deps[name] = depNode || version;
+        return deps;
+    }, {});
+}
+exports.findNodeDependencies = findNodeDependencies;

package/utilities/tty.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export declare function isTTY(): boolean;

package/utilities/tty.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+function isTTY() {
+    const force = process.env['NG_FORCE_TTY'];
+    if (force !== undefined) {
+        return !(force === '0' || force.toUpperCase() === 'FALSE');
+    }
+    return !!process.stdout.isTTY && !!process.stdin.isTTY;
+}
+exports.isTTY = isTTY;