eas-cli 2.4.1 → 2.5.0

package/build/analytics/common.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withAnalyticsAsync = void 0;
-const events_1 = require("./events");
-async function withAnalyticsAsync(fn, analytics) {
+async function withAnalyticsAsync(analytics, fn, { attemptEvent, successEvent, failureEvent, properties, }) {
     try {
+        analytics.logEvent(attemptEvent, properties);
         const result = await fn();
-        events_1.Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
+        analytics.logEvent(successEvent, properties);
         return result;
     }
     catch (error) {
-        events_1.Analytics.logEvent(analytics.failureEvent, {
-            ...analytics.trackingCtx,
+        analytics.logEvent(failureEvent, {
+            ...properties,
             reason: error.message,
         });
         throw error;

package/build/build/build.js

@@ -7,8 +7,8 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const cli_progress_1 = tslib_1.__importDefault(require("cli-progress"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const common_1 = require("../analytics/common");
-const events_1 = require("../analytics/events");
 const api_1 = require("../api");
 const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
@@ -31,17 +31,17 @@ function resolveBuildParamsInput(ctx) {
 }
 async function prepareBuildRequestForPlatformAsync(builder) {
     const { ctx } = builder;
-    const credentialsResult = await (0, common_1.withAnalyticsAsync)(async () => await builder.ensureCredentialsAsync(ctx), {
-        attemptEvent: events_1.BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
-        successEvent: events_1.BuildEvent.GATHER_CREDENTIALS_SUCCESS,
-        failureEvent: events_1.BuildEvent.GATHER_CREDENTIALS_FAIL,
-        trackingCtx: ctx.trackingCtx,
+    const credentialsResult = await (0, common_1.withAnalyticsAsync)(ctx.analytics, async () => await builder.ensureCredentialsAsync(ctx), {
+        attemptEvent: AnalyticsManager_1.BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
+        successEvent: AnalyticsManager_1.BuildEvent.GATHER_CREDENTIALS_SUCCESS,
+        failureEvent: AnalyticsManager_1.BuildEvent.GATHER_CREDENTIALS_FAIL,
+        properties: ctx.analyticsEventProperties,
     });
-    await (0, common_1.withAnalyticsAsync)(async () => await builder.syncProjectConfigurationAsync(ctx), {
-        attemptEvent: events_1.BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-        successEvent: events_1.BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-        failureEvent: events_1.BuildEvent.CONFIGURE_PROJECT_FAIL,
-        trackingCtx: ctx.trackingCtx,
+    await (0, common_1.withAnalyticsAsync)(ctx.analytics, async () => await builder.syncProjectConfigurationAsync(ctx), {
+        attemptEvent: AnalyticsManager_1.BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+        successEvent: AnalyticsManager_1.BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+        failureEvent: AnalyticsManager_1.BuildEvent.CONFIGURE_PROJECT_FAIL,
+        properties: ctx.analyticsEventProperties,
     });
     if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
         log_1.default.addNewLineIfNone();
@@ -112,7 +112,7 @@ function handleBuildRequestError(error, platform) {
 async function uploadProjectAsync(ctx) {
     let projectTarballPath;
     try {
-        return await (0, common_1.withAnalyticsAsync)(async () => {
+        return await (0, common_1.withAnalyticsAsync)(ctx.analytics, async () => {
             log_1.default.newLine();
             log_1.default.log(`Compressing project files and uploading to EAS Build. ${(0, log_1.learnMore)('https://expo.fyi/eas-build-archive')}`);
             const projectTarball = await (0, repository_1.makeProjectTarballAsync)();
@@ -127,10 +127,10 @@ async function uploadProjectAsync(ctx) {
             }));
             return bucketKey;
         }, {
-            attemptEvent: events_1.BuildEvent.PROJECT_UPLOAD_ATTEMPT,
-            successEvent: events_1.BuildEvent.PROJECT_UPLOAD_SUCCESS,
-            failureEvent: events_1.BuildEvent.PROJECT_UPLOAD_FAIL,
-            trackingCtx: ctx.trackingCtx,
+            attemptEvent: AnalyticsManager_1.BuildEvent.PROJECT_UPLOAD_ATTEMPT,
+            successEvent: AnalyticsManager_1.BuildEvent.PROJECT_UPLOAD_SUCCESS,
+            failureEvent: AnalyticsManager_1.BuildEvent.PROJECT_UPLOAD_FAIL,
+            properties: ctx.analyticsEventProperties,
         });
     }
     finally {
@@ -141,7 +141,7 @@ async function uploadProjectAsync(ctx) {
 }
 async function sendBuildRequestAsync(builder, job, metadata, buildParams) {
     const { ctx } = builder;
-    return await (0, common_1.withAnalyticsAsync)(async () => {
+    return await (0, common_1.withAnalyticsAsync)(ctx.analytics, async () => {
         if (log_1.default.isDebug) {
             log_1.default.log(`Starting ${platform_1.requestedPlatformDisplayNames[job.platform]} build`);
         }
@@ -149,10 +149,10 @@ async function sendBuildRequestAsync(builder, job, metadata, buildParams) {
         (0, printBuildInfo_1.printDeprecationWarnings)(deprecationInfo);
         return build;
     }, {
-        attemptEvent: events_1.BuildEvent.BUILD_REQUEST_ATTEMPT,
-        successEvent: events_1.BuildEvent.BUILD_REQUEST_SUCCESS,
-        failureEvent: events_1.BuildEvent.BUILD_REQUEST_FAIL,
-        trackingCtx: ctx.trackingCtx,
+        attemptEvent: AnalyticsManager_1.BuildEvent.BUILD_REQUEST_ATTEMPT,
+        successEvent: AnalyticsManager_1.BuildEvent.BUILD_REQUEST_SUCCESS,
+        failureEvent: AnalyticsManager_1.BuildEvent.BUILD_REQUEST_FAIL,
+        properties: ctx.analyticsEventProperties,
     });
 }
 async function waitForBuildEndAsync(graphqlClient, { buildIds, accountName }, { intervalSec = 10 } = {}) {

package/build/build/context.d.ts

@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
-import { TrackingContext } from '../analytics/common';
+import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
@@ -41,9 +41,10 @@ export interface BuildContext<T extends Platform> {
     projectId: string;
     projectName: string;
     message?: string;
-    trackingCtx: TrackingContext;
+    analyticsEventProperties: AnalyticsEventProperties;
     user: Actor;
     graphqlClient: ExpoGraphqlClient;
+    analytics: Analytics;
     workflow: Workflow;
     android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
     ios: T extends Platform.IOS ? IosBuildContext : undefined;

package/build/build/createContext.d.ts

@@ -1,12 +1,13 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
+import { Analytics } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { BuildResourceClass } from '../graphql/generated';
 import { Actor } from '../user/User';
 import { BuildContext } from './context';
 import { LocalBuildOptions } from './local';
-export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClass, message, actor, graphqlClient, getDynamicProjectConfigAsync, }: {
+export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClass, message, actor, graphqlClient, analytics, getDynamicProjectConfigAsync, }: {
     buildProfileName: string;
     buildProfile: BuildProfile<T>;
     easJsonCliConfig: EasJson['cli'];
@@ -20,5 +21,6 @@ export declare function createBuildContextAsync<T extends Platform>({ buildProfi
     message?: string;
     actor: Actor;
     graphqlClient: ExpoGraphqlClient;
+    analytics: Analytics;
     getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<BuildContext<T>>;

package/build/build/createContext.js

@@ -7,13 +7,13 @@ const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
 const getenv_1 = tslib_1.__importDefault(require("getenv"));
 const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
 const uuid_1 = require("uuid");
-const events_1 = require("../analytics/events");
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const context_1 = require("../credentials/context");
 const projectUtils_1 = require("../project/projectUtils");
 const workflow_1 = require("../project/workflow");
 const build_1 = require("./android/build");
 const build_2 = require("./ios/build");
-async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClass, message, actor, graphqlClient, getDynamicProjectConfigAsync, }) {
+async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClass, message, actor, graphqlClient, analytics, getDynamicProjectConfigAsync, }) {
     const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
     const projectName = exp.slug;
     const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
@@ -26,6 +26,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         projectDir,
         user: actor,
         graphqlClient,
+        analytics,
         env: buildProfile.env,
         easJsonCliConfig,
     });
@@ -34,7 +35,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         projectDir,
         buildProfile,
     });
-    const trackingCtx = {
+    const analyticsEventProperties = {
         tracking_id: (0, uuid_1.v4)(),
         platform,
         ...(accountId && { account_id: accountId }),
@@ -44,7 +45,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         no_wait: noWait,
         run_from_ci: runFromCI,
     };
-    events_1.Analytics.logEvent(events_1.BuildEvent.BUILD_COMMAND, trackingCtx);
+    analytics.logEvent(AnalyticsManager_1.BuildEvent.BUILD_COMMAND, analyticsEventProperties);
     const commonContext = {
         accountName: account.name,
         buildProfile,
@@ -61,9 +62,10 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         projectDir,
         projectId,
         projectName,
-        trackingCtx,
+        analyticsEventProperties,
         user: actor,
         graphqlClient,
+        analytics,
         workflow,
         message,
         runFromCI,

package/build/build/local.js

@@ -6,7 +6,7 @@ const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const ora_1 = require("../ora");
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.114';
+const PLUGIN_PACKAGE_VERSION = '0.0.115';
 async function runLocalBuildAsync(job, metadata, options) {
     var _a;
     const { command, args } = await getCommandAndArgsAsync(job, metadata);

package/build/build/metadata.js

@@ -22,7 +22,7 @@ async function collectMetadataAsync(ctx) {
         ? 'simulator'
         : ctx.buildProfile.distribution)) !== null && _a !== void 0 ? _a : 'store';
     const metadata = {
-        trackingContext: ctx.trackingCtx,
+        trackingContext: ctx.analyticsEventProperties,
         ...(await maybeResolveVersionsAsync(ctx)),
         cliVersion: easCli_1.easCliVersion,
         workflow: ctx.workflow,

package/build/build/runBuildAndSubmit.d.ts

@@ -1,3 +1,4 @@
+import { Analytics } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { RequestedPlatform } from '../platform';
@@ -17,4 +18,4 @@ export interface BuildFlags {
     userInputResourceClass?: UserInputResourceClass;
     message?: string;
 }
-export declare function runBuildAndSubmitAsync(graphqlClient: ExpoGraphqlClient, projectDir: string, flags: BuildFlags, actor: Actor, getDynamicProjectConfigAsync: DynamicConfigContextFn): Promise<void>;
+export declare function runBuildAndSubmitAsync(graphqlClient: ExpoGraphqlClient, analytics: Analytics, projectDir: string, flags: BuildFlags, actor: Actor, getDynamicProjectConfigAsync: DynamicConfigContextFn): Promise<void>;

package/build/build/runBuildAndSubmit.js

@@ -50,7 +50,7 @@ function resolveResourceClass(platform, resourceClassInput) {
         ? androidUserInputResourceClassToBuildResourceClassMapping[resourceClassInput]
         : iosUserInputResourceClassToBuildResourceClassMapping[resourceClassInput];
 }
-async function runBuildAndSubmitAsync(graphqlClient, projectDir, flags, actor, getDynamicProjectConfigAsync) {
+async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flags, actor, getDynamicProjectConfigAsync) {
     var _a, _b, _c;
     await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
     await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
@@ -87,6 +87,7 @@ async function runBuildAndSubmitAsync(graphqlClient, projectDir, flags, actor, g
             easJsonCliConfig,
             actor,
             graphqlClient,
+            analytics,
             getDynamicProjectConfigAsync,
         });
         if (maybeBuild) {
@@ -158,7 +159,7 @@ async function runBuildAndSubmitAsync(graphqlClient, projectDir, flags, actor, g
     }
 }
 exports.runBuildAndSubmitAsync = runBuildAndSubmitAsync;
-async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, resourceClass, easJsonCliConfig, actor, graphqlClient, getDynamicProjectConfigAsync, }) {
+async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, resourceClass, easJsonCliConfig, actor, graphqlClient, analytics, getDynamicProjectConfigAsync, }) {
     const buildCtx = await (0, createContext_1.createBuildContextAsync)({
         buildProfileName: buildProfile.profileName,
         resourceClass,
@@ -173,6 +174,7 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         message: flags.message,
         actor,
         graphqlClient,
+        analytics,
         getDynamicProjectConfigAsync,
     });
     if (moreBuilds) {
@@ -225,6 +227,7 @@ async function prepareAndStartSubmissionAsync({ build, buildCtx, moreBuilds, pro
         applicationIdentifier: (_b = (_a = buildCtx.android) === null || _a === void 0 ? void 0 : _a.applicationId) !== null && _b !== void 0 ? _b : (_c = buildCtx.ios) === null || _c === void 0 ? void 0 : _c.bundleIdentifier,
         actor: buildCtx.user,
         graphqlClient: buildCtx.graphqlClient,
+        analytics: buildCtx.analytics,
         projectId: buildCtx.projectId,
         exp: buildCtx.exp,
     });

package/build/commandUtils/EasCommand.d.ts

@@ -1,4 +1,5 @@
 import { Command } from '@oclif/core';
+import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
 import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
 import LoggedInContextField from './context/LoggedInContextField';
@@ -60,10 +61,19 @@ export default abstract class EasCommand extends Command {
         };
         /**
          * Require the project to be identified and registered on server. Returns the project config in the context.
+         * This also requires the user to be logged in (getProjectIdAsync requires logged in), so also expose that context.
+         * Exposing the loggedIn context here helps us guarantee user identification for logging purposes.
          */
         ProjectConfig: {
+            loggedIn: LoggedInContextField;
             projectConfig: ProjectConfigContextField;
         };
+        /**
+         * Analytics manager. Returns the analytics manager in the context for use by the command.
+         */
+        Analytics: {
+            analytics: AnalyticsContextField;
+        };
     };
     /**
      * Context allows for subclasses (commands) to declare their prerequisites in a type-safe manner.
@@ -87,9 +97,16 @@ export default abstract class EasCommand extends Command {
     }): Promise<ContextOutput<C>>;
     /**
      * The user session manager. Responsible for coordinating all user session related state.
-     * If needed in a subclass, SessionManager ContextOption.
+     * If needed in a subclass, use the SessionManager ContextOption.
+     */
+    private sessionManagerInternal?;
+    private get sessionManager();
+    /**
+     * The analytics manager. Used for logging analytics.
+     * It is set up here to ensure a consistent set up.
      */
-    private readonly sessionManager;
+    private analyticsInternal?;
+    private get analytics();
     protected abstract runAsync(): Promise<any>;
     run(): Promise<any>;
     finally(err: Error): Promise<any>;

package/build/commandUtils/EasCommand.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const rudderstackClient_1 = require("../analytics/rudderstackClient");
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const SessionManager_1 = tslib_1.__importDefault(require("../user/SessionManager"));
+const AnalyticsContextField_1 = tslib_1.__importDefault(require("./context/AnalyticsContextField"));
 const DynamicProjectConfigContextField_1 = require("./context/DynamicProjectConfigContextField");
 const LoggedInContextField_1 = tslib_1.__importDefault(require("./context/LoggedInContextField"));
 const MaybeLoggedInContextField_1 = tslib_1.__importDefault(require("./context/MaybeLoggedInContextField"));
@@ -12,36 +14,39 @@ const ProjectConfigContextField_1 = tslib_1.__importDefault(require("./context/P
 const ProjectDirContextField_1 = tslib_1.__importDefault(require("./context/ProjectDirContextField"));
 const SessionManagementContextField_1 = tslib_1.__importDefault(require("./context/SessionManagementContextField"));
 class EasCommand extends core_1.Command {
-    constructor() {
-        super(...arguments);
-        /**
-         * The user session manager. Responsible for coordinating all user session related state.
-         * If needed in a subclass, SessionManager ContextOption.
-         */
-        this.sessionManager = new SessionManager_1.default();
-    }
     /**
      * Execute the context in the contextDefinition to satisfy command prerequisites.
      */
     async getContextAsync(commandClass, { nonInteractive }) {
         const contextDefinition = commandClass.contextDefinition;
-        const contextValuePairs = await Promise.all(Object.keys(contextDefinition).map(async (contextKey) => {
-            return [
+        // do these serially so that they don't do things like ask for login twice in parallel
+        const contextValuePairs = [];
+        for (const [contextKey, contextField] of Object.entries(contextDefinition)) {
+            contextValuePairs.push([
                 contextKey,
-                await contextDefinition[contextKey].getValueAsync({
+                await contextField.getValueAsync({
                     nonInteractive,
                     sessionManager: this.sessionManager,
+                    analytics: this.analytics,
                 }),
-            ];
-        }));
+            ]);
+        }
         return Object.fromEntries(contextValuePairs);
     }
+    get sessionManager() {
+        return (0, nullthrows_1.default)(this.sessionManagerInternal);
+    }
+    get analytics() {
+        return (0, nullthrows_1.default)(this.analyticsInternal);
+    }
     // eslint-disable-next-line async-protect/async-suffix
     async run() {
-        await (0, rudderstackClient_1.initAsync)();
+        this.analyticsInternal = await (0, AnalyticsManager_1.createAnalyticsAsync)();
+        this.sessionManagerInternal = new SessionManager_1.default(this.analytics);
         // this is needed for logEvent call below as it identifies the user in the analytics system
+        // if possible
         await this.sessionManager.getUserAsync();
-        (0, rudderstackClient_1.logEvent)(rudderstackClient_1.AnalyticsEvent.ACTION, {
+        this.analytics.logEvent(AnalyticsManager_1.CommandEvent.ACTION, {
             // id is assigned by oclif in constructor based on the filepath:
             // commands/submit === submit, commands/build/list === build:list
             action: `eas ${this.id}`,
@@ -50,7 +55,7 @@ class EasCommand extends core_1.Command {
     }
     // eslint-disable-next-line async-protect/async-suffix
     async finally(err) {
-        await (0, rudderstackClient_1.flushAsync)();
+        await this.analytics.flushAsync();
         return super.finally(err);
     }
 }
@@ -98,10 +103,19 @@ EasCommand.ContextOptions = {
     },
     /**
      * Require the project to be identified and registered on server. Returns the project config in the context.
+     * This also requires the user to be logged in (getProjectIdAsync requires logged in), so also expose that context.
+     * Exposing the loggedIn context here helps us guarantee user identification for logging purposes.
      */
     ProjectConfig: {
+        loggedIn: new LoggedInContextField_1.default(),
         projectConfig: new ProjectConfigContextField_1.default(),
     },
+    /**
+     * Analytics manager. Returns the analytics manager in the context for use by the command.
+     */
+    Analytics: {
+        analytics: new AnalyticsContextField_1.default(),
+    },
 };
 /**
  * Context allows for subclasses (commands) to declare their prerequisites in a type-safe manner.

package/build/commandUtils/context/AnalyticsContextField.d.ts

@@ -0,0 +1,5 @@
+import { Analytics } from '../../analytics/AnalyticsManager';
+import ContextField, { ContextOptions } from './ContextField';
+export default class AnalyticsContextField extends ContextField<Analytics> {
+    getValueAsync({ analytics }: ContextOptions): Promise<Analytics>;
+}

package/build/commandUtils/context/AnalyticsContextField.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
+class AnalyticsContextField extends ContextField_1.default {
+    async getValueAsync({ analytics }) {
+        return analytics;
+    }
+}
+exports.default = AnalyticsContextField;

package/build/commandUtils/context/ContextField.d.ts

@@ -1,6 +1,8 @@
+import { Analytics } from '../../analytics/AnalyticsManager';
 import SessionManager from '../../user/SessionManager';
 export interface ContextOptions {
     sessionManager: SessionManager;
+    analytics: Analytics;
     nonInteractive: boolean;
 }
 export default abstract class ContextField<T> {

package/build/commands/analytics.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand"));
 const log_1 = tslib_1.__importDefault(require("../log"));
-const UserSettings_1 = tslib_1.__importDefault(require("../user/UserSettings"));
 class AnalyticsView extends EasCommand_1.default {
     async runAsync() {
         const { STATUS: status } = (await this.parse(AnalyticsView)).args;
         if (status) {
-            await UserSettings_1.default.setAsync('analyticsEnabled', status === 'on');
+            (0, AnalyticsManager_1.setAnalyticsEnabledAsync)(status === 'on');
             log_1.default.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);
         }
         else {
-            const analyticsEnabled = await UserSettings_1.default.getAsync('analyticsEnabled', null);
+            const analyticsEnabled = await (0, AnalyticsManager_1.getAnalyticsEnabledAsync)();
             log_1.default.log(`Analytics are ${analyticsEnabled === false ? 'disabled' : 'enabled'} on this eas-cli installation.`);
         }
     }

package/build/commands/build/index.d.ts

@@ -19,6 +19,7 @@ export default class Build extends EasCommand {
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
+        analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
         getDynamicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicProjectConfigContextField;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;

package/build/commands/build/index.js

@@ -27,7 +27,7 @@ class Build extends EasCommand_1.default {
             (0, json_1.enableJsonOutput)();
         }
         const flags = this.sanitizeFlags(rawFlags);
-        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, } = await this.getContextAsync(Build, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(Build, {
             nonInteractive: flags.nonInteractive,
         });
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
@@ -37,7 +37,7 @@ class Build extends EasCommand_1.default {
                 : [generated_1.StatuspageServiceName.EasBuild]);
         }
         const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
-        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, projectDir, flagsWithPlatform, actor, getDynamicProjectConfigAsync);
+        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, flagsWithPlatform, actor, getDynamicProjectConfigAsync);
     }
     sanitizeFlags(flags) {
         var _b, _c;
@@ -180,6 +180,7 @@ Build.contextDefinition = {
     ..._a.ContextOptions.LoggedIn,
     ..._a.ContextOptions.DynamicProjectConfig,
     ..._a.ContextOptions.ProjectDir,
+    ..._a.ContextOptions.Analytics,
 };
 async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
     if (!(await fs_extra_1.default.pathExists(eas_json_1.EasJsonAccessor.formatEasJsonPath(projectDir)))) {

package/build/commands/build/inspect.d.ts

@@ -16,6 +16,7 @@ export default class BuildInspect extends EasCommand {
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
+        analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
         getDynamicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicProjectConfigContextField;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;

package/build/commands/build/inspect.js

@@ -27,7 +27,7 @@ const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
 class BuildInspect extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(BuildInspect);
-        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, } = await this.getContextAsync(BuildInspect, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInspect, {
             nonInteractive: false,
         });
         const outputDirectory = path_1.default.resolve(process.cwd(), flags.output);
@@ -44,7 +44,7 @@ class BuildInspect extends EasCommand_1.default {
         }
         else {
             try {
-                await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, projectDir, {
+                await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, {
                     nonInteractive: false,
                     wait: true,
                     clearCache: false,
@@ -141,4 +141,5 @@ BuildInspect.contextDefinition = {
     ..._a.ContextOptions.LoggedIn,
     ..._a.ContextOptions.DynamicProjectConfig,
     ..._a.ContextOptions.ProjectDir,
+    ..._a.ContextOptions.Analytics,
 };

package/build/commands/credentials.d.ts

@@ -5,6 +5,7 @@ export default class Credentials extends EasCommand {
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     static contextDefinition: {
+        analytics: import("../commandUtils/context/AnalyticsContextField").default;
         projectConfig: import("../commandUtils/context/OptionalProjectConfigContextField").OptionalProjectConfigContextField;
         loggedIn: import("../commandUtils/context/LoggedInContextField").default;
     };

package/build/commands/credentials.js

@@ -8,10 +8,10 @@ const SelectPlatform_1 = require("../credentials/manager/SelectPlatform");
 class Credentials extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(Credentials);
-        const { loggedIn: { actor, graphqlClient }, projectConfig, } = await this.getContextAsync(Credentials, {
+        const { loggedIn: { actor, graphqlClient }, projectConfig, analytics, } = await this.getContextAsync(Credentials, {
             nonInteractive: false,
         });
-        await new SelectPlatform_1.SelectPlatform(actor, graphqlClient, projectConfig !== null && projectConfig !== void 0 ? projectConfig : null, flags.platform).runAsync();
+        await new SelectPlatform_1.SelectPlatform(actor, graphqlClient, analytics, projectConfig !== null && projectConfig !== void 0 ? projectConfig : null, flags.platform).runAsync();
     }
 }
 exports.default = Credentials;
@@ -23,4 +23,5 @@ Credentials.flags = {
 Credentials.contextDefinition = {
     ..._a.ContextOptions.LoggedIn,
     ..._a.ContextOptions.OptionalProjectConfig,
+    ..._a.ContextOptions.Analytics,
 };

package/build/commands/metadata/pull.d.ts

@@ -5,6 +5,7 @@ export default class MetadataPull extends EasCommand {
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
+        analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };

package/build/commands/metadata/pull.js

@@ -16,7 +16,7 @@ class MetadataPull extends EasCommand_1.default {
     async runAsync() {
         log_1.default.warn('EAS Metadata is in beta and subject to breaking changes.');
         const { flags } = await this.parse(MetadataPull);
-        const { loggedIn: { actor, graphqlClient }, projectConfig: { exp, projectId, projectDir }, } = await this.getContextAsync(MetadataPull, {
+        const { loggedIn: { actor, graphqlClient }, projectConfig: { exp, projectId, projectDir }, analytics, } = await this.getContextAsync(MetadataPull, {
             nonInteractive: false,
         });
         // this command is interactive (all nonInteractive flags passed to utility functions are false)
@@ -26,10 +26,12 @@ class MetadataPull extends EasCommand_1.default {
             projectDir,
             user: actor,
             graphqlClient,
+            analytics,
             nonInteractive: false,
         });
         const metadataCtx = await (0, context_2.createMetadataContextAsync)({
             credentialsCtx,
+            analytics,
             projectDir,
             exp,
             profileName: flags.profile,
@@ -62,4 +64,5 @@ MetadataPull.flags = {
 MetadataPull.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.Analytics,
 };

package/build/commands/metadata/push.d.ts

@@ -5,6 +5,7 @@ export default class MetadataPush extends EasCommand {
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
+        analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };