eas-cli 0.33.1 → 0.36.0

package/build/graphql/generated.js

@@ -6,7 +6,7 @@
  * For more info and docs, visit https://graphql-code-generator.com/
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheControlScope = exports.IosManagedBuildType = exports.IosSchemeBuildConfiguration = exports.StandardOffer = exports.MailchimpAudience = exports.MailchimpTag = exports.UploadSessionType = exports.IosBuildType = exports.EasBuildDeprecationInfoType = exports.BuildCredentialsSource = exports.AndroidBuildType = exports.ProjectArchiveSourceType = exports.BuildWorkflow = exports.Order = exports.AssetMetadataStatus = exports.AppSort = exports.AppsFilter = exports.WebhookType = exports.AndroidKeystoreType = exports.AndroidFcmVersion = exports.IosDistributionType = exports.AppleDeviceClass = exports.BuildJobStatus = exports.BuildJobLogsFormat = exports.SubmissionAndroidReleaseStatus = exports.SubmissionAndroidTrack = exports.SubmissionAndroidArchiveType = exports.SubmissionStatus = exports.BuildIosEnterpriseProvisioning = exports.ActivityTimelineProjectActivityType = exports.Role = exports.Permission = exports.SecondFactorMethod = exports.DistributionType = exports.BuildStatus = exports.AppPlatform = exports.AppPrivacy = exports.Feature = exports.OfferType = void 0;
+exports.CacheControlScope = exports.IosManagedBuildType = exports.IosSchemeBuildConfiguration = exports.StandardOffer = exports.MailchimpAudience = exports.MailchimpTag = exports.UploadSessionType = exports.IosBuildType = exports.EasBuildDeprecationInfoType = exports.BuildCredentialsSource = exports.AndroidBuildType = exports.ProjectArchiveSourceType = exports.BuildWorkflow = exports.Order = exports.AssetMetadataStatus = exports.AppSort = exports.AppsFilter = exports.WebhookType = exports.AndroidKeystoreType = exports.AndroidFcmVersion = exports.AppStoreConnectUserRole = exports.IosDistributionType = exports.AppleDeviceClass = exports.BuildJobStatus = exports.BuildJobLogsFormat = exports.SubmissionAndroidReleaseStatus = exports.SubmissionAndroidTrack = exports.SubmissionAndroidArchiveType = exports.SubmissionStatus = exports.BuildIosEnterpriseProvisioning = exports.ActivityTimelineProjectActivityType = exports.Role = exports.Permission = exports.SecondFactorMethod = exports.DistributionType = exports.BuildStatus = exports.AppPlatform = exports.AppPrivacy = exports.Feature = exports.OfferType = void 0;
 var OfferType;
 (function (OfferType) {
     /** Term subscription */
@@ -143,6 +143,25 @@ var IosDistributionType;
     IosDistributionType["AdHoc"] = "AD_HOC";
     IosDistributionType["Development"] = "DEVELOPMENT";
 })(IosDistributionType = exports.IosDistributionType || (exports.IosDistributionType = {}));
+var AppStoreConnectUserRole;
+(function (AppStoreConnectUserRole) {
+    AppStoreConnectUserRole["Admin"] = "ADMIN";
+    AppStoreConnectUserRole["Finance"] = "FINANCE";
+    AppStoreConnectUserRole["Technical"] = "TECHNICAL";
+    AppStoreConnectUserRole["AccountHolder"] = "ACCOUNT_HOLDER";
+    AppStoreConnectUserRole["ReadOnly"] = "READ_ONLY";
+    AppStoreConnectUserRole["Sales"] = "SALES";
+    AppStoreConnectUserRole["Marketing"] = "MARKETING";
+    AppStoreConnectUserRole["AppManager"] = "APP_MANAGER";
+    AppStoreConnectUserRole["Developer"] = "DEVELOPER";
+    AppStoreConnectUserRole["AccessToReports"] = "ACCESS_TO_REPORTS";
+    AppStoreConnectUserRole["CustomerSupport"] = "CUSTOMER_SUPPORT";
+    AppStoreConnectUserRole["CreateApps"] = "CREATE_APPS";
+    AppStoreConnectUserRole["CloudManagedDeveloperId"] = "CLOUD_MANAGED_DEVELOPER_ID";
+    AppStoreConnectUserRole["CloudManagedAppDistribution"] = "CLOUD_MANAGED_APP_DISTRIBUTION";
+    AppStoreConnectUserRole["ImageManager"] = "IMAGE_MANAGER";
+    AppStoreConnectUserRole["Unknown"] = "UNKNOWN";
+})(AppStoreConnectUserRole = exports.AppStoreConnectUserRole || (exports.AppStoreConnectUserRole = {}));
 var AndroidFcmVersion;
 (function (AndroidFcmVersion) {
     AndroidFcmVersion["Legacy"] = "LEGACY";
@@ -196,6 +215,7 @@ var AndroidBuildType;
 (function (AndroidBuildType) {
     AndroidBuildType["Apk"] = "APK";
     AndroidBuildType["AppBundle"] = "APP_BUNDLE";
+    /** @deprecated Use developmentClient option instead. */
     AndroidBuildType["DevelopmentClient"] = "DEVELOPMENT_CLIENT";
 })(AndroidBuildType = exports.AndroidBuildType || (exports.AndroidBuildType = {}));
 var BuildCredentialsSource;
@@ -208,6 +228,7 @@ var EasBuildDeprecationInfoType;
     EasBuildDeprecationInfoType["UserFacing"] = "USER_FACING";
     EasBuildDeprecationInfoType["Internal"] = "INTERNAL";
 })(EasBuildDeprecationInfoType = exports.EasBuildDeprecationInfoType || (exports.EasBuildDeprecationInfoType = {}));
+/** @deprecated Use developmentClient option instead. */
 var IosBuildType;
 (function (IosBuildType) {
     IosBuildType["Release"] = "RELEASE";
@@ -243,6 +264,7 @@ var IosSchemeBuildConfiguration;
     IosSchemeBuildConfiguration["Release"] = "RELEASE";
     IosSchemeBuildConfiguration["Debug"] = "DEBUG";
 })(IosSchemeBuildConfiguration = exports.IosSchemeBuildConfiguration || (exports.IosSchemeBuildConfiguration = {}));
+/** @deprecated Use developmentClient option instead. */
 var IosManagedBuildType;
 (function (IosManagedBuildType) {
     IosManagedBuildType["Release"] = "RELEASE";

package/build/graphql/mutations/KeystoreGenerationUrlMutation.d.ts

@@ -0,0 +1,3 @@
+export declare const KeystoreGenerationUrlMutation: {
+    createKeystoreGenerationUrlAsync(): Promise<string>;
+};

package/build/graphql/mutations/KeystoreGenerationUrlMutation.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeystoreGenerationUrlMutation = void 0;
+const tslib_1 = require("tslib");
+const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
+const client_1 = require("../client");
+exports.KeystoreGenerationUrlMutation = {
+    async createKeystoreGenerationUrlAsync() {
+        const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation CreateKeystoreGenerationUrlMutation {
+              keystoreGenerationUrl {
+                createKeystoreGenerationUrl {
+                  id
+                  url
+                }
+              }
+            }
+          `)
+            .toPromise());
+        return data.keystoreGenerationUrl.createKeystoreGenerationUrl.url;
+    },
+};

package/build/graphql/queries/BuildQuery.js

@@ -21,6 +21,7 @@ exports.BuildQuery = {
             ${(0, graphql_1.print)(Build_1.BuildFragmentNode)}
           `, { buildId }, {
             requestPolicy: useCache ? 'cache-first' : 'network-only',
+            additionalTypenames: ['Build'],
         })
             .toPromise());
         return data.builds.byId;
@@ -48,7 +49,9 @@ exports.BuildQuery = {
               }
             }
             ${(0, graphql_1.print)(Build_1.BuildFragmentNode)}
-          `, { appId, offset, limit, filter })
+          `, { appId, offset, limit, filter }, {
+            additionalTypenames: ['Build'],
+        })
             .toPromise());
         return (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.builds) !== null && _b !== void 0 ? _b : [];
     },

package/build/graphql/queries/EnvironmentSecretsQuery.js

@@ -27,7 +27,9 @@ exports.EnvironmentSecretsQuery = {
               }
             }
             ${(0, graphql_1.print)(EnvironmentSecret_1.EnvironmentSecretFragmentNode)}
-          `, { accountName })
+          `, { accountName }, {
+            additionalTypenames: ['EnvironmentSecret'],
+        })
             .toPromise());
         return data.account.byName.environmentSecrets;
     },
@@ -47,7 +49,7 @@ exports.EnvironmentSecretsQuery = {
               }
             }
             ${(0, graphql_1.print)(EnvironmentSecret_1.EnvironmentSecretFragmentNode)}
-          `, { appId })
+          `, { appId }, { additionalTypenames: ['EnvironmentSecret'] })
             .toPromise());
         return (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.environmentSecrets) !== null && _b !== void 0 ? _b : [];
     },

package/build/graphql/queries/ProjectQuery.js

@@ -15,7 +15,9 @@ exports.ProjectQuery = {
                 }
               }
             }
-          `, { username, slug })
+          `, { username, slug }, {
+            additionalTypenames: ['App', 'Snack'] /* typenames that use the Project type*/,
+        })
             .toPromise());
         return data.project.byUsernameAndSlug;
     },

package/build/graphql/queries/PublishQuery.js

@@ -18,7 +18,10 @@ exports.PublishQuery = {
             }
           `, {
             storageKeys,
-        }, { requestPolicy: 'network-only' } // Since we reptitively query this to monitor the asset upload, we need to ensure it is not cached.
+        }, {
+            requestPolicy: 'network-only',
+            additionalTypenames: ['AssetMetadataResult'],
+        } // Since we reptitively query this to monitor the asset upload, we need to ensure it is not cached.
         )
             .toPromise());
         return data.asset.metadata;

package/build/graphql/queries/SubmissionQuery.js

@@ -19,7 +19,10 @@ exports.SubmissionQuery = {
               }
             }
             ${(0, graphql_1.print)(Submission_1.SubmissionFragmentNode)}
-          `, { submissionId }, { requestPolicy: useCache ? 'cache-first' : 'network-only' })
+          `, { submissionId }, {
+            requestPolicy: useCache ? 'cache-first' : 'network-only',
+            additionalTypenames: ['Submission'],
+        })
             .toPromise());
         return data.submissions.byId;
     },
@@ -49,7 +52,7 @@ exports.SubmissionQuery = {
               }
             }
             ${(0, graphql_1.print)(Submission_1.SubmissionFragmentNode)}
-          `, { appId, offset, limit, status, platform })
+          `, { appId, offset, limit, status, platform }, { additionalTypenames: ['Submission'] })
             .toPromise());
         return (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.submissions) !== null && _b !== void 0 ? _b : [];
     },

package/build/graphql/queries/UserQuery.js

@@ -25,7 +25,10 @@ exports.UserQuery = {
                 isExpoAdmin
               }
             }
-          `)
+          `, 
+        /* variables */ undefined, {
+            additionalTypenames: ['User'],
+        })
             .toPromise());
         return data.meActor;
     },

package/build/graphql/queries/WebhookQuery.js

@@ -23,7 +23,9 @@ exports.WebhookQuery = {
               }
             }
             ${(0, graphql_1.print)(Webhook_1.WebhookFragmentNode)}
-          `, { appId, webhookFilter })
+          `, { appId, webhookFilter }, {
+            additionalTypenames: ['Webhook'],
+        })
             .toPromise());
         return (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.webhooks) !== null && _b !== void 0 ? _b : [];
     },
@@ -39,7 +41,9 @@ exports.WebhookQuery = {
               }
             }
             ${(0, graphql_1.print)(Webhook_1.WebhookFragmentNode)}
-          `, { webhookId })
+          `, { webhookId }, {
+            additionalTypenames: ['Webhook'],
+        })
             .toPromise());
         return data.webhook.byId;
     },

package/build/graphql/types/Build.js

@@ -20,12 +20,7 @@ exports.BuildFragmentNode = (0, graphql_tag_1.default) `
     initiatingActor {
       __typename
       id
-      ... on User {
-        username
-      }
-      ... on Robot {
-        firstName
-      }
+      displayName
     }
     project {
       __typename

package/build/graphql/types/credentials/AppStoreConnectApiKey.d.ts

@@ -0,0 +1 @@
+export declare const AppStoreConnectApiKeyFragmentNode: import("graphql").DocumentNode;

package/build/graphql/types/credentials/AppStoreConnectApiKey.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppStoreConnectApiKeyFragmentNode = void 0;
+const tslib_1 = require("tslib");
+const graphql_1 = require("graphql");
+const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
+const AppleTeam_1 = require("./AppleTeam");
+exports.AppStoreConnectApiKeyFragmentNode = (0, graphql_tag_1.default) `
+  fragment AppStoreConnectApiKeyFragment on AppStoreConnectApiKey {
+    id
+    appleTeam {
+      id
+      ...AppleTeamFragment
+    }
+    issuerIdentifier
+    keyIdentifier
+    name
+    roles
+    createdAt
+    updatedAt
+  }
+  ${(0, graphql_1.print)(AppleTeam_1.AppleTeamFragmentNode)}
+`;

package/build/graphql/types/credentials/IosAppCredentials.js

@@ -4,6 +4,7 @@ exports.CommonIosAppCredentialsFragmentNode = exports.CommonIosAppCredentialsWit
 const tslib_1 = require("tslib");
 const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
 const App_1 = require("../App");
+const AppStoreConnectApiKey_1 = require("./AppStoreConnectApiKey");
 const AppleAppIdentifier_1 = require("./AppleAppIdentifier");
 const ApplePushKey_1 = require("./ApplePushKey");
 const AppleTeam_1 = require("./AppleTeam");
@@ -27,11 +28,16 @@ exports.CommonIosAppCredentialsWithoutBuildCredentialsFragmentNode = (0, graphql
       id
       ...ApplePushKeyFragment
     }
+    appStoreConnectApiKeyForSubmissions {
+      id
+      ...AppStoreConnectApiKeyFragment
+    }
   }
   ${App_1.AppFragmentNode}
   ${AppleTeam_1.AppleTeamFragmentNode}
   ${AppleAppIdentifier_1.AppleAppIdentifierFragmentNode}
   ${ApplePushKey_1.ApplePushKeyFragmentNode}
+  ${AppStoreConnectApiKey_1.AppStoreConnectApiKeyFragmentNode}
 `;
 exports.CommonIosAppCredentialsFragmentNode = (0, graphql_tag_1.default) `
   fragment CommonIosAppCredentialsFragment on IosAppCredentials {

package/build/log.d.ts

@@ -11,8 +11,6 @@ export default class Log {
     static succeed(message: string): void;
     static withTick(...args: any[]): void;
     private static consoleLog;
-    private static consoleWarn;
-    private static consoleError;
     private static withTextColor;
     private static isLastLineNewLine;
     private static updateIsLastLineNewLine;

package/build/log.js

@@ -20,10 +20,10 @@ class Log {
         }
     }
     static error(...args) {
-        Log.consoleError(...Log.withTextColor(args, chalk_1.default.red));
+        Log.consoleLog(...Log.withTextColor(args, chalk_1.default.red));
     }
     static warn(...args) {
-        Log.consoleWarn(...Log.withTextColor(args, chalk_1.default.yellow));
+        Log.consoleLog(...Log.withTextColor(args, chalk_1.default.yellow));
     }
     static debug(...args) {
         if (Log.isDebug) {
@@ -47,16 +47,6 @@ class Log {
         // eslint-disable-next-line no-console
         console.log(...args);
     }
-    static consoleWarn(...args) {
-        Log.updateIsLastLineNewLine(args);
-        // eslint-disable-next-line no-console
-        console.warn(...args);
-    }
-    static consoleError(...args) {
-        Log.updateIsLastLineNewLine(args);
-        // eslint-disable-next-line no-console
-        console.error(...args);
-    }
     static withTextColor(args, chalkColor) {
         return args.map(arg => chalkColor(arg));
     }

package/build/project/projectUtils.js

@@ -184,7 +184,7 @@ async function getBranchByNameAsync({ appId, name, }) {
         `, {
         appId,
         name,
-    })
+    }, { additionalTypenames: ['UpdateBranch'] })
         .toPromise());
     return data.app.byId.updateBranchByName;
 }

package/build/project/publish.js

@@ -13,7 +13,7 @@ const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
 const PublishQuery_1 = require("../graphql/queries/PublishQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const uploads_1 = require("../uploads");
-const expoCommand_1 = require("../utils/expoCommand");
+const expoCli_1 = require("../utils/expoCli");
 const uniqBy_1 = (0, tslib_1.__importDefault)(require("../utils/expodash/uniqBy"));
 exports.TIMEOUT_LIMIT = 60000; // 1 minute
 const fileMetadataJoi = joi_1.default.object({
@@ -108,7 +108,7 @@ async function buildBundlesAsync({ projectDir, inputDir, }) {
         throw new Error('Could not locate package.json');
     }
     log_1.default.withTick(`Building bundle with expo-cli...`);
-    await (0, expoCommand_1.expoCommandAsync)(projectDir, ['export', '--output-dir', inputDir, '--experimental-bundle']);
+    await (0, expoCli_1.expoCommandAsync)(projectDir, ['export', '--output-dir', inputDir, '--experimental-bundle']);
 }
 exports.buildBundlesAsync = buildBundlesAsync;
 async function resolveInputDirectoryAsync(customInputDirectory) {

package/build/project/workflow.js

@@ -6,7 +6,7 @@ const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+const vcs_1 = require("../vcs");
 async function resolveWorkflowAsync(projectDir, platform) {
     let platformWorkflowMarker;
     try {
@@ -19,7 +19,7 @@ async function resolveWorkflowAsync(projectDir, platform) {
         return eas_build_job_1.Workflow.MANAGED;
     }
     if (await fs_extra_1.default.pathExists(platformWorkflowMarker)) {
-        return (await vcs_1.default.isFileIgnoredAsync(path_1.default.relative(projectDir, platformWorkflowMarker)))
+        return (await (0, vcs_1.getVcsClient)().isFileIgnoredAsync(path_1.default.relative(projectDir, platformWorkflowMarker)))
             ? eas_build_job_1.Workflow.MANAGED
             : eas_build_job_1.Workflow.GENERIC;
     }

package/build/submit/ArchiveSource.js

@@ -188,7 +188,7 @@ async function handleBuildListSourceAsync(source) {
     }
 }
 function formatBuildChoice(build, expiryDate) {
-    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, } = build;
+    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, initiatingActor, } = build;
     const formatValue = (field) => field ? chalk_1.default.bold(field) : chalk_1.default.dim('Unknown');
     const buildDate = new Date(updatedAt);
     const maybeRuntimeVersion = runtimeVersion ? `Runtime: ${formatValue(runtimeVersion)}` : null;
@@ -204,6 +204,7 @@ function formatBuildChoice(build, expiryDate) {
             .filter(it => it != null)
             .join(', '),
         `\tProfile: ${formatValue(buildProfile)}, Release channel: ${formatValue(releaseChannel)}`,
+        `\tAuthored by: ${formatValue(initiatingActor === null || initiatingActor === void 0 ? void 0 : initiatingActor.displayName)}`,
     ].join('\n');
     return {
         title,

package/build/submit/BaseSubmitter.d.ts

@@ -1,4 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
+import { Event } from '../analytics/events';
 import { AndroidSubmissionConfigInput, IosSubmissionConfigInput, SubmissionFragment } from '../graphql/generated';
 import { SubmissionContext } from './context';
 export interface SubmissionInput<P extends Platform> {
@@ -6,11 +7,26 @@ export interface SubmissionInput<P extends Platform> {
     submissionConfig: P extends Platform.ANDROID ? AndroidSubmissionConfigInput : IosSubmissionConfigInput;
     buildId?: string;
 }
-export default abstract class BaseSubmitter<P extends Platform, SubmissionOptions> {
+interface AnalyticEvents {
+    attemptEvent: Event;
+    successEvent: Event;
+    failureEvent: Event;
+}
+export default abstract class BaseSubmitter<P extends Platform, ResolvedSourceOptions, SubmissionOptions> {
     protected ctx: SubmissionContext<P>;
     protected options: SubmissionOptions;
-    constructor(ctx: SubmissionContext<P>, options: SubmissionOptions);
-    abstract submitAsync(): Promise<SubmissionFragment>;
-    protected createSubmissionAsync(submissionInput: SubmissionInput<P>): Promise<SubmissionFragment>;
+    protected sourceOptionResolver: {
+        [K in keyof ResolvedSourceOptions]: () => Promise<ResolvedSourceOptions[K]>;
+    };
+    protected sourceOptionAnalytics: Record<keyof ResolvedSourceOptions, AnalyticEvents>;
+    constructor(ctx: SubmissionContext<P>, options: SubmissionOptions, sourceOptionResolver: {
+        [K in keyof ResolvedSourceOptions]: () => Promise<ResolvedSourceOptions[K]>;
+    }, sourceOptionAnalytics: Record<keyof ResolvedSourceOptions, AnalyticEvents>);
+    private getSourceOptionsAsync;
+    submitAsync(): Promise<SubmissionFragment>;
+    abstract createSubmissionInputAsync(resolvedOptions: ResolvedSourceOptions): Promise<SubmissionInput<P>>;
+    private createSubmissionAsync;
+    private createSubmissionWithAnalyticsAsync;
     protected abstract createPlatformSubmissionAsync(input: SubmissionInput<P>): Promise<SubmissionFragment>;
 }
+export {};

package/build/submit/BaseSubmitter.js

@@ -1,14 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const common_1 = require("../analytics/common");
+const events_1 = require("../analytics/events");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const ora_1 = require("../ora");
 const platform_1 = require("../platform");
 class BaseSubmitter {
-    constructor(ctx, options) {
+    constructor(ctx, options, sourceOptionResolver, sourceOptionAnalytics) {
         this.ctx = ctx;
         this.options = options;
+        this.sourceOptionResolver = sourceOptionResolver;
+        this.sourceOptionAnalytics = sourceOptionAnalytics;
+    }
+    async getSourceOptionsAsync() {
+        const resolvedSourceOptions = {};
+        // Do not perform this in parallel as some of these require user interaction
+        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](), {
+                attemptEvent: sourceOptionAnalytics.attemptEvent,
+                successEvent: sourceOptionAnalytics.successEvent,
+                failureEvent: sourceOptionAnalytics.failureEvent,
+                trackingCtx: this.ctx.trackingCtx,
+            });
+            resolvedSourceOptions[sourceOptionKey] = sourceOption;
+        }
+        return resolvedSourceOptions;
+    }
+    async submitAsync() {
+        const resolvedSourceOptions = await this.getSourceOptionsAsync();
+        const input = await this.createSubmissionInputAsync(resolvedSourceOptions);
+        return await this.createSubmissionWithAnalyticsAsync(input);
     }
     async createSubmissionAsync(submissionInput) {
         log_1.default.addNewLineIfNone();
@@ -24,5 +49,13 @@ class BaseSubmitter {
             throw err;
         }
     }
+    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,
+        });
+    }
 }
 exports.default = BaseSubmitter;

package/build/submit/android/AndroidSubmitter.d.ts

@@ -1,19 +1,25 @@
 import { Platform } from '@expo/eas-build-job';
 import { AndroidSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
-import { ArchiveSource } from '../ArchiveSource';
+import { Archive, ArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
+import { SubmissionContext } from '../context';
 import { AndroidPackageSource } from './AndroidPackageSource';
-import { ServiceAccountSource } from './ServiceAccountSource';
+import { ServiceAccountKeyResult, ServiceAccountSource } from './ServiceAccountSource';
 export interface AndroidSubmissionOptions extends Pick<AndroidSubmissionConfigInput, 'track' | 'releaseStatus' | 'changesNotSentForReview'> {
     projectId: string;
     androidPackageSource: AndroidPackageSource;
     archiveSource: ArchiveSource;
     serviceAccountSource: ServiceAccountSource;
 }
-export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, AndroidSubmissionOptions> {
-    submitAsync(): Promise<SubmissionFragment>;
+interface ResolvedSourceOptions {
+    archive: Archive;
+    serviceAccountKeyResult: ServiceAccountKeyResult;
+}
+export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, ResolvedSourceOptions, AndroidSubmissionOptions> {
+    constructor(ctx: SubmissionContext<Platform.ANDROID>, options: AndroidSubmissionOptions);
+    createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.ANDROID>>;
     protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.ANDROID>): Promise<SubmissionFragment>;
-    private resolveSourceOptionsAsync;
-    private formatSubmissionConfigAsync;
+    private formatSubmissionConfig;
     private prepareSummaryData;
 }
+export {};

package/build/submit/android/AndroidSubmitter.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const events_1 = require("../../analytics/events");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
 const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
 const ArchiveSource_1 = require("../ArchiveSource");
@@ -10,16 +11,39 @@ const summary_1 = require("../utils/summary");
 const AndroidPackageSource_1 = require("./AndroidPackageSource");
 const ServiceAccountSource_1 = require("./ServiceAccountSource");
 class AndroidSubmitter extends BaseSubmitter_1.default {
-    async submitAsync() {
+    constructor(ctx, options) {
+        const sourceOptionsResolver = {
+            // eslint-disable-next-line async-protect/async-suffix
+            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource),
+            // eslint-disable-next-line async-protect/async-suffix
+            serviceAccountKeyResult: async () => {
+                const androidPackage = await (0, AndroidPackageSource_1.getAndroidPackageAsync)(this.options.androidPackageSource);
+                return await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource, androidPackage);
+            },
+        };
+        const sourceOptionsAnalytics = {
+            archive: {
+                attemptEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
+                successEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
+                failureEvent: events_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,
+            },
+        };
+        super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);
+    }
+    async createSubmissionInputAsync(resolvedSourceOptions) {
         var _a;
-        const resolvedSourceOptions = await this.resolveSourceOptionsAsync();
-        const submissionConfig = await this.formatSubmissionConfigAsync(this.options, resolvedSourceOptions);
+        const submissionConfig = await this.formatSubmissionConfig(this.options, resolvedSourceOptions);
         (0, summary_1.printSummary)(this.prepareSummaryData(this.options, resolvedSourceOptions), SummaryHumanReadableKeys);
-        return await this.createSubmissionAsync({
+        return {
             projectId: this.options.projectId,
             submissionConfig,
             buildId: (_a = resolvedSourceOptions.archive.build) === null || _a === void 0 ? void 0 : _a.id,
-        });
+        };
     }
     async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }) {
         return await SubmissionMutation_1.SubmissionMutation.createAndroidSubmissionAsync({
@@ -28,20 +52,9 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             submittedBuildId: buildId,
         });
     }
-    async resolveSourceOptionsAsync() {
-        const androidPackage = await (0, AndroidPackageSource_1.getAndroidPackageAsync)(this.options.androidPackageSource);
-        const archive = await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource);
-        const serviceAccountKeyResult = await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource, androidPackage);
-        return {
-            androidPackage,
-            archive,
-            serviceAccountKeyResult,
-        };
-    }
-    async formatSubmissionConfigAsync(options, { archive, androidPackage, serviceAccountKeyResult }) {
+    formatSubmissionConfig(options, { archive, serviceAccountKeyResult }) {
         const { track, releaseStatus, changesNotSentForReview } = options;
         return {
-            applicationIdentifier: androidPackage,
             archiveUrl: archive.url,
             track,
             changesNotSentForReview,
@@ -49,12 +62,11 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             ...serviceAccountKeyResult.result,
         };
     }
-    prepareSummaryData(options, { archive, androidPackage, serviceAccountKeyResult }) {
+    prepareSummaryData(options, { archive, serviceAccountKeyResult }) {
         const { projectId, track, releaseStatus, changesNotSentForReview } = options;
         // structuring order affects table rows order
         return {
             projectId,
-            androidPackage,
             track,
             changesNotSentForReview: changesNotSentForReview !== null && changesNotSentForReview !== void 0 ? changesNotSentForReview : undefined,
             releaseStatus: releaseStatus !== null && releaseStatus !== void 0 ? releaseStatus : undefined,
@@ -65,7 +77,6 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
 }
 exports.default = AndroidSubmitter;
 const SummaryHumanReadableKeys = {
-    androidPackage: 'Android package',
     archivePath: 'Archive path',
     archiveUrl: 'Download URL',
     changesNotSentForReview: 'Changes not sent for a review',

package/build/submit/android/ServiceAccountSource.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
-const SetupGoogleServiceAccountKey_1 = require("../../credentials/android/actions/SetupGoogleServiceAccountKey");
+const SetUpGoogleServiceAccountKey_1 = require("../../credentials/android/actions/SetUpGoogleServiceAccountKey");
 const googleServiceAccountKey_1 = require("../../credentials/android/utils/googleServiceAccountKey");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const prompts_1 = require("../../prompts");
@@ -56,7 +56,7 @@ async function getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicat
         projectName: ctx.projectName,
         androidApplicationIdentifier,
     };
-    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey_1.SetupGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey_1.SetUpGoogleServiceAccountKey(appLookupParams);
     const androidAppCredentials = await setupGoogleServiceAccountKeyAction.runAsync(ctx.credentialsCtx);
     const googleServiceAccountKey = (0, nullthrows_1.default)(androidAppCredentials.googleServiceAccountKeyForSubmissions, 'Credentials Service must provide a valid GoogleServiceAccountKey');
     return {

package/build/submit/context.d.ts

@@ -1,12 +1,14 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { SubmitProfile } from '@expo/eas-json';
+import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { Actor } from '../user/User';
 export interface SubmissionContext<T extends Platform> {
     accountName: string;
     archiveFlags: SubmitArchiveFlags;
     credentialsCtx: CredentialsContext;
+    trackingCtx: TrackingContext;
     exp: ExpoConfig;
     nonInteractive: boolean;
     platform: T;