@angular/cli 15.0.0-next.4 → 15.0.0-next.6

package/bin/ng.js

@@ -24,7 +24,7 @@ try {
 // These may not support ES2015 features such as const/let/async/await/etc.
 // These would then crash with a hard to diagnose error message.
 var version = process.versions.node.split('.').map((part) => Number(part));
-if (version[0] % 2 === 1 && version[0] > 16) {
+if (version[0] % 2 === 1) {
   // Allow new odd numbered releases with a warning (currently v17+)
   console.warn(
     'Node.js version ' +
@@ -37,16 +37,16 @@ if (version[0] % 2 === 1 && version[0] > 16) {
   require('./bootstrap');
 } else if (
   version[0] < 14 ||
-  version[0] === 15 ||
-  (version[0] === 14 && version[1] < 15) ||
-  (version[0] === 16 && version[1] < 10)
+  (version[0] === 14 && version[1] < 20) ||
+  (version[0] === 16 && version[1] < 13) ||
+  (version[0] === 18 && version[1] < 10)
 ) {
-  // Error and exit if less than 14.20 or 15.x or less than 16.10
+  // Error and exit if less than 14.20, 16.13 or 18.10
   console.error(
     'Node.js version ' +
       process.version +
       ' detected.\n' +
-      'The Angular CLI requires a minimum Node.js version of either v14.20, or v16.10.\n\n' +
+      'The Angular CLI requires a minimum Node.js version of either v14.20, v16.13 or v18.10.\n\n' +
       'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n',
   );
 

package/lib/config/schema.json

@@ -84,22 +84,6 @@
           ],
           "description": "Share pseudonymous usage data with the Angular Team at Google."
         },
-        "analyticsSharing": {
-          "type": "object",
-          "properties": {
-            "tracking": {
-              "description": "Analytics sharing info tracking ID.",
-              "type": "string",
-              "pattern": "^(GA|UA)?-\\d+-\\d+$"
-            },
-            "uuid": {
-              "description": "Analytics sharing info universally unique identifier.",
-              "type": "string",
-              "format": "uuid"
-            }
-          },
-          "additionalProperties": false
-        },
         "cache": {
           "description": "Control disk cache.",
           "type": "object",
@@ -171,22 +155,6 @@
           ],
           "description": "Share pseudonymous usage data with the Angular Team at Google."
         },
-        "analyticsSharing": {
-          "type": "object",
-          "properties": {
-            "tracking": {
-              "description": "Analytics sharing info tracking ID.",
-              "type": "string",
-              "pattern": "^(GA|UA)?-\\d+-\\d+$"
-            },
-            "uuid": {
-              "description": "Analytics sharing info universally unique identifier.",
-              "type": "string",
-              "format": "uuid"
-            }
-          },
-          "additionalProperties": false
-        },
         "completion": {
           "type": "object",
           "description": "Angular CLI completion settings.",
@@ -708,12 +676,11 @@
       "additionalProperties": false,
       "properties": {
         "projectRoot": {
-          "description": "The root directory of the new app.",
-          "type": "string",
-          "visible": false
+          "description": "The root directory of the new application.",
+          "type": "string"
         },
         "name": {
-          "description": "The name of the new app.",
+          "description": "The name of the new application.",
           "type": "string",
           "pattern": "^(?:@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*/)?[a-zA-Z0-9-~][a-zA-Z0-9-._~]*$",
           "$default": {
@@ -1278,6 +1245,10 @@
           "type": "boolean",
           "default": false,
           "description": "Do not update \"tsconfig.json\" to add a path mapping for the new library. The path mapping is needed to use the library in an app, but can be disabled here to simplify development."
+        },
+        "projectRoot": {
+          "type": "string",
+          "description": "The root directory of the new library."
         }
       }
     },

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

@@ -19,7 +19,6 @@ export interface CliOptions {
      * Share pseudonymous usage data with the Angular Team at Google.
      */
     analytics?: Analytics;
-    analyticsSharing?: AnalyticsSharing;
     /**
      * Control disk cache.
      */
@@ -45,16 +44,6 @@ export interface CliOptions {
  * Share pseudonymous usage data with the Angular Team at Google.
  */
 export declare type Analytics = boolean | string;
-export interface AnalyticsSharing {
-    /**
-     * Analytics sharing info tracking ID.
-     */
-    tracking?: string;
-    /**
-     * Analytics sharing info universally unique identifier.
-     */
-    uuid?: string;
-}
 /**
  * Control disk cache.
  */
@@ -139,7 +128,7 @@ export interface AngularApplicationOptionsSchema {
      */
     minimal?: boolean;
     /**
-     * The name of the new app.
+     * The name of the new application.
      */
     name: string;
     /**
@@ -147,7 +136,7 @@ export interface AngularApplicationOptionsSchema {
      */
     prefix?: string;
     /**
-     * The root directory of the new app.
+     * The root directory of the new application.
      */
     projectRoot?: string;
     /**
@@ -502,6 +491,10 @@ export interface LibraryOptionsSchema {
      * A prefix to apply to generated selectors.
      */
     prefix?: string;
+    /**
+     * The root directory of the new library.
+     */
+    projectRoot?: string;
     /**
      * Do not install dependency packages.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "15.0.0-next.4",
+  "version": "15.0.0-next.6",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,13 +25,12 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1500.0-next.4",
-    "@angular-devkit/core": "15.0.0-next.4",
-    "@angular-devkit/schematics": "15.0.0-next.4",
-    "@schematics/angular": "15.0.0-next.4",
+    "@angular-devkit/architect": "0.1500.0-next.6",
+    "@angular-devkit/core": "15.0.0-next.6",
+    "@angular-devkit/schematics": "15.0.0-next.6",
+    "@schematics/angular": "15.0.0-next.6",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
-    "debug": "4.3.4",
     "ini": "3.0.1",
     "inquirer": "8.2.4",
     "jsonc-parser": "3.2.0",
@@ -39,7 +38,7 @@
     "npm-pick-manifest": "7.0.2",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "13.6.2",
+    "pacote": "15.0.0",
     "resolve": "1.22.1",
     "semver": "7.3.8",
     "symbol-observable": "4.0.0",
@@ -48,16 +47,16 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "15.0.0-next.4",
-      "@angular-devkit/architect": "0.1500.0-next.4",
-      "@angular-devkit/build-angular": "15.0.0-next.4",
-      "@angular-devkit/build-webpack": "0.1500.0-next.4",
-      "@angular-devkit/core": "15.0.0-next.4",
-      "@angular-devkit/schematics": "15.0.0-next.4"
+      "@angular/cli": "15.0.0-next.6",
+      "@angular-devkit/architect": "0.1500.0-next.6",
+      "@angular-devkit/build-angular": "15.0.0-next.6",
+      "@angular-devkit/build-webpack": "0.1500.0-next.6",
+      "@angular-devkit/core": "15.0.0-next.6",
+      "@angular-devkit/schematics": "15.0.0-next.6"
     }
   },
   "engines": {
-    "node": "^14.20.0 || >=16.10.0",
+    "node": "^14.20.0 || ^16.13.0 || >=18.10.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   }

package/src/analytics/analytics-collector.d.ts

@@ -5,25 +5,28 @@
  * 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';
-/**
- * See: https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide
- */
-export declare class AnalyticsCollector implements analytics.Analytics {
+import type { CommandContext } from '../command-builder/command-module';
+import { EventCustomDimension, EventCustomMetric, PrimitiveTypes } from './analytics-parameters';
+export declare class AnalyticsCollector {
+    private context;
     private trackingEventsQueue;
-    private readonly parameters;
-    private readonly analyticsLogDebug;
-    constructor(trackingId: string, userId: string);
-    event(ec: string, ea: string, options?: analytics.EventOptions): void;
-    pageview(dp: string, options?: analytics.PageviewOptions): void;
-    timing(utc: string, utv: string, utt: string | number, options?: analytics.TimingOptions): void;
-    screenview(cd: string, an: string, options?: analytics.ScreenviewOptions): void;
-    flush(): Promise<void>;
-    private addToQueue;
-    private send;
+    private readonly requestParameterStringified;
+    private readonly userParameters;
+    constructor(context: CommandContext, userId: string);
+    reportWorkspaceInfoEvent(parameters: Partial<Record<EventCustomMetric, string | boolean | number | undefined>>): void;
+    reportRebuildRunEvent(parameters: Partial<Record<EventCustomMetric & EventCustomDimension, string | boolean | number | undefined>>): void;
+    reportBuildRunEvent(parameters: Partial<Record<EventCustomMetric & EventCustomDimension, string | boolean | number | undefined>>): void;
+    reportArchitectRunEvent(parameters: Partial<Record<EventCustomDimension, PrimitiveTypes>>): void;
+    reportSchematicRunEvent(parameters: Partial<Record<EventCustomDimension, PrimitiveTypes>>): void;
+    reportCommandRunEvent(command: string): void;
+    private event;
     /**
-     * Creates the dimension and metrics variables to add to the queue.
-     * @private
+     * Flush on an interval (if the event loop is waiting).
+     *
+     * @returns a method that when called will terminate the periodic
+     * flush and call flush one last time.
      */
-    private customVariables;
+    periodFlush(): () => Promise<void>;
+    flush(): Promise<void>;
+    private send;
 }

package/src/analytics/analytics-collector.js

@@ -29,213 +29,141 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticsCollector = void 0;
-const core_1 = require("@angular-devkit/core");
-const child_process_1 = require("child_process");
-const debug_1 = __importDefault(require("debug"));
+const crypto_1 = require("crypto");
 const https = __importStar(require("https"));
 const os = __importStar(require("os"));
 const querystring = __importStar(require("querystring"));
+const environment_options_1 = require("../utilities/environment-options");
+const error_1 = require("../utilities/error");
 const version_1 = require("../utilities/version");
-/**
- * See: https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide
- */
+const analytics_parameters_1 = require("./analytics-parameters");
+const TRACKING_ID_PROD = 'G-VETNJBW8L4';
+const TRACKING_ID_STAGING = 'G-TBMPRL1BTM';
 class AnalyticsCollector {
-    constructor(trackingId, userId) {
-        this.trackingEventsQueue = [];
-        this.parameters = {};
-        this.analyticsLogDebug = (0, debug_1.default)('ng:analytics:log');
-        // API Version
-        this.parameters['v'] = '1';
-        // User ID
-        this.parameters['cid'] = userId;
-        // Tracking
-        this.parameters['tid'] = trackingId;
-        this.parameters['ds'] = 'cli';
-        this.parameters['ua'] = _buildUserAgentString();
-        this.parameters['ul'] = _getLanguage();
-        // @angular/cli with version.
-        this.parameters['an'] = '@angular/cli';
-        this.parameters['av'] = version_1.VERSION.full;
-        // We use the application ID for the Node version. This should be "node v12.10.0".
-        const nodeVersion = `node ${process.version}`;
-        this.parameters['aid'] = nodeVersion;
-        // Custom dimentions
-        // We set custom metrics for values we care about.
-        this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.CpuCount] = os.cpus().length;
-        // Get the first CPU's speed. It's very rare to have multiple CPUs of different speed (in most
-        // non-ARM configurations anyway), so that's all we care about.
-        this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.CpuSpeed] = Math.floor(os.cpus()[0].speed);
-        this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.RamInGigabytes] = Math.round(os.totalmem() / (1024 * 1024 * 1024));
-        this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.NodeVersion] = nodeVersion;
-        this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.AngularCLIMajorVersion] =
-            version_1.VERSION.major;
+    constructor(context, userId) {
+        this.context = context;
+        const requestParameters = {
+            [analytics_parameters_1.RequestParameter.ProtocolVersion]: 2,
+            [analytics_parameters_1.RequestParameter.ClientId]: userId,
+            [analytics_parameters_1.RequestParameter.UserId]: userId,
+            [analytics_parameters_1.RequestParameter.TrackingId]: /^\d+\.\d+\.\d+$/.test(version_1.VERSION.full) && version_1.VERSION.full !== '0.0.0'
+                ? TRACKING_ID_PROD
+                : TRACKING_ID_STAGING,
+            // Built-in user properties
+            [analytics_parameters_1.RequestParameter.SessionId]: (0, crypto_1.randomUUID)(),
+            [analytics_parameters_1.RequestParameter.UserAgentArchitecture]: os.arch(),
+            [analytics_parameters_1.RequestParameter.UserAgentPlatform]: os.platform(),
+            [analytics_parameters_1.RequestParameter.UserAgentPlatformVersion]: os.version(),
+            // Set undefined to disable debug view.
+            [analytics_parameters_1.RequestParameter.DebugView]: environment_options_1.ngDebug ? 1 : undefined,
+        };
+        this.requestParameterStringified = querystring.stringify(requestParameters);
+        // Remove the `v` at the beginning.
+        const nodeVersion = process.version.substring(1);
+        const packageManagerVersion = context.packageManager.version;
+        this.userParameters = {
+            // While architecture is being collect by GA as UserAgentArchitecture.
+            // It doesn't look like there is a way to query this. Therefore we collect this as a custom user dimension too.
+            [analytics_parameters_1.UserCustomDimension.OsArchitecture]: os.arch(),
+            // While User ID is being collected by GA, this is not visible in reports/for filtering.
+            [analytics_parameters_1.UserCustomDimension.UserId]: userId,
+            [analytics_parameters_1.UserCustomDimension.NodeVersion]: nodeVersion,
+            [analytics_parameters_1.UserCustomDimension.NodeMajorVersion]: +nodeVersion.split('.', 1)[0],
+            [analytics_parameters_1.UserCustomDimension.PackageManager]: context.packageManager.name,
+            [analytics_parameters_1.UserCustomDimension.PackageManagerVersion]: packageManagerVersion,
+            [analytics_parameters_1.UserCustomDimension.PackageManagerMajorVersion]: packageManagerVersion
+                ? +packageManagerVersion.split('.', 1)[0]
+                : undefined,
+            [analytics_parameters_1.UserCustomDimension.AngularCLIVersion]: version_1.VERSION.full,
+            [analytics_parameters_1.UserCustomDimension.AngularCLIMajorVersion]: version_1.VERSION.major,
+        };
     }
-    event(ec, ea, options = {}) {
-        const { label: el, value: ev, metrics, dimensions } = options;
-        this.addToQueue('event', { ec, ea, el, ev, metrics, dimensions });
+    reportWorkspaceInfoEvent(parameters) {
+        this.event('workspace_info', parameters);
     }
-    pageview(dp, options = {}) {
-        const { hostname: dh, title: dt, metrics, dimensions } = options;
-        this.addToQueue('pageview', { dp, dh, dt, metrics, dimensions });
+    reportRebuildRunEvent(parameters) {
+        this.event('run_rebuild', parameters);
     }
-    timing(utc, utv, utt, options = {}) {
-        const { label: utl, metrics, dimensions } = options;
-        this.addToQueue('timing', { utc, utv, utt, utl, metrics, dimensions });
+    reportBuildRunEvent(parameters) {
+        this.event('run_build', parameters);
     }
-    screenview(cd, an, options = {}) {
-        const { appVersion: av, appId: aid, appInstallerId: aiid, metrics, dimensions } = options;
-        this.addToQueue('screenview', { cd, an, av, aid, aiid, metrics, dimensions });
+    reportArchitectRunEvent(parameters) {
+        this.event('run_architect', parameters);
+    }
+    reportSchematicRunEvent(parameters) {
+        this.event('run_schematic', parameters);
+    }
+    reportCommandRunEvent(command) {
+        this.event('run_command', { [analytics_parameters_1.EventCustomDimension.Command]: command });
+    }
+    event(eventName, parameters) {
+        var _a;
+        (_a = this.trackingEventsQueue) !== null && _a !== void 0 ? _a : (this.trackingEventsQueue = []);
+        this.trackingEventsQueue.push({
+            ...this.userParameters,
+            ...parameters,
+            'en': eventName,
+        });
+    }
+    /**
+     * Flush on an interval (if the event loop is waiting).
+     *
+     * @returns a method that when called will terminate the periodic
+     * flush and call flush one last time.
+     */
+    periodFlush() {
+        let analyticsFlushPromise = Promise.resolve();
+        const analyticsFlushInterval = setInterval(() => {
+            var _a;
+            if ((_a = this.trackingEventsQueue) === null || _a === void 0 ? void 0 : _a.length) {
+                analyticsFlushPromise = analyticsFlushPromise.then(() => this.flush());
+            }
+        }, 4000);
+        return () => {
+            clearInterval(analyticsFlushInterval);
+            // Flush one last time.
+            return analyticsFlushPromise.then(() => this.flush());
+        };
     }
     async flush() {
-        const pending = this.trackingEventsQueue.length;
-        this.analyticsLogDebug(`flush queue size: ${pending}`);
-        if (!pending) {
+        const pendingTrackingEvents = this.trackingEventsQueue;
+        this.context.logger.debug(`Analytics flush size. ${pendingTrackingEvents === null || pendingTrackingEvents === void 0 ? void 0 : pendingTrackingEvents.length}.`);
+        if (!(pendingTrackingEvents === null || pendingTrackingEvents === void 0 ? void 0 : pendingTrackingEvents.length)) {
             return;
         }
         // The below is needed so that if flush is called multiple times,
         // we don't report the same event multiple times.
-        const pendingTrackingEvents = this.trackingEventsQueue;
-        this.trackingEventsQueue = [];
+        this.trackingEventsQueue = undefined;
         try {
             await this.send(pendingTrackingEvents);
         }
         catch (error) {
             // Failure to report analytics shouldn't crash the CLI.
-            this.analyticsLogDebug('send error: %j', error);
+            (0, error_1.assertIsError)(error);
+            this.context.logger.debug(`Send analytics error. ${error.message}.`);
         }
     }
-    addToQueue(eventType, parameters) {
-        const { metrics, dimensions, ...restParameters } = parameters;
-        const data = {
-            ...this.parameters,
-            ...restParameters,
-            ...this.customVariables({ metrics, dimensions }),
-            t: eventType,
-        };
-        this.analyticsLogDebug('add event to queue: %j', data);
-        this.trackingEventsQueue.push(data);
-    }
     async send(data) {
-        this.analyticsLogDebug('send event: %j', data);
         return new Promise((resolve, reject) => {
             const request = https.request({
                 host: 'www.google-analytics.com',
                 method: 'POST',
-                path: data.length > 1 ? '/batch' : '/collect',
+                path: '/g/collect?' + this.requestParameterStringified,
             }, (response) => {
-                if (response.statusCode !== 200) {
+                if (response.statusCode !== 200 && response.statusCode !== 204) {
                     reject(new Error(`Analytics reporting failed with status code: ${response.statusCode}.`));
-                    return;
+                }
+                else {
+                    resolve();
                 }
             });
             request.on('error', reject);
             const queryParameters = data.map((p) => querystring.stringify(p)).join('\n');
             request.write(queryParameters);
-            request.end(resolve);
+            request.end();
         });
     }
-    /**
-     * Creates the dimension and metrics variables to add to the queue.
-     * @private
-     */
-    customVariables(options) {
-        const additionals = {};
-        const { dimensions, metrics } = options;
-        dimensions === null || dimensions === void 0 ? void 0 : dimensions.forEach((v, i) => (additionals[`cd${i}`] = v));
-        metrics === null || metrics === void 0 ? void 0 : metrics.forEach((v, i) => (additionals[`cm${i}`] = v));
-        return additionals;
-    }
 }
 exports.AnalyticsCollector = AnalyticsCollector;
-// These are just approximations of UA strings. We just try to fool Google Analytics to give us the
-// data we want.
-// See https://developers.whatismybrowser.com/useragents/
-const osVersionMap = {
-    darwin: {
-        '1.3.1': '10_0_4',
-        '1.4.1': '10_1_0',
-        '5.1': '10_1_1',
-        '5.2': '10_1_5',
-        '6.0.1': '10_2',
-        '6.8': '10_2_8',
-        '7.0': '10_3_0',
-        '7.9': '10_3_9',
-        '8.0': '10_4_0',
-        '8.11': '10_4_11',
-        '9.0': '10_5_0',
-        '9.8': '10_5_8',
-        '10.0': '10_6_0',
-        '10.8': '10_6_8',
-        // We stop here because we try to math out the version for anything greater than 10, and it
-        // works. Those versions are standardized using a calculation now.
-    },
-    win32: {
-        '6.3.9600': 'Windows 8.1',
-        '6.2.9200': 'Windows 8',
-        '6.1.7601': 'Windows 7 SP1',
-        '6.1.7600': 'Windows 7',
-        '6.0.6002': 'Windows Vista SP2',
-        '6.0.6000': 'Windows Vista',
-        '5.1.2600': 'Windows XP',
-    },
-};
-/**
- * Build a fake User Agent string. This gets sent to Analytics so it shows the proper OS version.
- * @private
- */
-function _buildUserAgentString() {
-    switch (os.platform()) {
-        case 'darwin': {
-            let v = osVersionMap.darwin[os.release()];
-            if (!v) {
-                // Remove 4 to tie Darwin version to OSX version, add other info.
-                const x = parseFloat(os.release());
-                if (x > 10) {
-                    v = `10_` + (x - 4).toString().replace('.', '_');
-                }
-            }
-            const cpuModel = os.cpus()[0].model.match(/^[a-z]+/i);
-            const cpu = cpuModel ? cpuModel[0] : os.cpus()[0].model;
-            return `(Macintosh; ${cpu} Mac OS X ${v || os.release()})`;
-        }
-        case 'win32':
-            return `(Windows NT ${os.release()})`;
-        case 'linux':
-            return `(X11; Linux i686; ${os.release()}; ${os.cpus()[0].model})`;
-        default:
-            return os.platform() + ' ' + os.release();
-    }
-}
-/**
- * Get a language code.
- * @private
- */
-function _getLanguage() {
-    // Note: Windows does not expose the configured language by default.
-    return (process.env.LANG || // Default Unix env variable.
-        process.env.LC_CTYPE || // For C libraries. Sometimes the above isn't set.
-        process.env.LANGSPEC || // For Windows, sometimes this will be set (not always).
-        _getWindowsLanguageCode() ||
-        '??'); // ¯\_(ツ)_/¯
-}
-/**
- * Attempt to get the Windows Language Code string.
- * @private
- */
-function _getWindowsLanguageCode() {
-    if (!os.platform().startsWith('win')) {
-        return undefined;
-    }
-    try {
-        // This is true on Windows XP, 7, 8 and 10 AFAIK. Would return empty string or fail if it
-        // doesn't work.
-        return (0, child_process_1.execSync)('wmic.exe os get locale').toString().trim();
-    }
-    catch { }
-    return undefined;
-}