@angular/cli 15.0.0-next.5 → 15.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "15.0.0-next.5",
+  "version": "15.0.0-rc.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,20 +25,20 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1500.0-next.5",
-    "@angular-devkit/core": "15.0.0-next.5",
-    "@angular-devkit/schematics": "15.0.0-next.5",
-    "@schematics/angular": "15.0.0-next.5",
+    "@angular-devkit/architect": "0.1500.0-rc.0",
+    "@angular-devkit/core": "15.0.0-rc.0",
+    "@angular-devkit/schematics": "15.0.0-rc.0",
+    "@schematics/angular": "15.0.0-rc.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "ini": "3.0.1",
     "inquirer": "8.2.4",
     "jsonc-parser": "3.2.0",
     "npm-package-arg": "9.1.2",
-    "npm-pick-manifest": "7.0.2",
+    "npm-pick-manifest": "8.0.0",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "14.0.0",
+    "pacote": "15.0.0",
     "resolve": "1.22.1",
     "semver": "7.3.8",
     "symbol-observable": "4.0.0",
@@ -47,12 +47,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "15.0.0-next.5",
-      "@angular-devkit/architect": "0.1500.0-next.5",
-      "@angular-devkit/build-angular": "15.0.0-next.5",
-      "@angular-devkit/build-webpack": "0.1500.0-next.5",
-      "@angular-devkit/core": "15.0.0-next.5",
-      "@angular-devkit/schematics": "15.0.0-next.5"
+      "@angular/cli": "15.0.0-rc.0",
+      "@angular-devkit/architect": "0.1500.0-rc.0",
+      "@angular-devkit/build-angular": "15.0.0-rc.0",
+      "@angular-devkit/build-webpack": "0.1500.0-rc.0",
+      "@angular-devkit/core": "15.0.0-rc.0",
+      "@angular-devkit/schematics": "15.0.0-rc.0"
     }
   },
   "engines": {

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

@@ -13,6 +13,7 @@ export declare class AnalyticsCollector {
     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;

package/src/analytics/analytics-collector.js

@@ -67,6 +67,8 @@ class AnalyticsCollector {
             // 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,
@@ -78,6 +80,9 @@ class AnalyticsCollector {
             [analytics_parameters_1.UserCustomDimension.AngularCLIMajorVersion]: version_1.VERSION.major,
         };
     }
+    reportWorkspaceInfoEvent(parameters) {
+        this.event('workspace_info', parameters);
+    }
     reportRebuildRunEvent(parameters) {
         this.event('run_rebuild', parameters);
     }

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

@@ -45,6 +45,7 @@ export declare enum RequestParameter {
  * @see https://support.google.com/analytics/answer/10075209?hl=en
  */
 export declare enum UserCustomDimension {
+    UserId = "up.ng_user_id",
     OsArchitecture = "up.ng_os_architecture",
     NodeVersion = "up.ng_node_version",
     NodeMajorVersion = "upn.ng_node_major_version",
@@ -91,5 +92,8 @@ export declare enum EventCustomMetric {
     DurationInMs = "epn.ng_duration_ms",
     CssSizeInBytes = "epn.ng_css_size_bytes",
     JsSizeInBytes = "epn.ng_js_size_bytes",
-    NgComponentCount = "epn.ng_component_count"
+    NgComponentCount = "epn.ng_component_count",
+    AllProjectsCount = "epn.all_projects_count",
+    LibraryProjectsCount = "epn.libs_projects_count",
+    ApplicationProjectsCount = "epn.apps_projects_count"
 }

package/src/analytics/analytics-parameters.js

@@ -49,6 +49,7 @@ var RequestParameter;
  */
 var UserCustomDimension;
 (function (UserCustomDimension) {
+    UserCustomDimension["UserId"] = "up.ng_user_id";
     UserCustomDimension["OsArchitecture"] = "up.ng_os_architecture";
     UserCustomDimension["NodeVersion"] = "up.ng_node_version";
     UserCustomDimension["NodeMajorVersion"] = "upn.ng_node_major_version";
@@ -98,4 +99,7 @@ var EventCustomMetric;
     EventCustomMetric["CssSizeInBytes"] = "epn.ng_css_size_bytes";
     EventCustomMetric["JsSizeInBytes"] = "epn.ng_js_size_bytes";
     EventCustomMetric["NgComponentCount"] = "epn.ng_component_count";
+    EventCustomMetric["AllProjectsCount"] = "epn.all_projects_count";
+    EventCustomMetric["LibraryProjectsCount"] = "epn.libs_projects_count";
+    EventCustomMetric["ApplicationProjectsCount"] = "epn.apps_projects_count";
 })(EventCustomMetric = exports.EventCustomMetric || (exports.EventCustomMetric = {}));

package/src/analytics/analytics.js

@@ -185,7 +185,7 @@ async function getAnalyticsUserId(context, skipPrompt = false) {
             return localOrGlobalConfig;
         }
     }
-    return globalConfig || (0, crypto_1.randomUUID)();
+    return globalConfig;
 }
 exports.getAnalyticsUserId = getAnalyticsUserId;
 function analyticsConfigValueToHumanFormat(value) {

package/src/command-builder/command-module.d.ts

@@ -90,6 +90,8 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
      * flush and call flush one last time.
      */
     protected getAnalyticsParameters(options: (Options<T> & OtherOptions) | OtherOptions): Partial<Record<EventCustomDimension | EventCustomMetric, string | boolean | number>>;
+    private reportCommandRunAnalytics;
+    private reportWorkspaceInfoAnalytics;
 }
 /**
  * Creates an known command module error.

package/src/command-builder/command-module.js

@@ -108,20 +108,9 @@ class CommandModule {
         const stopPeriodicFlushes = analytics && analytics.periodFlush();
         let exitCode;
         try {
-            // Run and time command.
             if (analytics) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const internalMethods = yargs_1.default.getInternalMethods();
-                // $0 generate component [name] -> generate_component
-                // $0 add <collection> -> add
-                const fullCommand = internalMethods.getUsageInstance().getUsage()[0][0]
-                    .split(' ')
-                    .filter((x) => {
-                    const code = x.charCodeAt(0);
-                    return code >= 97 && code <= 122;
-                })
-                    .join('_');
-                analytics.reportCommandRunEvent(fullCommand);
+                this.reportCommandRunAnalytics(analytics);
+                this.reportWorkspaceInfoAnalytics(analytics);
             }
             exitCode = await this.run(camelCasedOptions);
         }
@@ -231,6 +220,43 @@ class CommandModule {
         }
         return parameters;
     }
+    reportCommandRunAnalytics(analytics) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const internalMethods = yargs_1.default.getInternalMethods();
+        // $0 generate component [name] -> generate_component
+        // $0 add <collection> -> add
+        const fullCommand = internalMethods.getUsageInstance().getUsage()[0][0]
+            .split(' ')
+            .filter((x) => {
+            const code = x.charCodeAt(0);
+            return code >= 97 && code <= 122;
+        })
+            .join('_');
+        analytics.reportCommandRunEvent(fullCommand);
+    }
+    reportWorkspaceInfoAnalytics(analytics) {
+        const { workspace } = this.context;
+        if (!workspace) {
+            return;
+        }
+        let applicationProjectsCount = 0;
+        let librariesProjectsCount = 0;
+        for (const project of workspace.projects.values()) {
+            switch (project.extensions['projectType']) {
+                case 'application':
+                    applicationProjectsCount++;
+                    break;
+                case 'library':
+                    librariesProjectsCount++;
+                    break;
+            }
+        }
+        analytics.reportWorkspaceInfoEvent({
+            [analytics_parameters_1.EventCustomMetric.AllProjectsCount]: librariesProjectsCount + applicationProjectsCount,
+            [analytics_parameters_1.EventCustomMetric.ApplicationProjectsCount]: applicationProjectsCount,
+            [analytics_parameters_1.EventCustomMetric.LibraryProjectsCount]: librariesProjectsCount,
+        });
+    }
 }
 __decorate([
     memoize_1.memoize