eas-cli 2.4.1 → 2.5.0

package/build/credentials/ios/appstore/ascApiKey.js

@@ -4,7 +4,7 @@ exports.getAscApiKeyInfo = exports.revokeAscApiKeyAsync = exports.createAscApiKe
 const tslib_1 = require("tslib");
 const apple_utils_1 = require("@expo/apple-utils");
 const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
-const events_1 = require("../../../analytics/events");
+const AnalyticsManager_1 = require("../../../analytics/AnalyticsManager");
 const log_1 = tslib_1.__importStar(require("../../../log"));
 const ora_1 = require("../../../ora");
 const authenticate_1 = require("./authenticate");
@@ -57,7 +57,7 @@ exports.getAscApiKeyAsync = getAscApiKeyAsync;
  * the resource does not exist. We retry with exponential backoff until the key propagates and
  * is available for download.
  * */
-async function downloadWithRetryAsync(key, { minTimeout = 1000, retries = 6, factor = 2, } = {}) {
+async function downloadWithRetryAsync(analytics, key, { minTimeout = 1000, retries = 6, factor = 2, } = {}) {
     const RESOURCE_DOES_NOT_EXIST_MESSAGE = 'The specified resource does not exist - There is no resource of type';
     try {
         const keyP8 = await (0, promise_retry_1.default)(async (retry, number) => {
@@ -69,7 +69,7 @@ async function downloadWithRetryAsync(key, { minTimeout = 1000, retries = 6, fac
                     e.message.includes(RESOURCE_DOES_NOT_EXIST_MESSAGE)) {
                     const secondsToRetry = Math.pow(factor, number);
                     log_1.default.log(`Received an unexpected response from Apple, retrying in ${secondsToRetry} seconds...`);
-                    events_1.Analytics.logEvent(events_1.SubmissionEvent.API_KEY_DOWNLOAD_RETRY, {
+                    analytics.logEvent(AnalyticsManager_1.SubmissionEvent.API_KEY_DOWNLOAD_RETRY, {
                         errorName: e.name,
                         reason: e.message,
                         retry: number,
@@ -83,7 +83,7 @@ async function downloadWithRetryAsync(key, { minTimeout = 1000, retries = 6, fac
             factor,
             minTimeout,
         });
-        events_1.Analytics.logEvent(events_1.SubmissionEvent.API_KEY_DOWNLOAD_SUCCESS, {});
+        analytics.logEvent(AnalyticsManager_1.SubmissionEvent.API_KEY_DOWNLOAD_SUCCESS, {});
         return keyP8;
     }
     catch (e) {
@@ -91,7 +91,7 @@ async function downloadWithRetryAsync(key, { minTimeout = 1000, retries = 6, fac
             e.message.includes(RESOURCE_DOES_NOT_EXIST_MESSAGE)) {
             log_1.default.warn(`Unable to download Api Key from Apple at this time. Create and upload your key manually by running 'eas credentials' ${(0, log_1.learnMore)('https://expo.fyi/creating-asc-api-key')}`);
         }
-        events_1.Analytics.logEvent(events_1.SubmissionEvent.API_KEY_DOWNLOAD_FAIL, {
+        analytics.logEvent(AnalyticsManager_1.SubmissionEvent.API_KEY_DOWNLOAD_FAIL, {
             errorName: e.name,
             reason: e.message,
         });
@@ -103,7 +103,7 @@ exports.downloadWithRetryAsync = downloadWithRetryAsync;
  * Create an App Store Connect API Key.
  * **Does not support App Store Connect API (CI).**
  */
-async function createAscApiKeyAsync(userAuthCtx, { nickname, allAppsVisible, roles, keyType, }) {
+async function createAscApiKeyAsync(analytics, userAuthCtx, { nickname, allAppsVisible, roles, keyType, }) {
     const spinner = (0, ora_1.ora)(`Creating App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(userAuthCtx);
@@ -113,7 +113,7 @@ async function createAscApiKeyAsync(userAuthCtx, { nickname, allAppsVisible, rol
             roles: roles !== null && roles !== void 0 ? roles : [apple_utils_1.UserRole.ADMIN],
             keyType: keyType !== null && keyType !== void 0 ? keyType : apple_utils_1.ApiKeyType.PUBLIC_API,
         });
-        const keyP8 = await downloadWithRetryAsync(key);
+        const keyP8 = await downloadWithRetryAsync(analytics, key);
         if (!keyP8) {
             const { nickname, roles } = key.attributes;
             const humanReadableKey = `App Store Connect Key '${nickname}' (${key.id}) with roles {${roles.join(',')}}`;

package/build/credentials/manager/HelperActions.d.ts

@@ -1,9 +1,11 @@
+import { Analytics } from '../../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import { CredentialsContext, CredentialsContextProjectInfo } from '../context';
 export interface Action<T = void> {
     actor: Actor;
     graphqlClient: ExpoGraphqlClient;
+    analytics: Analytics;
     projectInfo: CredentialsContextProjectInfo | null;
     runAsync(ctx: CredentialsContext): Promise<T>;
 }

package/build/credentials/manager/ManageAndroid.js

@@ -43,6 +43,7 @@ class ManageAndroid {
             projectInfo: this.callingAction.projectInfo,
             user: this.callingAction.actor,
             graphqlClient: this.callingAction.graphqlClient,
+            analytics: this.callingAction.analytics,
             env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
             nonInteractive: false,
         });

package/build/credentials/manager/ManageIos.js

@@ -53,6 +53,7 @@ class ManageIos {
             projectInfo: this.callingAction.projectInfo,
             user: this.callingAction.actor,
             graphqlClient: this.callingAction.graphqlClient,
+            analytics: this.callingAction.analytics,
             env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
             nonInteractive: false,
         });

package/build/credentials/manager/SelectPlatform.d.ts

@@ -1,11 +1,13 @@
+import { Analytics } from '../../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import { CredentialsContextProjectInfo } from '../context';
 export declare class SelectPlatform {
     readonly actor: Actor;
     readonly graphqlClient: ExpoGraphqlClient;
+    readonly analytics: Analytics;
     readonly projectInfo: CredentialsContextProjectInfo | null;
     private readonly flagPlatform?;
-    constructor(actor: Actor, graphqlClient: ExpoGraphqlClient, projectInfo: CredentialsContextProjectInfo | null, flagPlatform?: string | undefined);
+    constructor(actor: Actor, graphqlClient: ExpoGraphqlClient, analytics: Analytics, projectInfo: CredentialsContextProjectInfo | null, flagPlatform?: string | undefined);
     runAsync(): Promise<void>;
 }

package/build/credentials/manager/SelectPlatform.js

@@ -5,9 +5,10 @@ const platform_1 = require("../../platform");
 const ManageAndroid_1 = require("./ManageAndroid");
 const ManageIos_1 = require("./ManageIos");
 class SelectPlatform {
-    constructor(actor, graphqlClient, projectInfo, flagPlatform) {
+    constructor(actor, graphqlClient, analytics, projectInfo, flagPlatform) {
         this.actor = actor;
         this.graphqlClient = graphqlClient;
+        this.analytics = analytics;
         this.projectInfo = projectInfo;
         this.flagPlatform = flagPlatform;
     }

package/build/metadata/context.d.ts

@@ -3,6 +3,7 @@ import { App, Session } from '@expo/apple-utils';
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { SubmitProfile } from '@expo/eas-json';
+import { Analytics } from '../analytics/AnalyticsManager';
 import { CredentialsContext } from '../credentials/context';
 import { Actor } from '../user/User';
 export declare type MetadataContext = {
@@ -16,6 +17,8 @@ export declare type MetadataContext = {
     user: Actor;
     /** The store credentials manager */
     credentialsCtx: CredentialsContext;
+    /** The analytics manager for EAS cli */
+    analytics: Analytics;
     /** The app bundle identifier to use for the store */
     bundleIdentifier: string;
     /** Root of the Expo project directory */
@@ -36,6 +39,7 @@ export declare type MetadataAppStoreAuthentication = {
 export declare function createMetadataContextAsync(params: {
     projectDir: string;
     credentialsCtx: CredentialsContext;
+    analytics: Analytics;
     exp: ExpoConfig;
     profileName?: string;
 }): Promise<MetadataContext>;

package/build/metadata/context.js

@@ -24,6 +24,7 @@ async function createMetadataContextAsync(params) {
         profile: submitProfile,
         metadataPath: (_b = submitProfile.metadataPath) !== null && _b !== void 0 ? _b : 'store.config.json',
         user,
+        analytics: params.analytics,
         credentialsCtx: params.credentialsCtx,
         bundleIdentifier,
         projectDir: params.projectDir,

package/build/metadata/download.js

@@ -4,7 +4,7 @@ exports.downloadMetadataAsync = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const events_1 = require("../analytics/events");
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const prompts_1 = require("../prompts");
 const tasks_1 = require("./apple/tasks");
@@ -29,7 +29,7 @@ async function downloadMetadataAsync(metadataCtx) {
         }
     }
     const { app, auth } = await (0, context_1.ensureMetadataAppStoreAuthenticatedAsync)(metadataCtx);
-    const { unsubscribeTelemetry, executionId } = (0, telemetry_1.subscribeTelemetry)(events_1.MetadataEvent.APPLE_METADATA_DOWNLOAD, { app, auth });
+    const { unsubscribeTelemetry, executionId } = (0, telemetry_1.subscribeTelemetry)(metadataCtx.analytics, AnalyticsManager_1.MetadataEvent.APPLE_METADATA_DOWNLOAD, { app, auth });
     log_1.default.addNewLineIfNone();
     log_1.default.log('Downloading App Store config...');
     const errors = [];

package/build/metadata/upload.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadMetadataAsync = void 0;
 const tslib_1 = require("tslib");
-const events_1 = require("../analytics/events");
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const prompts_1 = require("../prompts");
 const tasks_1 = require("./apple/tasks");
@@ -18,7 +18,7 @@ async function uploadMetadataAsync(metadataCtx) {
     var _a;
     const storeConfig = await loadConfigWithValidationPromptAsync(metadataCtx);
     const { app, auth } = await (0, context_1.ensureMetadataAppStoreAuthenticatedAsync)(metadataCtx);
-    const { unsubscribeTelemetry, executionId } = (0, telemetry_1.subscribeTelemetry)(events_1.MetadataEvent.APPLE_METADATA_UPLOAD, { app, auth });
+    const { unsubscribeTelemetry, executionId } = (0, telemetry_1.subscribeTelemetry)(metadataCtx.analytics, AnalyticsManager_1.MetadataEvent.APPLE_METADATA_UPLOAD, { app, auth });
     log_1.default.addNewLineIfNone();
     log_1.default.log('Uploading App Store configuration...');
     const errors = [];

package/build/metadata/utils/telemetry.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
 import { App, Session } from '@expo/apple-utils';
-import { MetadataEvent } from '../../analytics/events';
+import { Analytics, MetadataEvent } from '../../analytics/AnalyticsManager';
 export declare type TelemetryContext = {
     app: App;
     auth: Partial<Session.AuthState>;
@@ -10,7 +10,7 @@ export declare type TelemetryContext = {
  * When providing the app and auth info, we can scrub that data from the telemetry.
  * Returns an execution ID to group all events of a single run together, and a unsubscribe function.
  */
-export declare function subscribeTelemetry(event: MetadataEvent, options: TelemetryContext): {
+export declare function subscribeTelemetry(analytics: Analytics, event: MetadataEvent, options: TelemetryContext): {
     /** Unsubscribe the telemetry from all apple-utils events */
     unsubscribeTelemetry: () => void;
     /** The unique id added to all telemetry events from a single execution */

package/build/metadata/utils/telemetry.js

@@ -3,18 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDataScrubber = exports.subscribeTelemetry = void 0;
 const apple_utils_1 = require("@expo/apple-utils");
 const uuid_1 = require("uuid");
-const events_1 = require("../../analytics/events");
 /**
  * Subscribe the telemetry to the ongoing metadata requests and responses.
  * When providing the app and auth info, we can scrub that data from the telemetry.
  * Returns an execution ID to group all events of a single run together, and a unsubscribe function.
  */
-function subscribeTelemetry(event, options) {
+function subscribeTelemetry(analytics, event, options) {
     const executionId = (0, uuid_1.v4)();
     const scrubber = makeDataScrubber(options);
     const { interceptors } = (0, apple_utils_1.getRequestClient)();
     const responseInterceptorId = interceptors.response.use(response => {
-        events_1.Analytics.logEvent(event, {
+        analytics.logEvent(event, {
             executionId,
             type: 'response',
             phase: 'resolved',
@@ -26,7 +25,7 @@ function subscribeTelemetry(event, options) {
         return response;
     }, (error) => {
         var _a, _b, _c;
-        events_1.Analytics.logEvent(event, {
+        analytics.logEvent(event, {
             executionId,
             type: 'response',
             phase: 'rejected',

package/build/project/projectUtils.js

@@ -89,9 +89,7 @@ async function validateAppVersionRuntimePolicySupportAsync(projectDir, exp) {
 }
 exports.validateAppVersionRuntimePolicySupportAsync = validateAppVersionRuntimePolicySupportAsync;
 async function installExpoUpdatesAsync(projectDir) {
-    log_1.default.newLine();
-    log_1.default.log(`Running ${chalk_1.default.bold('expo install expo-updates')}`);
-    log_1.default.newLine();
+    log_1.default.log(chalk_1.default.gray `> npx expo install expo-updates`);
     await (0, expoCli_1.expoCommandAsync)(projectDir, ['install', 'expo-updates']);
     log_1.default.newLine();
 }

package/build/project/publish.js

@@ -107,14 +107,20 @@ async function buildBundlesAsync({ projectDir, inputDir, }) {
     if (!packageJSON) {
         throw new Error('Could not locate package.json');
     }
-    await (0, expoCli_1.expoCommandAsync)(projectDir, [
-        'export',
-        '--output-dir',
-        inputDir,
-        '--experimental-bundle',
-        '--non-interactive',
-        '--dump-sourcemap',
-    ]);
+    if ((0, expoCli_1.shouldUseVersionedExpoCLI)(projectDir)) {
+        await (0, expoCli_1.expoCommandAsync)(projectDir, ['export', '--output-dir', inputDir, '--dump-sourcemap']);
+    }
+    else {
+        // Legacy global Expo CLI
+        await (0, expoCli_1.expoCommandAsync)(projectDir, [
+            'export',
+            '--output-dir',
+            inputDir,
+            '--experimental-bundle',
+            '--non-interactive',
+            '--dump-sourcemap',
+        ]);
+    }
 }
 exports.buildBundlesAsync = buildBundlesAsync;
 async function resolveInputDirectoryAsync(customInputDirectory) {

package/build/submit/BaseSubmitter.d.ts

@@ -1,5 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { Event } from '../analytics/events';
+import { AnalyticsEvent } from '../analytics/AnalyticsManager';
 import { AndroidSubmissionConfigInput, IosSubmissionConfigInput, SubmissionFragment } from '../graphql/generated';
 import { SubmissionContext } from './context';
 export interface SubmissionInput<P extends Platform> {
@@ -8,9 +8,9 @@ export interface SubmissionInput<P extends Platform> {
     buildId?: string;
 }
 interface AnalyticEvents {
-    attemptEvent: Event;
-    successEvent: Event;
-    failureEvent: Event;
+    attemptEvent: AnalyticsEvent;
+    successEvent: AnalyticsEvent;
+    failureEvent: AnalyticsEvent;
 }
 export default abstract class BaseSubmitter<P extends Platform, ResolvedSourceOptions, SubmissionOptions> {
     protected ctx: SubmissionContext<P>;

package/build/submit/BaseSubmitter.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const common_1 = require("../analytics/common");
-const events_1 = require("../analytics/events");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const ora_1 = require("../ora");
@@ -20,11 +20,11 @@ class BaseSubmitter {
         for (const key in this.sourceOptionResolver) {
             const sourceOptionKey = key;
             const sourceOptionAnalytics = this.sourceOptionAnalytics[sourceOptionKey];
-            const sourceOption = await (0, common_1.withAnalyticsAsync)(async () => await this.sourceOptionResolver[sourceOptionKey](), {
+            const sourceOption = await (0, common_1.withAnalyticsAsync)(this.ctx.analytics, async () => await this.sourceOptionResolver[sourceOptionKey](), {
                 attemptEvent: sourceOptionAnalytics.attemptEvent,
                 successEvent: sourceOptionAnalytics.successEvent,
                 failureEvent: sourceOptionAnalytics.failureEvent,
-                trackingCtx: this.ctx.trackingCtx,
+                properties: this.ctx.analyticsEventProperties,
             });
             resolvedSourceOptions[sourceOptionKey] = sourceOption;
         }
@@ -50,11 +50,11 @@ class BaseSubmitter {
         }
     }
     async createSubmissionWithAnalyticsAsync(submissionInput) {
-        return await (0, common_1.withAnalyticsAsync)(async () => this.createSubmissionAsync(submissionInput), {
-            attemptEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_ATTEMPT,
-            successEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_SUCCESS,
-            failureEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_FAIL,
-            trackingCtx: this.ctx.trackingCtx,
+        return await (0, common_1.withAnalyticsAsync)(this.ctx.analytics, async () => this.createSubmissionAsync(submissionInput), {
+            attemptEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_REQUEST_ATTEMPT,
+            successEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_REQUEST_SUCCESS,
+            failureEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_REQUEST_FAIL,
+            properties: this.ctx.analyticsEventProperties,
         });
     }
 }

package/build/submit/android/AndroidSubmitter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const events_1 = require("../../analytics/events");
+const AnalyticsManager_1 = require("../../analytics/AnalyticsManager");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const ArchiveSource_1 = require("../ArchiveSource");
@@ -21,14 +21,14 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
         };
         const sourceOptionsAnalytics = {
             archive: {
-                attemptEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
-                successEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
-                failureEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_FAIL,
+                attemptEvent: AnalyticsManager_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
+                successEvent: AnalyticsManager_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
+                failureEvent: AnalyticsManager_1.SubmissionEvent.GATHER_ARCHIVE_FAIL,
             },
             serviceAccountKeyResult: {
-                attemptEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_ATTEMPT,
-                successEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_SUCCESS,
-                failureEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_FAIL,
+                attemptEvent: AnalyticsManager_1.SubmissionEvent.GATHER_CREDENTIALS_ATTEMPT,
+                successEvent: AnalyticsManager_1.SubmissionEvent.GATHER_CREDENTIALS_SUCCESS,
+                failureEvent: AnalyticsManager_1.SubmissionEvent.GATHER_CREDENTIALS_FAIL,
             },
         };
         super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);

package/build/submit/context.d.ts

@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { SubmitProfile } 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 { Actor } from '../user/User';
@@ -9,7 +9,7 @@ export interface SubmissionContext<T extends Platform> {
     accountName: string;
     archiveFlags: SubmitArchiveFlags;
     credentialsCtx: CredentialsContext;
-    trackingCtx: TrackingContext;
+    analyticsEventProperties: AnalyticsEventProperties;
     exp: ExpoConfig;
     nonInteractive: boolean;
     platform: T;
@@ -19,6 +19,7 @@ export interface SubmissionContext<T extends Platform> {
     projectName: string;
     user: Actor;
     graphqlClient: ExpoGraphqlClient;
+    analytics: Analytics;
     applicationIdentifierOverride?: string;
 }
 export interface SubmitArchiveFlags {
@@ -38,6 +39,7 @@ export declare function createSubmissionContextAsync<T extends Platform>(params:
     applicationIdentifier?: string;
     actor: Actor;
     graphqlClient: ExpoGraphqlClient;
+    analytics: Analytics;
     exp: ExpoConfig;
     projectId: string;
 }): Promise<SubmissionContext<T>>;

package/build/submit/context.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSubmissionContextAsync = void 0;
 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");
 async function createSubmissionContextAsync(params) {
-    const { applicationIdentifier, projectDir, nonInteractive, actor, exp, projectId, graphqlClient, } = params;
+    const { applicationIdentifier, projectDir, nonInteractive, actor, exp, projectId, graphqlClient, analytics, } = params;
     const { env, ...rest } = params;
     const projectName = exp.slug;
     const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
@@ -17,24 +17,25 @@ async function createSubmissionContextAsync(params) {
             projectDir,
             user: actor,
             graphqlClient,
+            analytics,
             projectInfo: { exp, projectId },
             nonInteractive,
         });
     }
-    const trackingCtx = {
+    const analyticsEventProperties = {
         tracking_id: (0, uuid_1.v4)(),
         platform: params.platform,
         ...(accountId && { account_id: accountId }),
         project_id: projectId,
     };
-    events_1.Analytics.logEvent(events_1.SubmissionEvent.SUBMIT_COMMAND, trackingCtx);
+    rest.analytics.logEvent(AnalyticsManager_1.SubmissionEvent.SUBMIT_COMMAND, analyticsEventProperties);
     return {
         ...rest,
         accountName: account.name,
         credentialsCtx,
         projectName,
         user: actor,
-        trackingCtx,
+        analyticsEventProperties,
         applicationIdentifierOverride: applicationIdentifier,
     };
 }

package/build/submit/ios/IosSubmitter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const events_1 = require("../../analytics/events");
+const AnalyticsManager_1 = require("../../analytics/AnalyticsManager");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const ArchiveSource_1 = require("../ArchiveSource");
@@ -36,14 +36,14 @@ class IosSubmitter extends BaseSubmitter_1.default {
         };
         const sourceOptionsAnalytics = {
             archive: {
-                attemptEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
-                successEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
-                failureEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_FAIL,
+                attemptEvent: AnalyticsManager_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
+                successEvent: AnalyticsManager_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
+                failureEvent: AnalyticsManager_1.SubmissionEvent.GATHER_ARCHIVE_FAIL,
             },
             credentials: {
-                attemptEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_ATTEMPT,
-                successEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_SUCCESS,
-                failureEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_FAIL,
+                attemptEvent: AnalyticsManager_1.SubmissionEvent.GATHER_CREDENTIALS_ATTEMPT,
+                successEvent: AnalyticsManager_1.SubmissionEvent.GATHER_CREDENTIALS_SUCCESS,
+                failureEvent: AnalyticsManager_1.SubmissionEvent.GATHER_CREDENTIALS_FAIL,
             },
         };
         super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);

package/build/submit/submit.js

@@ -4,8 +4,8 @@ exports.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish = exports.waitToComplete
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const common_1 = require("../analytics/common");
-const events_1 = require("../analytics/events");
 const generated_1 = require("../graphql/generated");
 const log_1 = tslib_1.__importStar(require("../log"));
 const platform_1 = require("../platform");
@@ -14,16 +14,16 @@ const IosSubmitCommand_1 = tslib_1.__importDefault(require("./ios/IosSubmitComma
 const logs_1 = require("./utils/logs");
 const wait_1 = require("./utils/wait");
 async function submitAsync(ctx) {
-    return await (0, common_1.withAnalyticsAsync)(async () => {
+    return await (0, common_1.withAnalyticsAsync)(ctx.analytics, async () => {
         const command = ctx.platform === eas_build_job_1.Platform.ANDROID
             ? new AndroidSubmitCommand_1.default(ctx)
             : new IosSubmitCommand_1.default(ctx);
         return command.runAsync();
     }, {
-        attemptEvent: events_1.SubmissionEvent.SUBMIT_COMMAND_ATTEMPT,
-        successEvent: events_1.SubmissionEvent.SUBMIT_COMMAND_SUCCESS,
-        failureEvent: events_1.SubmissionEvent.SUBMIT_COMMAND_FAIL,
-        trackingCtx: ctx.trackingCtx,
+        attemptEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_COMMAND_ATTEMPT,
+        successEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_COMMAND_SUCCESS,
+        failureEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_COMMAND_FAIL,
+        properties: ctx.analyticsEventProperties,
     });
 }
 exports.submitAsync = submitAsync;

package/build/update/utils.d.ts

@@ -22,6 +22,7 @@ export declare type FormattedUpdateGroupDescriptionWithBranch = FormattedUpdateG
 };
 export declare const UPDATE_COLUMNS: string[];
 export declare const UPDATE_COLUMNS_WITH_BRANCH: string[];
+export declare function formatUpdateGroup(update: FormattedUpdateGroupDescription): string;
 export declare function getPlatformsForGroup({ group, updates, }: {
     group: string | undefined;
     updates: {

package/build/update/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateBuildProfileConfigMatchesProjectConfigAsync = exports.checkEASUpdateURLIsSetAsync = exports.getUpdateGroupDescriptionsWithBranch = exports.getUpdateGroupDescriptions = exports.formatUpdateTitle = exports.ensureValidVersions = exports.formatUpdateMessage = exports.truncateString = exports.formatPlatformForUpdateGroup = exports.getPlatformsForGroup = exports.UPDATE_COLUMNS_WITH_BRANCH = exports.UPDATE_COLUMNS = void 0;
+exports.validateBuildProfileConfigMatchesProjectConfigAsync = exports.checkEASUpdateURLIsSetAsync = exports.getUpdateGroupDescriptionsWithBranch = exports.getUpdateGroupDescriptions = exports.formatUpdateTitle = exports.ensureValidVersions = exports.formatUpdateMessage = exports.truncateString = exports.formatPlatformForUpdateGroup = exports.getPlatformsForGroup = exports.formatUpdateGroup = exports.UPDATE_COLUMNS_WITH_BRANCH = exports.UPDATE_COLUMNS = void 0;
 const tslib_1 = require("tslib");
 const timeago_js_1 = require("@expo/timeago.js");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -11,6 +11,7 @@ const platform_1 = require("../platform");
 const prompts_1 = require("../prompts");
 const User_1 = require("../user/User");
 const groupBy_1 = tslib_1.__importDefault(require("../utils/expodash/groupBy"));
+const formatFields_1 = tslib_1.__importDefault(require("../utils/formatFields"));
 exports.UPDATE_COLUMNS = [
     'Update message',
     'Update runtime version',
@@ -18,6 +19,15 @@ exports.UPDATE_COLUMNS = [
     'Update platforms',
 ];
 exports.UPDATE_COLUMNS_WITH_BRANCH = ['Branch', ...exports.UPDATE_COLUMNS];
+function formatUpdateGroup(update) {
+    return (0, formatFields_1.default)([
+        { label: 'Platforms', value: update.platforms },
+        { label: 'Runtime Version', value: update.runtimeVersion },
+        { label: 'Message', value: update.message },
+        { label: 'Group ID', value: update.group },
+    ]);
+}
+exports.formatUpdateGroup = formatUpdateGroup;
 function getPlatformsForGroup({ group, updates = [], }) {
     const groupedUpdates = (0, groupBy_1.default)(updates, update => update.group);
     return formatPlatformForUpdateGroup(group ? groupedUpdates[group] : undefined);

package/build/user/SessionManager.d.ts

@@ -1,3 +1,4 @@
+import { AnalyticsWithOrchestration } from '../analytics/AnalyticsManager';
 import { CurrentUserQuery } from '../graphql/generated';
 export declare enum UserSecondFactorDeviceMethod {
     AUTHENTICATOR = "authenticator",
@@ -12,7 +13,9 @@ declare type LoggedInAuthenticationInfo = {
 };
 declare type Actor = NonNullable<CurrentUserQuery['meActor']>;
 export default class SessionManager {
-    private currentUser;
+    private readonly analytics;
+    private currentActor;
+    constructor(analytics: AnalyticsWithOrchestration);
     getAccessToken(): string | null;
     getSessionSecret(): string | null;
     private getSession;

package/build/user/SessionManager.js

@@ -8,14 +8,12 @@ const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const ApiV2Error_1 = require("../ApiV2Error");
-const Analytics = tslib_1.__importStar(require("../analytics/rudderstackClient"));
 const api_1 = require("../api");
 const createGraphqlClient_1 = require("../commandUtils/context/contextUtils/createGraphqlClient");
 const UserQuery_1 = require("../graphql/queries/UserQuery");
 const log_1 = tslib_1.__importStar(require("../log"));
 const prompts_1 = require("../prompts");
 const paths_1 = require("../utils/paths");
-const User_1 = require("./User");
 const fetchSessionSecretAndUser_1 = require("./fetchSessionSecretAndUser");
 var UserSecondFactorDeviceMethod;
 (function (UserSecondFactorDeviceMethod) {
@@ -23,6 +21,9 @@ var UserSecondFactorDeviceMethod;
     UserSecondFactorDeviceMethod["SMS"] = "sms";
 })(UserSecondFactorDeviceMethod = exports.UserSecondFactorDeviceMethod || (exports.UserSecondFactorDeviceMethod = {}));
 class SessionManager {
+    constructor(analytics) {
+        this.analytics = analytics;
+    }
     getAccessToken() {
         var _a;
         return (_a = process.env.EXPO_TOKEN) !== null && _a !== void 0 ? _a : null;
@@ -50,26 +51,22 @@ class SessionManager {
         });
     }
     async logoutAsync() {
-        this.currentUser = undefined;
+        this.currentActor = undefined;
         await this.setSessionAsync(undefined);
     }
     async getUserAsync() {
-        if (!this.currentUser && (this.getAccessToken() || this.getSessionSecret())) {
+        if (!this.currentActor && (this.getAccessToken() || this.getSessionSecret())) {
             const authenticationInfo = {
                 accessToken: this.getAccessToken(),
                 sessionSecret: this.getSessionSecret(),
             };
-            const user = await UserQuery_1.UserQuery.currentUserAsync((0, createGraphqlClient_1.createGraphqlClient)(authenticationInfo));
-            this.currentUser = user !== null && user !== void 0 ? user : undefined;
-            if (user) {
-                await Analytics.setUserDataAsync(user.id, {
-                    username: (0, User_1.getActorDisplayName)(user),
-                    user_id: user.id,
-                    user_type: user.__typename,
-                });
+            const actor = await UserQuery_1.UserQuery.currentUserAsync((0, createGraphqlClient_1.createGraphqlClient)(authenticationInfo));
+            this.currentActor = actor !== null && actor !== void 0 ? actor : undefined;
+            if (actor) {
+                this.analytics.setActor(actor);
             }
         }
-        return this.currentUser;
+        return this.currentActor;
     }
     /**
      * Ensure that there is a logged-in actor. Show a login prompt if not.