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

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

@@ -0,0 +1,99 @@
+/**
+ * @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 type PrimitiveTypes = string | number | boolean;
+/**
+ * GA built-in request parameters
+ * @see https://www.thyngster.com/ga4-measurement-protocol-cheatsheet
+ * @see http://go/depot/google3/analytics/container_tag/templates/common/gold/mpv2_schema.js
+ */
+export declare enum RequestParameter {
+    ClientId = "cid",
+    DebugView = "_dbg",
+    GtmVersion = "gtm",
+    Language = "ul",
+    NewToSite = "_nsi",
+    NonInteraction = "ni",
+    PageLocation = "dl",
+    PageTitle = "dt",
+    ProtocolVersion = "v",
+    SessionEngaged = "seg",
+    SessionId = "sid",
+    SessionNumber = "sct",
+    SessionStart = "_ss",
+    TrackingId = "tid",
+    TrafficType = "tt",
+    UserAgentArchitecture = "uaa",
+    UserAgentBitness = "uab",
+    UserAgentFullVersionList = "uafvl",
+    UserAgentMobile = "uamb",
+    UserAgentModel = "uam",
+    UserAgentPlatform = "uap",
+    UserAgentPlatformVersion = "uapv",
+    UserId = "uid"
+}
+/**
+ * User scoped custom dimensions.
+ * @notes
+ * - User custom dimensions limit is 25.
+ * - `up.*` string type.
+ * - `upn.*` number type.
+ * @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",
+    AngularCLIVersion = "up.ng_cli_version",
+    AngularCLIMajorVersion = "upn.ng_cli_major_version",
+    PackageManager = "up.ng_package_manager",
+    PackageManagerVersion = "up.ng_pkg_manager_version",
+    PackageManagerMajorVersion = "upn.ng_pkg_manager_major_v"
+}
+/**
+ * Event scoped custom dimensions.
+ * @notes
+ * - Event custom dimensions limit is 50.
+ * - `ep.*` string type.
+ * - `epn.*` number type.
+ * @see https://support.google.com/analytics/answer/10075209?hl=en
+ */
+export declare enum EventCustomDimension {
+    Command = "ep.ng_command",
+    SchematicCollectionName = "ep.ng_schematic_collection_name",
+    SchematicName = "ep.ng_schematic_name",
+    Standalone = "ep.ng_standalone",
+    Style = "ep.ng_style",
+    Routing = "ep.ng_routing",
+    InlineTemplate = "ep.ng_inline_template",
+    InlineStyle = "ep.ng_inline_style",
+    BuilderTarget = "ep.ng_builder_target",
+    Aot = "ep.ng_aot",
+    Optimization = "ep.ng_optimization"
+}
+/**
+ * Event scoped custom mertics.
+ * @notes
+ * - Event scoped custom mertics limit is 50.
+ * - `ep.*` string type.
+ * - `epn.*` number type.
+ * @see https://support.google.com/analytics/answer/10075209?hl=en
+ */
+export declare enum EventCustomMetric {
+    AllChunksCount = "epn.ng_all_chunks_count",
+    LazyChunksCount = "epn.ng_lazy_chunks_count",
+    InitialChunksCount = "epn.ng_initial_chunks_count",
+    ChangedChunksCount = "epn.ng_changed_chunks_count",
+    DurationInMs = "epn.ng_duration_ms",
+    CssSizeInBytes = "epn.ng_css_size_bytes",
+    JsSizeInBytes = "epn.ng_js_size_bytes",
+    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

@@ -0,0 +1,105 @@
+"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.EventCustomMetric = exports.EventCustomDimension = exports.UserCustomDimension = exports.RequestParameter = void 0;
+/**
+ * GA built-in request parameters
+ * @see https://www.thyngster.com/ga4-measurement-protocol-cheatsheet
+ * @see http://go/depot/google3/analytics/container_tag/templates/common/gold/mpv2_schema.js
+ */
+var RequestParameter;
+(function (RequestParameter) {
+    RequestParameter["ClientId"] = "cid";
+    RequestParameter["DebugView"] = "_dbg";
+    RequestParameter["GtmVersion"] = "gtm";
+    RequestParameter["Language"] = "ul";
+    RequestParameter["NewToSite"] = "_nsi";
+    RequestParameter["NonInteraction"] = "ni";
+    RequestParameter["PageLocation"] = "dl";
+    RequestParameter["PageTitle"] = "dt";
+    RequestParameter["ProtocolVersion"] = "v";
+    RequestParameter["SessionEngaged"] = "seg";
+    RequestParameter["SessionId"] = "sid";
+    RequestParameter["SessionNumber"] = "sct";
+    RequestParameter["SessionStart"] = "_ss";
+    RequestParameter["TrackingId"] = "tid";
+    RequestParameter["TrafficType"] = "tt";
+    RequestParameter["UserAgentArchitecture"] = "uaa";
+    RequestParameter["UserAgentBitness"] = "uab";
+    RequestParameter["UserAgentFullVersionList"] = "uafvl";
+    RequestParameter["UserAgentMobile"] = "uamb";
+    RequestParameter["UserAgentModel"] = "uam";
+    RequestParameter["UserAgentPlatform"] = "uap";
+    RequestParameter["UserAgentPlatformVersion"] = "uapv";
+    RequestParameter["UserId"] = "uid";
+})(RequestParameter = exports.RequestParameter || (exports.RequestParameter = {}));
+/**
+ * User scoped custom dimensions.
+ * @notes
+ * - User custom dimensions limit is 25.
+ * - `up.*` string type.
+ * - `upn.*` number type.
+ * @see https://support.google.com/analytics/answer/10075209?hl=en
+ */
+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";
+    UserCustomDimension["AngularCLIVersion"] = "up.ng_cli_version";
+    UserCustomDimension["AngularCLIMajorVersion"] = "upn.ng_cli_major_version";
+    UserCustomDimension["PackageManager"] = "up.ng_package_manager";
+    UserCustomDimension["PackageManagerVersion"] = "up.ng_pkg_manager_version";
+    UserCustomDimension["PackageManagerMajorVersion"] = "upn.ng_pkg_manager_major_v";
+})(UserCustomDimension = exports.UserCustomDimension || (exports.UserCustomDimension = {}));
+/**
+ * Event scoped custom dimensions.
+ * @notes
+ * - Event custom dimensions limit is 50.
+ * - `ep.*` string type.
+ * - `epn.*` number type.
+ * @see https://support.google.com/analytics/answer/10075209?hl=en
+ */
+var EventCustomDimension;
+(function (EventCustomDimension) {
+    EventCustomDimension["Command"] = "ep.ng_command";
+    EventCustomDimension["SchematicCollectionName"] = "ep.ng_schematic_collection_name";
+    EventCustomDimension["SchematicName"] = "ep.ng_schematic_name";
+    EventCustomDimension["Standalone"] = "ep.ng_standalone";
+    EventCustomDimension["Style"] = "ep.ng_style";
+    EventCustomDimension["Routing"] = "ep.ng_routing";
+    EventCustomDimension["InlineTemplate"] = "ep.ng_inline_template";
+    EventCustomDimension["InlineStyle"] = "ep.ng_inline_style";
+    EventCustomDimension["BuilderTarget"] = "ep.ng_builder_target";
+    EventCustomDimension["Aot"] = "ep.ng_aot";
+    EventCustomDimension["Optimization"] = "ep.ng_optimization";
+})(EventCustomDimension = exports.EventCustomDimension || (exports.EventCustomDimension = {}));
+/**
+ * Event scoped custom mertics.
+ * @notes
+ * - Event scoped custom mertics limit is 50.
+ * - `ep.*` string type.
+ * - `epn.*` number type.
+ * @see https://support.google.com/analytics/answer/10075209?hl=en
+ */
+var EventCustomMetric;
+(function (EventCustomMetric) {
+    EventCustomMetric["AllChunksCount"] = "epn.ng_all_chunks_count";
+    EventCustomMetric["LazyChunksCount"] = "epn.ng_lazy_chunks_count";
+    EventCustomMetric["InitialChunksCount"] = "epn.ng_initial_chunks_count";
+    EventCustomMetric["ChangedChunksCount"] = "epn.ng_changed_chunks_count";
+    EventCustomMetric["DurationInMs"] = "epn.ng_duration_ms";
+    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.d.ts

@@ -5,13 +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
  */
-import { analytics } from '@angular-devkit/core';
-import { AnalyticsCollector } from './analytics-collector';
-export declare const AnalyticsProperties: {
-    AngularCliProd: string;
-    AngularCliStaging: string;
-    readonly AngularCliDefault: string;
-};
+import type { CommandContext } from '../command-builder/command-module';
 /**
  * This is the ultimate safelist for checking if a package name is safe to report to analytics.
  */
@@ -28,20 +22,6 @@ export declare function setAnalyticsConfig(global: boolean, value: string | bool
  * @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>;
+export declare function promptAnalytics(context: CommandContext, global: boolean, force?: boolean): Promise<boolean>;
+export declare function getAnalyticsUserId(context: CommandContext, skipPrompt?: boolean): Promise<string | undefined>;
+export declare function getAnalyticsInfoString(context: CommandContext): Promise<string>;

package/src/analytics/analytics.js

@@ -29,47 +29,22 @@ 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.getAnalyticsInfoString = exports.createAnalytics = exports.getSharedAnalytics = exports.getAnalytics = exports.promptAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = exports.AnalyticsProperties = void 0;
+exports.getAnalyticsInfoString = exports.getAnalyticsUserId = exports.promptAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = void 0;
 const core_1 = require("@angular-devkit/core");
 const crypto_1 = require("crypto");
-const debug_1 = __importDefault(require("debug"));
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const environment_options_1 = require("../utilities/environment-options");
-const error_1 = require("../utilities/error");
 const tty_1 = require("../utilities/tty");
-const version_1 = require("../utilities/version");
-const analytics_collector_1 = require("./analytics-collector");
 /* eslint-disable no-console */
-const analyticsDebug = (0, debug_1.default)('ng:analytics'); // Generate analytics, including settings and users.
-let _defaultAngularCliPropertyCache;
-exports.AnalyticsProperties = {
-    AngularCliProd: 'UA-8594346-29',
-    AngularCliStaging: 'UA-8594346-32',
-    get AngularCliDefault() {
-        if (_defaultAngularCliPropertyCache) {
-            return _defaultAngularCliPropertyCache;
-        }
-        const v = version_1.VERSION.full;
-        // The logic is if it's a full version then we should use the prod GA property.
-        _defaultAngularCliPropertyCache =
-            /^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0'
-                ? exports.AnalyticsProperties.AngularCliProd
-                : exports.AnalyticsProperties.AngularCliStaging;
-        return _defaultAngularCliPropertyCache;
-    },
-};
 /**
  * This is the ultimate safelist for checking if a package name is safe to report to analytics.
  */
 exports.analyticsPackageSafelist = [
     /^@angular\//,
     /^@angular-devkit\//,
-    /^@ngtools\//,
+    /^@nguniversal\//,
     '@schematics/angular',
 ];
 function isPackageNameSafeForAnalytics(name) {
@@ -92,7 +67,6 @@ async function setAnalyticsConfig(global, value) {
     var _a;
     var _b;
     const level = global ? 'global' : 'local';
-    analyticsDebug('setting %s level analytics to: %s', level, value);
     const workspace = await (0, config_1.getWorkspace)(level);
     if (!workspace) {
         throw new Error(`Could not find ${level} workspace.`);
@@ -103,7 +77,6 @@ async function setAnalyticsConfig(global, value) {
     }
     cli.analytics = value === true ? (0, crypto_1.randomUUID)() : value;
     await workspace.save();
-    analyticsDebug('done');
 }
 exports.setAnalyticsConfig = setAnalyticsConfig;
 /**
@@ -111,8 +84,7 @@ exports.setAnalyticsConfig = setAnalyticsConfig;
  * @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.
  */
-async function promptAnalytics(global, force = false) {
-    analyticsDebug('prompting user');
+async function promptAnalytics(context, global, force = false) {
     const level = global ? 'global' : 'local';
     const workspace = await (0, config_1.getWorkspace)(level);
     if (!workspace) {
@@ -125,11 +97,11 @@ async function promptAnalytics(global, force = false) {
                 type: 'confirm',
                 name: 'analytics',
                 message: core_1.tags.stripIndents `
-          Would you like to share pseudonymous usage data about this project with the Angular Team
-          at Google under Google's Privacy Policy at https://policies.google.com/privacy. For more
-          details and how to change this setting, see https://angular.io/analytics.
+           Would you like to share pseudonymous usage data about this project with the Angular Team
+           at Google under Google's Privacy Policy at https://policies.google.com/privacy. For more
+           details and how to change this setting, see https://angular.io/analytics.
 
-        `,
+         `,
                 default: false,
             },
         ]);
@@ -137,149 +109,85 @@ async function promptAnalytics(global, force = false) {
         if (answers.analytics) {
             console.log('');
             console.log(core_1.tags.stripIndent `
-        Thank you for sharing pseudonymous usage data. Should you change your mind, the following
-        command will disable this feature entirely:
+         Thank you for sharing pseudonymous usage data. Should you change your mind, the following
+         command will disable this feature entirely:
 
-            ${color_1.colors.yellow(`ng analytics disable${global ? ' --global' : ''}`)}
-      `);
+             ${color_1.colors.yellow(`ng analytics disable${global ? ' --global' : ''}`)}
+       `);
             console.log('');
-            // Send back a ping with the user `optin`.
-            const ua = new analytics_collector_1.AnalyticsCollector(exports.AnalyticsProperties.AngularCliDefault, 'optin');
-            ua.pageview('/telemetry/project/optin');
-            await ua.flush();
-        }
-        else {
-            // Send back a ping with the user `optout`. This is the only thing we send.
-            const ua = new analytics_collector_1.AnalyticsCollector(exports.AnalyticsProperties.AngularCliDefault, 'optout');
-            ua.pageview('/telemetry/project/optout');
-            await ua.flush();
         }
-        process.stderr.write(await getAnalyticsInfoString());
+        process.stderr.write(await getAnalyticsInfoString(context));
         return true;
     }
     return false;
 }
 exports.promptAnalytics = promptAnalytics;
 /**
- * Get the analytics object for the user.
+ * Get the analytics user id.
  *
  * @returns
- * - `AnalyticsCollector` when enabled.
- * - `analytics.NoopAnalytics` when disabled.
+ * - `string` user id.
+ * - `false` when disabled.
  * - `undefined` when not configured.
  */
-async function getAnalytics(level) {
+async function getAnalyticsUserIdForLevel(level) {
     var _a;
-    analyticsDebug('getAnalytics');
     if (environment_options_1.analyticsDisabled) {
-        analyticsDebug('NG_CLI_ANALYTICS is false');
-        return new core_1.analytics.NoopAnalytics();
+        return false;
     }
-    try {
-        const workspace = await (0, config_1.getWorkspace)(level);
-        const analyticsConfig = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.getCli()) === null || _a === void 0 ? void 0 : _a['analytics'];
-        analyticsDebug('Workspace Analytics config found: %j', analyticsConfig);
-        if (analyticsConfig === false) {
-            return new core_1.analytics.NoopAnalytics();
-        }
-        else if (analyticsConfig === undefined || analyticsConfig === null) {
-            return undefined;
-        }
-        else {
-            let uid = undefined;
-            if (typeof analyticsConfig == 'string') {
-                uid = analyticsConfig;
-            }
-            else if (typeof analyticsConfig == 'object' && typeof analyticsConfig['uid'] == 'string') {
-                uid = analyticsConfig['uid'];
-            }
-            analyticsDebug('client id: %j', uid);
-            if (uid == undefined) {
-                return undefined;
-            }
-            return new analytics_collector_1.AnalyticsCollector(exports.AnalyticsProperties.AngularCliDefault, uid);
-        }
-    }
-    catch (err) {
-        (0, error_1.assertIsError)(err);
-        analyticsDebug('Error happened during reading of analytics config: %s', err.message);
-        return undefined;
+    const workspace = await (0, config_1.getWorkspace)(level);
+    const analyticsConfig = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.getCli()) === null || _a === void 0 ? void 0 : _a['analytics'];
+    if (analyticsConfig === false) {
+        return false;
     }
-}
-exports.getAnalytics = getAnalytics;
-/**
- * Return the usage analytics sharing setting, which is either a property string (GA-XXXXXXX-XX),
- * or undefined if no sharing.
- */
-async function getSharedAnalytics() {
-    var _a;
-    analyticsDebug('getSharedAnalytics');
-    if (environment_options_1.analyticsShareDisabled) {
-        analyticsDebug('NG_CLI_ANALYTICS is false');
+    else if (analyticsConfig === undefined || analyticsConfig === null) {
         return undefined;
     }
-    // If anything happens we just keep the NOOP analytics.
-    try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('global');
-        const analyticsConfig = (_a = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.getCli()) === null || _a === void 0 ? void 0 : _a['analyticsSharing'];
-        if (!analyticsConfig || !analyticsConfig.tracking || !analyticsConfig.uuid) {
-            return undefined;
+    else {
+        if (typeof analyticsConfig == 'string') {
+            return analyticsConfig;
         }
-        else {
-            analyticsDebug('Analytics sharing info: %j', analyticsConfig);
-            return new analytics_collector_1.AnalyticsCollector(analyticsConfig.tracking, analyticsConfig.uuid);
+        else if (typeof analyticsConfig == 'object' && typeof analyticsConfig['uid'] == 'string') {
+            return analyticsConfig['uid'];
         }
-    }
-    catch (err) {
-        (0, error_1.assertIsError)(err);
-        analyticsDebug('Error happened during reading of analytics sharing config: %s', err.message);
         return undefined;
     }
 }
-exports.getSharedAnalytics = getSharedAnalytics;
-async function createAnalytics(workspace, skipPrompt = false) {
+async function getAnalyticsUserId(context, skipPrompt = false) {
+    const { workspace } = context;
     // Global config takes precedence over local config only for the disabled check.
     // IE:
     // global: disabled & local: enabled = disabled
     // global: id: 123 & local: id: 456 = 456
-    var _a;
     // check global
-    const globalConfig = await getAnalytics('global');
-    if (globalConfig instanceof core_1.analytics.NoopAnalytics) {
-        return globalConfig;
+    const globalConfig = await getAnalyticsUserIdForLevel('global');
+    if (globalConfig === false) {
+        return undefined;
     }
-    let config = globalConfig;
     // Not disabled globally, check locally or not set globally and command is run outside of workspace example: `ng new`
     if (workspace || globalConfig === undefined) {
         const level = workspace ? 'local' : 'global';
-        let localOrGlobalConfig = await getAnalytics(level);
+        let localOrGlobalConfig = await getAnalyticsUserIdForLevel(level);
         if (localOrGlobalConfig === undefined) {
             if (!skipPrompt) {
                 // config is unset, prompt user.
                 // TODO: This should honor the `no-interactive` option.
                 // It is currently not an `ng` option but rather only an option for specific commands.
                 // The concept of `ng`-wide options are needed to cleanly handle this.
-                await promptAnalytics(!workspace /** global */);
-                localOrGlobalConfig = await getAnalytics(level);
+                await promptAnalytics(context, !workspace /** global */);
+                localOrGlobalConfig = await getAnalyticsUserIdForLevel(level);
             }
         }
-        if (localOrGlobalConfig instanceof core_1.analytics.NoopAnalytics) {
-            return localOrGlobalConfig;
+        if (localOrGlobalConfig === false) {
+            return undefined;
         }
-        else if (localOrGlobalConfig) {
-            // Favor local settings over global when defined.
-            config = localOrGlobalConfig;
+        else if (typeof localOrGlobalConfig === 'string') {
+            return localOrGlobalConfig;
         }
     }
-    // Get shared analytics
-    // TODO: evalute if this should be completly removed.
-    const maybeSharedAnalytics = await getSharedAnalytics();
-    if (config && maybeSharedAnalytics) {
-        return new core_1.analytics.MultiAnalytics([config, maybeSharedAnalytics]);
-    }
-    return (_a = config !== null && config !== void 0 ? config : maybeSharedAnalytics) !== null && _a !== void 0 ? _a : new core_1.analytics.NoopAnalytics();
+    return globalConfig;
 }
-exports.createAnalytics = createAnalytics;
+exports.getAnalyticsUserId = getAnalyticsUserId;
 function analyticsConfigValueToHumanFormat(value) {
     if (value === false) {
         return 'disabled';
@@ -291,19 +199,18 @@ function analyticsConfigValueToHumanFormat(value) {
         return 'not set';
     }
 }
-async function getAnalyticsInfoString() {
+async function getAnalyticsInfoString(context) {
     var _a, _b;
-    const globalWorkspace = await (0, config_1.getWorkspace)('global');
-    const localWorkspace = await (0, config_1.getWorkspace)('local');
-    const globalSetting = (_a = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.getCli()) === null || _a === void 0 ? void 0 : _a['analytics'];
+    const analyticsInstance = await getAnalyticsUserId(context, true /** skipPrompt */);
+    const { globalConfiguration, workspace: localWorkspace } = context;
+    const globalSetting = (_a = globalConfiguration === null || globalConfiguration === void 0 ? void 0 : globalConfiguration.getCli()) === null || _a === void 0 ? void 0 : _a['analytics'];
     const localSetting = (_b = localWorkspace === null || localWorkspace === void 0 ? void 0 : localWorkspace.getCli()) === null || _b === void 0 ? void 0 : _b['analytics'];
-    const analyticsInstance = await createAnalytics(!!localWorkspace /** workspace */, true /** skipPrompt */);
     return (core_1.tags.stripIndents `
-    Global setting: ${analyticsConfigValueToHumanFormat(globalSetting)}
-    Local setting: ${localWorkspace
+     Global setting: ${analyticsConfigValueToHumanFormat(globalSetting)}
+     Local setting: ${localWorkspace
         ? analyticsConfigValueToHumanFormat(localSetting)
         : 'No local workspace configuration file.'}
-    Effective status: ${analyticsInstance instanceof core_1.analytics.NoopAnalytics ? 'disabled' : 'enabled'}
-  ` + '\n');
+     Effective status: ${analyticsInstance ? 'enabled' : 'disabled'}
+   ` + '\n');
 }
 exports.getAnalyticsInfoString = getAnalyticsInfoString;

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

@@ -15,9 +15,9 @@ export interface MissingTargetChoice {
 }
 export declare abstract class ArchitectBaseCommandModule<T extends object> extends CommandModule<T> implements CommandModuleImplementation<T> {
     scope: CommandScope;
-    protected shouldReportAnalytics: boolean;
     protected readonly missingTargetChoices: MissingTargetChoice[] | undefined;
     protected runSingleTarget(target: Target, options: OtherOptions): Promise<number>;
+    private builderStatsToAnalyticsParameters;
     private _architectHost;
     protected getArchitectHost(): WorkspaceNodeModulesArchitectHost;
     private _architect;

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

@@ -15,6 +15,7 @@ const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const analytics_1 = require("../analytics/analytics");
+const analytics_parameters_1 = require("../analytics/analytics-parameters");
 const error_1 = require("../utilities/error");
 const prompt_1 = require("../utilities/prompt");
 const tty_1 = require("../utilities/tty");
@@ -24,7 +25,6 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
         this.scope = command_module_1.CommandScope.In;
-        this.shouldReportAnalytics = false;
     }
     async runSingleTarget(target, options) {
         const architectHost = await this.getArchitectHost();
@@ -36,21 +36,63 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
             (0, error_1.assertIsError)(e);
             return this.onMissingTarget(e.message);
         }
-        await this.reportAnalytics({
-            ...(await architectHost.getOptionsForTarget(target)),
-            ...options,
-        }, undefined /** paths */, undefined /** dimensions */, builderName);
         const { logger } = this.context;
         const run = await this.getArchitect().scheduleTarget(target, options, {
             logger,
-            analytics: (0, analytics_1.isPackageNameSafeForAnalytics)(builderName) ? await this.getAnalytics() : undefined,
         });
-        const { error, success } = await run.output.toPromise();
-        await run.stop();
-        if (error) {
-            logger.error(error);
+        const analytics = (0, analytics_1.isPackageNameSafeForAnalytics)(builderName)
+            ? await this.getAnalytics()
+            : undefined;
+        let outputSubscription;
+        if (analytics) {
+            analytics.reportArchitectRunEvent({
+                [analytics_parameters_1.EventCustomDimension.BuilderTarget]: builderName,
+            });
+            let firstRun = true;
+            outputSubscription = run.output.subscribe(({ stats }) => {
+                const parameters = this.builderStatsToAnalyticsParameters(stats, builderName);
+                if (!parameters) {
+                    return;
+                }
+                if (firstRun) {
+                    firstRun = false;
+                    analytics.reportBuildRunEvent(parameters);
+                }
+                else {
+                    analytics.reportRebuildRunEvent(parameters);
+                }
+            });
+        }
+        try {
+            const { error, success } = await run.output.toPromise();
+            if (error) {
+                logger.error(error);
+            }
+            return success ? 0 : 1;
         }
-        return success ? 0 : 1;
+        finally {
+            await run.stop();
+            outputSubscription === null || outputSubscription === void 0 ? void 0 : outputSubscription.unsubscribe();
+        }
+    }
+    builderStatsToAnalyticsParameters(stats, builderName) {
+        if (!stats || typeof stats !== 'object' || !('durationInMs' in stats)) {
+            return undefined;
+        }
+        const { optimization, allChunksCount, aot, lazyChunksCount, initialChunksCount, durationInMs, changedChunksCount, cssSizeInBytes, jsSizeInBytes, ngComponentCount, } = stats;
+        return {
+            [analytics_parameters_1.EventCustomDimension.BuilderTarget]: builderName,
+            [analytics_parameters_1.EventCustomDimension.Aot]: aot,
+            [analytics_parameters_1.EventCustomDimension.Optimization]: optimization,
+            [analytics_parameters_1.EventCustomMetric.AllChunksCount]: allChunksCount,
+            [analytics_parameters_1.EventCustomMetric.LazyChunksCount]: lazyChunksCount,
+            [analytics_parameters_1.EventCustomMetric.InitialChunksCount]: initialChunksCount,
+            [analytics_parameters_1.EventCustomMetric.ChangedChunksCount]: changedChunksCount,
+            [analytics_parameters_1.EventCustomMetric.DurationInMs]: durationInMs,
+            [analytics_parameters_1.EventCustomMetric.JsSizeInBytes]: jsSizeInBytes,
+            [analytics_parameters_1.EventCustomMetric.CssSizeInBytes]: cssSizeInBytes,
+            [analytics_parameters_1.EventCustomMetric.NgComponentCount]: ngComponentCount,
+        };
     }
     getArchitectHost() {
         if (this._architectHost) {