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

package/bin/postinstall/analytics-prompt.js

@@ -17,10 +17,10 @@ try {
   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/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": {
@@ -1524,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": {
@@ -2183,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",

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];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.5",
+  "version": "14.0.0-next.6",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,21 +28,21 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.5",
-    "@angular-devkit/core": "14.0.0-next.5",
-    "@angular-devkit/schematics": "14.0.0-next.5",
-    "@schematics/angular": "14.0.0-next.5",
+    "@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.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.3",
+    "pacote": "13.0.5",
     "resolve": "1.22.0",
     "semver": "7.3.5",
     "symbol-observable": "4.0.0",
@@ -52,12 +52,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-next.5",
-      "@angular-devkit/architect": "0.1400.0-next.5",
-      "@angular-devkit/build-angular": "14.0.0-next.5",
-      "@angular-devkit/build-webpack": "0.1400.0-next.5",
-      "@angular-devkit/core": "14.0.0-next.5",
-      "@angular-devkit/schematics": "14.0.0-next.5"
+      "@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": {

package/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];

package/{models/interface.js → src/analytics/analytics-environment-options.d.ts}

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -6,4 +5,5 @@
  * 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 });
+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

@@ -19,42 +19,29 @@ 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 level Which config to use. "global" for user-level, and "local" for project-level.
+ * @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(level: 'global' | 'local', value: string | boolean): void;
+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 promptGlobalAnalytics(force?: boolean): Promise<boolean>;
+export declare function promptAnalytics(global: boolean, force?: boolean): Promise<boolean>;
 /**
- * Prompt the user for usage gathering permission for the local project. Fails if there is no
- * local workspace.
- * @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 promptProjectAnalytics(force?: boolean): Promise<boolean>;
-export declare function hasGlobalAnalyticsConfiguration(): Promise<boolean>;
-/**
- * Get the global analytics object for the user. This returns an instance of UniversalAnalytics,
- * or undefined if analytics are disabled.
- *
- * If any problem happens, it is considered the user has been opting out of analytics.
- */
-export declare function getGlobalAnalytics(): Promise<AnalyticsCollector | undefined>;
-export declare function hasWorkspaceAnalyticsConfiguration(): Promise<boolean>;
-/**
- * Get the workspace analytics object for the user. This returns an instance of AnalyticsCollector,
- * or undefined if analytics are disabled.
+ * Get the analytics object for the user.
  *
- * If any problem happens, it is considered the user has been opting out of analytics.
+ * @returns
+ * - `AnalyticsCollector` when enabled.
+ * - `analytics.NoopAnalytics` when disabled.
+ * - `undefined` when not configured.
  */
-export declare function getWorkspaceAnalytics(): Promise<AnalyticsCollector | undefined>;
+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>;

package/src/analytics/analytics.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];
@@ -29,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAnalytics = exports.getSharedAnalytics = exports.getWorkspaceAnalytics = exports.hasWorkspaceAnalyticsConfiguration = exports.getGlobalAnalytics = exports.hasGlobalAnalyticsConfiguration = exports.promptProjectAnalytics = exports.promptGlobalAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = exports.AnalyticsProperties = void 0;
+exports.getAnalyticsInfoString = exports.createAnalytics = exports.getSharedAnalytics = exports.getAnalytics = exports.promptAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = exports.AnalyticsProperties = void 0;
 const core_1 = require("@angular-devkit/core");
 const debug_1 = __importDefault(require("debug"));
 const inquirer = __importStar(require("inquirer"));
@@ -39,6 +43,7 @@ const config_1 = require("../utilities/config");
 const tty_1 = require("../utilities/tty");
 const version_1 = require("../utilities/version");
 const analytics_collector_1 = require("./analytics-collector");
+const analytics_environment_options_1 = require("./analytics-environment-options");
 /* eslint-disable no-console */
 const analyticsDebug = (0, debug_1.default)('ng:analytics'); // Generate analytics, including settings and users.
 let _defaultAngularCliPropertyCache;
@@ -51,12 +56,10 @@ exports.AnalyticsProperties = {
         }
         const v = version_1.VERSION.full;
         // The logic is if it's a full version then we should use the prod GA property.
-        if (/^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0') {
-            _defaultAngularCliPropertyCache = exports.AnalyticsProperties.AngularCliProd;
-        }
-        else {
-            _defaultAngularCliPropertyCache = exports.AnalyticsProperties.AngularCliStaging;
-        }
+        _defaultAngularCliPropertyCache =
+            /^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0'
+                ? exports.AnalyticsProperties.AngularCliProd
+                : exports.AnalyticsProperties.AngularCliStaging;
         return _defaultAngularCliPropertyCache;
     },
 };
@@ -82,10 +85,11 @@ function isPackageNameSafeForAnalytics(name) {
 exports.isPackageNameSafeForAnalytics = isPackageNameSafeForAnalytics;
 /**
  * Set analytics settings. This does not work if the user is not inside a project.
- * @param level Which config to use. "global" for user-level, and "local" for project-level.
+ * @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.
  */
-function setAnalyticsConfig(level, value) {
+function setAnalyticsConfig(global, value) {
+    const level = global ? 'global' : 'local';
     analyticsDebug('setting %s level analytics to: %s', level, value);
     const [config, configPath] = (0, config_1.getWorkspaceRaw)(level);
     if (!config || !configPath) {
@@ -108,61 +112,12 @@ 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 promptGlobalAnalytics(force = false) {
-    analyticsDebug('prompting global analytics.');
-    if (force || (0, tty_1.isTTY)()) {
-        const answers = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'analytics',
-                message: core_1.tags.stripIndents `
-          Would you like to share anonymous usage data 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,
-            },
-        ]);
-        setAnalyticsConfig('global', answers.analytics);
-        if (answers.analytics) {
-            console.log('');
-            console.log(core_1.tags.stripIndent `
-        Thank you for sharing anonymous usage data. If you change your mind, the following
-        command will disable this feature entirely:
-
-            ${color_1.colors.yellow('ng analytics off')}
-      `);
-            console.log('');
-            // Send back a ping with the user `optin`.
-            const ua = new analytics_collector_1.AnalyticsCollector(exports.AnalyticsProperties.AngularCliDefault, 'optin');
-            ua.pageview('/telemetry/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/optout');
-            await ua.flush();
-        }
-        return true;
-    }
-    else {
-        analyticsDebug('Either STDOUT or STDIN are not TTY and we skipped the prompt.');
-    }
-    return false;
-}
-exports.promptGlobalAnalytics = promptGlobalAnalytics;
-/**
- * Prompt the user for usage gathering permission for the local project. Fails if there is no
- * local workspace.
- * @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 promptProjectAnalytics(force = false) {
+async function promptAnalytics(global, force = false) {
     analyticsDebug('prompting user');
-    const [config, configPath] = (0, config_1.getWorkspaceRaw)('local');
+    const level = global ? 'global' : 'local';
+    const [config, configPath] = (0, config_1.getWorkspaceRaw)(level);
     if (!config || !configPath) {
-        throw new Error(`Could not find a local workspace. Are you in a project?`);
+        throw new Error(`Could not find a ${level} workspace. Are you in a project?`);
     }
     if (force || (0, tty_1.isTTY)()) {
         const answers = await inquirer.prompt([
@@ -171,21 +126,21 @@ async function promptProjectAnalytics(force = false) {
                 name: 'analytics',
                 message: core_1.tags.stripIndents `
           Would you like to share anonymous usage data about this project with the Angular Team at
-          Google under Google’s Privacy Policy at https://policies.google.com/privacy? For more
+          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,
             },
         ]);
-        setAnalyticsConfig('local', answers.analytics);
+        setAnalyticsConfig(global, answers.analytics);
         if (answers.analytics) {
             console.log('');
             console.log(core_1.tags.stripIndent `
         Thank you for sharing anonymous usage data. Should you change your mind, the following
         command will disable this feature entirely:
 
-            ${color_1.colors.yellow('ng analytics project off')}
+            ${color_1.colors.yellow(`ng analytics disable${global ? ' --global' : ''}`)}
       `);
             console.log('');
             // Send back a ping with the user `optin`.
@@ -199,109 +154,34 @@ async function promptProjectAnalytics(force = false) {
             ua.pageview('/telemetry/project/optout');
             await ua.flush();
         }
+        process.stderr.write(await getAnalyticsInfoString());
         return true;
     }
     return false;
 }
-exports.promptProjectAnalytics = promptProjectAnalytics;
-async function hasGlobalAnalyticsConfiguration() {
-    try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('global');
-        const analyticsConfig = globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
-        if (analyticsConfig !== null && analyticsConfig !== undefined) {
-            return true;
-        }
-    }
-    catch { }
-    return false;
-}
-exports.hasGlobalAnalyticsConfiguration = hasGlobalAnalyticsConfiguration;
+exports.promptAnalytics = promptAnalytics;
 /**
- * Get the global analytics object for the user. This returns an instance of UniversalAnalytics,
- * or undefined if analytics are disabled.
+ * Get the analytics object for the user.
  *
- * If any problem happens, it is considered the user has been opting out of analytics.
+ * @returns
+ * - `AnalyticsCollector` when enabled.
+ * - `analytics.NoopAnalytics` when disabled.
+ * - `undefined` when not configured.
  */
-async function getGlobalAnalytics() {
-    analyticsDebug('getGlobalAnalytics');
-    const propertyId = exports.AnalyticsProperties.AngularCliDefault;
-    if ('NG_CLI_ANALYTICS' in process.env) {
-        if (process.env['NG_CLI_ANALYTICS'] == 'false' || process.env['NG_CLI_ANALYTICS'] == '') {
-            analyticsDebug('NG_CLI_ANALYTICS is false');
-            return undefined;
-        }
-        if (process.env['NG_CLI_ANALYTICS'] === 'ci') {
-            analyticsDebug('Running in CI mode');
-            return new analytics_collector_1.AnalyticsCollector(propertyId, 'ci');
-        }
-    }
-    // If anything happens we just keep the NOOP analytics.
-    try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('global');
-        const analyticsConfig = globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
-        analyticsDebug('Client Analytics config found: %j', analyticsConfig);
-        if (analyticsConfig === false) {
-            analyticsDebug('Analytics disabled. Ignoring all analytics.');
-            return undefined;
-        }
-        else if (analyticsConfig === undefined || analyticsConfig === null) {
-            analyticsDebug('Analytics settings not found. Ignoring all analytics.');
-            // globalWorkspace can be null if there is no file. analyticsConfig would be null in this
-            // case. Since there is no file, the user hasn't answered and the expected return value is
-            // undefined.
-            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(propertyId, uid);
-        }
-    }
-    catch (err) {
-        analyticsDebug('Error happened during reading of analytics config: %s', err.message);
-        return undefined;
+async function getAnalytics(level) {
+    analyticsDebug('getAnalytics');
+    if (analytics_environment_options_1.analyticsDisabled) {
+        analyticsDebug('NG_CLI_ANALYTICS is false');
+        return new core_1.analytics.NoopAnalytics();
     }
-}
-exports.getGlobalAnalytics = getGlobalAnalytics;
-async function hasWorkspaceAnalyticsConfiguration() {
     try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('local');
-        const analyticsConfig = globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
-        if (analyticsConfig !== undefined) {
-            return true;
-        }
-    }
-    catch { }
-    return false;
-}
-exports.hasWorkspaceAnalyticsConfiguration = hasWorkspaceAnalyticsConfiguration;
-/**
- * Get the workspace analytics object for the user. This returns an instance of AnalyticsCollector,
- * or undefined if analytics are disabled.
- *
- * If any problem happens, it is considered the user has been opting out of analytics.
- */
-async function getWorkspaceAnalytics() {
-    analyticsDebug('getWorkspaceAnalytics');
-    try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('local');
-        const analyticsConfig = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.getCli()['analytics'];
+        const workspace = await (0, config_1.getWorkspace)(level);
+        const analyticsConfig = workspace === null || workspace === void 0 ? void 0 : workspace.getCli()['analytics'];
         analyticsDebug('Workspace Analytics config found: %j', analyticsConfig);
         if (analyticsConfig === false) {
-            analyticsDebug('Analytics disabled. Ignoring all analytics.');
-            return undefined;
+            return new core_1.analytics.NoopAnalytics();
         }
         else if (analyticsConfig === undefined || analyticsConfig === null) {
-            analyticsDebug('Analytics settings not found. Ignoring all analytics.');
             return undefined;
         }
         else {
@@ -324,19 +204,16 @@ async function getWorkspaceAnalytics() {
         return undefined;
     }
 }
-exports.getWorkspaceAnalytics = getWorkspaceAnalytics;
+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() {
     analyticsDebug('getSharedAnalytics');
-    const envVarName = 'NG_CLI_ANALYTICS_SHARE';
-    if (envVarName in process.env) {
-        if (process.env[envVarName] == 'false' || process.env[envVarName] == '') {
-            analyticsDebug('NG_CLI_ANALYTICS is false');
-            return undefined;
-        }
+    if (analytics_environment_options_1.analyticsShareDisabled) {
+        analyticsDebug('NG_CLI_ANALYTICS is false');
+        return undefined;
     }
     // If anything happens we just keep the NOOP analytics.
     try {
@@ -357,33 +234,70 @@ async function getSharedAnalytics() {
 }
 exports.getSharedAnalytics = getSharedAnalytics;
 async function createAnalytics(workspace, skipPrompt = false) {
-    let config = await getGlobalAnalytics();
-    // If in workspace and global analytics is enabled, defer to workspace level
-    if (workspace && config) {
-        const skipAnalytics = skipPrompt ||
-            (process.env['NG_CLI_ANALYTICS'] &&
-                (process.env['NG_CLI_ANALYTICS'].toLowerCase() === 'false' ||
-                    process.env['NG_CLI_ANALYTICS'] === '0'));
-        // 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.
-        if (!skipAnalytics && !(await hasWorkspaceAnalyticsConfiguration())) {
-            await promptProjectAnalytics();
+    // 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;
+    }
+    let config = globalConfig;
+    // Not disabled globally, check locally.
+    if (workspace) {
+        let localConfig = await getAnalytics('local');
+        if (localConfig === undefined) {
+            if (!skipPrompt) {
+                // local is not 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(false);
+                localConfig = await getAnalytics('local');
+            }
+        }
+        if (localConfig instanceof core_1.analytics.NoopAnalytics) {
+            return localConfig;
+        }
+        else if (localConfig) {
+            // Favor local settings over global when defined.
+            config = localConfig;
         }
-        config = await getWorkspaceAnalytics();
     }
+    // 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]);
     }
-    else if (config) {
-        return config;
+    return (_a = config !== null && config !== void 0 ? config : maybeSharedAnalytics) !== null && _a !== void 0 ? _a : new core_1.analytics.NoopAnalytics();
+}
+exports.createAnalytics = createAnalytics;
+function analyticsConfigValueToHumanFormat(value) {
+    if (value === false) {
+        return 'disabled';
     }
-    else if (maybeSharedAnalytics) {
-        return maybeSharedAnalytics;
+    else if (typeof value === 'string' || value === true) {
+        return 'enabled';
     }
     else {
-        return new core_1.analytics.NoopAnalytics();
+        return 'not set';
     }
 }
-exports.createAnalytics = createAnalytics;
+async function getAnalyticsInfoString() {
+    const [globalWorkspace] = (0, config_1.getWorkspaceRaw)('global');
+    const [localWorkspace] = (0, config_1.getWorkspaceRaw)('local');
+    const globalSetting = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.get(['cli', 'analytics']);
+    const localSetting = localWorkspace === null || localWorkspace === void 0 ? void 0 : localWorkspace.get(['cli', 'analytics']);
+    const analyticsInstance = await createAnalytics(!!localWorkspace /** workspace */, true /** skipPrompt */);
+    return (core_1.tags.stripIndents `
+    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');
+}
+exports.getAnalyticsInfoString = getAnalyticsInfoString;

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

@@ -14,7 +14,6 @@ const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const analytics_1 = require("../analytics/analytics");
-const package_manager_1 = require("../utilities/package-manager");
 const command_module_1 = require("./command-module");
 const json_schema_1 = require("./utilities/json-schema");
 class ArchitectBaseCommandModule extends command_module_1.CommandModule {
@@ -74,14 +73,14 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
         }
         catch (e) {
             if (e.code === 'MODULE_NOT_FOUND') {
-                await this.warnOnMissingNodeModules();
+                this.warnOnMissingNodeModules();
                 throw new command_module_1.CommandModuleError(`Could not find the '${builderConf}' builder's node package.`);
             }
             throw e;
         }
         return (0, json_schema_1.parseJsonSchemaToOptions)(new core_1.json.schema.CoreSchemaRegistry(), builderDesc.optionSchema, true);
     }
-    async warnOnMissingNodeModules() {
+    warnOnMissingNodeModules() {
         var _a;
         const basePath = (_a = this.context.workspace) === null || _a === void 0 ? void 0 : _a.basePath;
         if (!basePath) {
@@ -97,8 +96,7 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
             (0, fs_1.existsSync)((0, path_1.resolve)(basePath, '.pnp.mjs'))) {
             return;
         }
-        const packageManager = await (0, package_manager_1.getPackageManager)(basePath);
-        this.context.logger.warn(`Node packages may not be installed. Try installing with '${packageManager} install'.`);
+        this.context.logger.warn(`Node packages may not be installed. Try installing with '${this.context.packageManager} install'.`);
     }
 }
 exports.ArchitectBaseCommandModule = ArchitectBaseCommandModule;