@angular/cli 8.0.0-rc.4 → 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

@@ -25,7 +25,7 @@ export interface Schema {
      */
     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,7 +7,7 @@
       "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

package/commands/e2e.d.ts

@@ -20,7 +20,7 @@ export interface Schema {
      */
     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

@@ -24,7 +24,7 @@ export interface Schema {
      */
     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

@@ -20,7 +20,7 @@ export interface Schema {
      */
     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

@@ -5,4 +5,5 @@ export declare class UpdateCommand extends SchematicCommand<UpdateCommandSchema>
     readonly allowMissingWorkspace = true;
     parseArguments(_schematicOptions: string[], _schema: Option[]): Promise<Arguments>;
     run(options: UpdateCommandSchema & Arguments): Promise<number | void>;
+    checkCleanGit(): boolean;
 }

package/commands/update-impl.js

@@ -7,6 +7,7 @@ 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 child_process_1 = require("child_process");
 const path = require("path");
 const semver = require("semver");
 const schematic_command_1 = require("../models/schematic-command");
@@ -65,6 +66,12 @@ class UpdateCommand extends schematic_command_1.SchematicCommand {
             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
@@ -220,5 +227,14 @@ class UpdateCommand extends schematic_command_1.SchematicCommand {
             },
         });
     }
+    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/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

@@ -20,7 +20,7 @@ export interface Schema {
      */
     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/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();
@@ -202,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 = {
@@ -267,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;
@@ -284,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.4",
+  "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.4",
-    "@angular-devkit/core": "8.0.0-rc.4",
-    "@angular-devkit/schematics": "8.0.0-rc.4",
-    "@schematics/angular": "8.0.0-rc.4",
-    "@schematics/update": "0.800.0-rc.4",
+    "@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",
@@ -49,10 +49,10 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "8.0.0-rc.4",
-      "@angular-devkit/build-angular": "0.800.0-rc.4",
-      "@angular-devkit/build-ng-packagr": "0.800.0-rc.4",
-      "@angular-devkit/build-webpack": "0.800.0-rc.4"
+      "@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/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;