@angular/cli 14.0.0-next.3 → 14.0.0-next.6

package/bin/ng.js

@@ -36,19 +36,17 @@ if (version[0] % 2 === 1 && version[0] > 16) {
 
   require('./bootstrap');
 } else if (
-  version[0] < 12 ||
-  version[0] === 13 ||
+  version[0] < 14 ||
   version[0] === 15 ||
-  (version[0] === 12 && version[1] < 20) ||
   (version[0] === 14 && version[1] < 15) ||
   (version[0] === 16 && version[1] < 10)
 ) {
-  // Error and exit if less than 12.20 or 13.x or less than 14.15 or 15.x or less than 16.10
+  // Error and exit if less than 14.15 or 15.x or less than 16.10
   console.error(
     'Node.js version ' +
       process.version +
       ' detected.\n' +
-      'The Angular CLI requires a minimum Node.js version of either v12.20, v14.15, or v16.10.\n\n' +
+      'The Angular CLI requires a minimum Node.js version of either v14.15, or v16.10.\n\n' +
       'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n',
   );
 

package/bin/postinstall/analytics-prompt.js

@@ -14,13 +14,13 @@ if ('NG_CLI_ANALYTICS' in process.env) {
 }
 
 try {
-  var analytics = require('../../models/analytics');
+  var analytics = require('../../src/analytics/analytics');
 
   analytics
-    .hasGlobalAnalyticsConfiguration()
+    .getAnalytics('global')
     .then((hasGlobalConfig) => {
       if (!hasGlobalConfig) {
-        return analytics.promptGlobalAnalytics();
+        return analytics.promptAnalytics(true /** global */);
       }
     })
     .catch(() => {});

package/lib/cli/index.d.ts

@@ -5,7 +5,7 @@
  * 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 { VERSION, Version } from '../../models/version';
+export { VERSION } from '../../src/utilities/version';
 export default function (options: {
     testing?: boolean;
     cliArgs: string[];

package/lib/cli/index.js

@@ -7,26 +7,26 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Version = exports.VERSION = void 0;
+exports.VERSION = void 0;
 const node_1 = require("@angular-devkit/core/node");
 const util_1 = require("util");
-const command_runner_1 = require("../../models/command-runner");
-const color_1 = require("../../utilities/color");
-const config_1 = require("../../utilities/config");
-const log_file_1 = require("../../utilities/log-file");
-const project_1 = require("../../utilities/project");
-var version_1 = require("../../models/version");
+const command_module_1 = require("../../src/command-builder/command-module");
+const command_runner_1 = require("../../src/command-builder/command-runner");
+const color_1 = require("../../src/utilities/color");
+const config_1 = require("../../src/utilities/config");
+const log_file_1 = require("../../src/utilities/log-file");
+const project_1 = require("../../src/utilities/project");
+var version_1 = require("../../src/utilities/version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
-Object.defineProperty(exports, "Version", { enumerable: true, get: function () { return version_1.Version; } });
 const debugEnv = process.env['NG_DEBUG'];
 const isDebug = debugEnv !== undefined && debugEnv !== '0' && debugEnv.toLowerCase() !== 'false';
 /* eslint-disable no-console */
 async function default_1(options) {
     // This node version check ensures that the requirements of the project instance of the CLI are met
-    const version = process.versions.node.split('.').map((part) => Number(part));
-    if (version[0] < 12 || (version[0] === 12 && version[1] < 20)) {
+    const [major, minor] = process.versions.node.split('.').map((part) => Number(part));
+    if (major < 14 || (major === 14 && minor < 15)) {
         process.stderr.write(`Node.js version ${process.version} detected.\n` +
-            'The Angular CLI requires a minimum v12.20.\n\n' +
+            'The Angular CLI requires a minimum v14.15.\n\n' +
             'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n');
         return 3;
     }
@@ -67,15 +67,13 @@ async function default_1(options) {
         }
     }
     try {
-        const maybeExitCode = await (0, command_runner_1.runCommand)(options.cliArgs, logger, workspace);
-        if (typeof maybeExitCode === 'number') {
-            console.assert(Number.isInteger(maybeExitCode));
-            return maybeExitCode;
-        }
-        return 0;
+        return await (0, command_runner_1.runCommand)(options.cliArgs, logger, workspace);
     }
     catch (err) {
-        if (err instanceof Error) {
+        if (err instanceof command_module_1.CommandModuleError) {
+            logger.fatal(`Error: ${err.message}`);
+        }
+        else if (err instanceof Error) {
             try {
                 const logPath = (0, log_file_1.writeErrorToLogFile)(err);
                 logger.fatal(`An unhandled exception occurred: ${err.message}\n` +

package/lib/config/schema.json

@@ -586,7 +586,7 @@
     "SchematicsAngularApplicationSchema": {
       "title": "Angular Application Options Schema",
       "type": "object",
-      "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
+      "description": "Generates a new basic application definition in the \"projects\" subfolder of the workspace.",
       "additionalProperties": false,
       "properties": {
         "projectRoot": {
@@ -741,8 +741,7 @@
         },
         "type": {
           "type": "string",
-          "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
-          "default": ""
+          "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\"."
         }
       }
     },
@@ -1129,7 +1128,6 @@
         },
         "prefix": {
           "type": "string",
-          "default": "",
           "description": "A prefix to apply to generated selectors."
         },
         "type": {
@@ -1526,12 +1524,12 @@
       "properties": {
         "browserTarget": {
           "type": "string",
-          "description": "A browser builder target use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+          "description": "A browser builder target use for rendering the application shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
           "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
         },
         "serverTarget": {
           "type": "string",
-          "description": "A server builder target use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+          "description": "A server builder target use for rendering the application shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
           "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
         },
         "appModuleBundle": {
@@ -1751,12 +1749,11 @@
         },
         "outputPath": {
           "type": "string",
-          "description": "The full path for the new output directory, relative to the current workspace.\n\nBy default, writes output to a folder named dist/ in the current project."
+          "description": "The full path for the new output directory, relative to the current workspace.\nBy default, writes output to a folder named dist/ in the current project."
         },
         "resourcesOutputPath": {
           "type": "string",
-          "description": "The path where style resources will be placed, relative to outputPath.",
-          "default": ""
+          "description": "The path where style resources will be placed, relative to outputPath."
         },
         "aot": {
           "type": "boolean",
@@ -2186,7 +2183,7 @@
         },
         "servePath": {
           "type": "string",
-          "description": "The pathname where the app will be served."
+          "description": "The pathname where the application will be served."
         },
         "disableHostCheck": {
           "type": "boolean",
@@ -2664,8 +2661,7 @@
         },
         "resourcesOutputPath": {
           "type": "string",
-          "description": "The path where style resources will be placed, relative to outputPath.",
-          "default": ""
+          "description": "The path where style resources will be placed, relative to outputPath."
         },
         "sourceMap": {
           "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",

package/lib/config/workspace-schema.d.ts

@@ -114,7 +114,7 @@ export interface SchematicOptions {
     "@schematics/angular:web-worker"?: AngularWebWorkerOptionsSchema;
 }
 /**
- * Generates a new basic app definition in the "projects" subfolder of the workspace.
+ * Generates a new basic application definition in the "projects" subfolder of the workspace.
  */
 export interface AngularApplicationOptionsSchema {
     /**

package/lib/init.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -31,9 +35,9 @@ require("symbol-observable");
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const semver_1 = require("semver");
-const version_1 = require("../models/version");
-const color_1 = require("../utilities/color");
-const config_1 = require("../utilities/config");
+const color_1 = require("../src/utilities/color");
+const config_1 = require("../src/utilities/config");
+const version_1 = require("../src/utilities/version");
 (async () => {
     var _a;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.3",
+  "version": "14.0.0-next.6",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,39 +28,40 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.3",
-    "@angular-devkit/core": "14.0.0-next.3",
-    "@angular-devkit/schematics": "14.0.0-next.3",
-    "@schematics/angular": "14.0.0-next.3",
+    "@angular-devkit/architect": "0.1400.0-next.6",
+    "@angular-devkit/core": "14.0.0-next.6",
+    "@angular-devkit/schematics": "14.0.0-next.6",
+    "@schematics/angular": "14.0.0-next.6",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.3",
     "ini": "2.0.0",
-    "inquirer": "8.2.0",
+    "inquirer": "8.2.1",
     "jsonc-parser": "3.0.0",
-    "npm-package-arg": "9.0.0",
+    "npm-package-arg": "9.0.1",
     "npm-pick-manifest": "7.0.0",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "13.0.2",
+    "pacote": "13.0.5",
     "resolve": "1.22.0",
     "semver": "7.3.5",
     "symbol-observable": "4.0.0",
-    "uuid": "8.3.2"
+    "uuid": "8.3.2",
+    "yargs": "17.3.1"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-next.3",
-      "@angular-devkit/architect": "0.1400.0-next.3",
-      "@angular-devkit/build-angular": "14.0.0-next.3",
-      "@angular-devkit/build-webpack": "0.1400.0-next.3",
-      "@angular-devkit/core": "14.0.0-next.3",
-      "@angular-devkit/schematics": "14.0.0-next.3"
+      "@angular/cli": "14.0.0-next.6",
+      "@angular-devkit/architect": "0.1400.0-next.6",
+      "@angular-devkit/build-angular": "14.0.0-next.6",
+      "@angular-devkit/build-webpack": "0.1400.0-next.6",
+      "@angular-devkit/core": "14.0.0-next.6",
+      "@angular-devkit/schematics": "14.0.0-next.6"
     }
   },
   "engines": {
-    "node": "^12.20.0 || ^14.15.0 || >=16.10.0",
+    "node": "^14.15.0 || >=16.10.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   }

package/{models → src/analytics}/analytics-collector.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -36,7 +40,7 @@ const debug_1 = __importDefault(require("debug"));
 const https = __importStar(require("https"));
 const os = __importStar(require("os"));
 const querystring = __importStar(require("querystring"));
-const version_1 = require("./version");
+const version_1 = require("../utilities/version");
 /**
  * See: https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide
  */

package/src/analytics/analytics-environment-options.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC 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 const analyticsDisabled: boolean;
+export declare const analyticsShareDisabled: boolean;

package/src/analytics/analytics-environment-options.js

@@ -0,0 +1,20 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.analyticsShareDisabled = exports.analyticsDisabled = void 0;
+function isDisabled(variable) {
+    return variable === '0' || variable.toLowerCase() === 'false';
+}
+function isPresent(variable) {
+    return typeof variable === 'string' && variable !== '';
+}
+const analyticsVariable = process.env['NG_CLI_ANALYTICS'];
+exports.analyticsDisabled = isPresent(analyticsVariable) && isDisabled(analyticsVariable);
+const analyticsShareVariable = process.env['NG_CLI_ANALYTICS_SHARE'];
+exports.analyticsShareDisabled = isPresent(analyticsShareVariable) && isDisabled(analyticsShareVariable);

package/src/analytics/analytics.d.ts

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+import { analytics } from '@angular-devkit/core';
+import { AnalyticsCollector } from './analytics-collector';
+export declare const AnalyticsProperties: {
+    AngularCliProd: string;
+    AngularCliStaging: string;
+    readonly AngularCliDefault: string;
+};
+/**
+ * This is the ultimate safelist for checking if a package name is safe to report to analytics.
+ */
+export declare const analyticsPackageSafelist: (string | RegExp)[];
+export declare function isPackageNameSafeForAnalytics(name: string): boolean;
+/**
+ * Set analytics settings. This does not work if the user is not inside a project.
+ * @param global Which config to use. "global" for user-level, and "local" for project-level.
+ * @param value Either a user ID, true to generate a new User ID, or false to disable analytics.
+ */
+export declare function setAnalyticsConfig(global: boolean, value: string | boolean): void;
+/**
+ * Prompt the user for usage gathering permission.
+ * @param force Whether to ask regardless of whether or not the user is using an interactive shell.
+ * @return Whether or not the user was shown a prompt.
+ */
+export declare function promptAnalytics(global: boolean, force?: boolean): Promise<boolean>;
+/**
+ * Get the analytics object for the user.
+ *
+ * @returns
+ * - `AnalyticsCollector` when enabled.
+ * - `analytics.NoopAnalytics` when disabled.
+ * - `undefined` when not configured.
+ */
+export declare function getAnalytics(level: 'local' | 'global'): Promise<AnalyticsCollector | analytics.NoopAnalytics | undefined>;
+/**
+ * Return the usage analytics sharing setting, which is either a property string (GA-XXXXXXX-XX),
+ * or undefined if no sharing.
+ */
+export declare function getSharedAnalytics(): Promise<AnalyticsCollector | undefined>;
+export declare function createAnalytics(workspace: boolean, skipPrompt?: boolean): Promise<analytics.Analytics>;
+export declare function getAnalyticsInfoString(): Promise<string>;