eas-cli 2.4.1 → 2.5.0

package/build/commands/metadata/push.js

@@ -14,7 +14,7 @@ class MetadataPush 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(MetadataPush);
-        const { loggedIn: { actor, graphqlClient }, projectConfig: { exp, projectId, projectDir }, } = await this.getContextAsync(MetadataPush, {
+        const { loggedIn: { actor, graphqlClient }, projectConfig: { exp, projectId, projectDir }, analytics, } = await this.getContextAsync(MetadataPush, {
             nonInteractive: false,
         });
         // this command is interactive (all nonInteractive flags passed to utility functions are false)
@@ -24,10 +24,12 @@ class MetadataPush 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,
@@ -56,4 +58,5 @@ MetadataPush.flags = {
 MetadataPush.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.Analytics,
 };

package/build/commands/project/init.d.ts

@@ -12,6 +12,9 @@ export default class ProjectInit extends EasCommand {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
     };
     private static saveProjectIdAndLogSuccessAsync;
+    private static modifyExpoConfigAsync;
+    private static ensureOwnerSlugConsistencyAsync;
+    private static setExplicitIDAsync;
     private static initializeWithExplicitIDAsync;
     private static initializeWithInteractiveSelectionAsync;
     runAsync(): Promise<void>;

package/build/commands/project/init.js

@@ -2,6 +2,7 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const config_1 = require("@expo/config");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
@@ -11,6 +12,7 @@ const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasComm
 const getProjectIdAsync_1 = require("../../commandUtils/context/contextUtils/getProjectIdAsync");
 const generated_1 = require("../../graphql/generated");
 const AppMutation_1 = require("../../graphql/mutations/AppMutation");
+const AppQuery_1 = require("../../graphql/queries/AppQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
 const expoConfig_1 = require("../../project/expoConfig");
@@ -22,7 +24,77 @@ class ProjectInit extends EasCommand_1.default {
         await (0, getProjectIdAsync_1.saveProjectIdToAppConfigAsync)(projectDir, projectId);
         log_1.default.withTick(`Project successfully linked (ID: ${chalk_1.default.bold(projectId)}) (modified app.json)`);
     }
-    static async initializeWithExplicitIDAsync(projectId, projectDir, { force, nonInteractive }) {
+    static async modifyExpoConfigAsync(projectDir, modifications) {
+        const result = await (0, config_1.modifyConfigAsync)(projectDir, modifications);
+        switch (result.type) {
+            case 'success':
+                break;
+            case 'warn': {
+                log_1.default.warn();
+                log_1.default.warn(`Warning: Your project uses dynamic app configuration, and cannot be automatically modified.`);
+                log_1.default.warn(chalk_1.default.dim('https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs'));
+                log_1.default.warn();
+                log_1.default.warn(`To complete the setup process, add the following in your ${chalk_1.default.bold((0, config_1.getProjectConfigDescription)(projectDir))}:`);
+                log_1.default.warn();
+                log_1.default.warn(chalk_1.default.bold(JSON.stringify(modifications, null, 2)));
+                log_1.default.warn();
+                throw new Error(result.message);
+            }
+            case 'fail':
+                throw new Error(result.message);
+            default:
+                throw new Error('Unexpected result type from modifyConfigAsync');
+        }
+    }
+    static async ensureOwnerSlugConsistencyAsync(graphqlClient, projectId, projectDir, { force, nonInteractive }) {
+        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
+        const appForProjectId = await AppQuery_1.AppQuery.byIdAsync(graphqlClient, projectId);
+        const correctOwner = appForProjectId.ownerAccount.name;
+        const correctSlug = appForProjectId.slug;
+        if (exp.owner && exp.owner !== correctOwner) {
+            if (force) {
+                await this.modifyExpoConfigAsync(projectDir, { owner: correctOwner });
+            }
+            else {
+                const message = `Project owner (${correctOwner}) does not match the value configured in the "owner" field (${exp.owner}).`;
+                if (nonInteractive) {
+                    throw new Error(`Project config error: ${message} Use --force flag to overwrite.`);
+                }
+                const confirm = await (0, prompts_1.confirmAsync)({
+                    message: `${message}. Do you wish to overwrite it?`,
+                });
+                if (!confirm) {
+                    throw new Error('Aborting');
+                }
+                await this.modifyExpoConfigAsync(projectDir, { owner: correctOwner });
+            }
+        }
+        else if (!exp.owner) {
+            await this.modifyExpoConfigAsync(projectDir, { owner: correctOwner });
+        }
+        if (exp.slug && exp.slug !== correctSlug) {
+            if (force) {
+                await this.modifyExpoConfigAsync(projectDir, { slug: correctSlug });
+            }
+            else {
+                const message = `Project slug (${correctSlug}) does not match the value configured in the "slug" field (${exp.slug}).`;
+                if (nonInteractive) {
+                    throw new Error(`Project config error: ${message} Use --force flag to overwrite.`);
+                }
+                const confirm = await (0, prompts_1.confirmAsync)({
+                    message: `${message}. Do you wish to overwrite it?`,
+                });
+                if (!confirm) {
+                    throw new Error('Aborting');
+                }
+                await this.modifyExpoConfigAsync(projectDir, { slug: correctSlug });
+            }
+        }
+        else if (!exp.slug) {
+            await this.modifyExpoConfigAsync(projectDir, { slug: correctSlug });
+        }
+    }
+    static async setExplicitIDAsync(projectId, projectDir, { force, nonInteractive }) {
         var _c, _d;
         const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
         const existingProjectId = (_d = (_c = exp.extra) === null || _c === void 0 ? void 0 : _c.eas) === null || _d === void 0 ? void 0 : _d.projectId;
@@ -46,12 +118,21 @@ class ProjectInit extends EasCommand_1.default {
                 message: `Project is already linked to a different ID: ${chalk_1.default.bold(existingProjectId)}. Do you wish to overwrite it?`,
             });
             if (!confirm) {
-                log_1.default.log('Aborting');
-                return;
+                throw new Error('Aborting');
             }
             await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, projectId);
         }
     }
+    static async initializeWithExplicitIDAsync(graphqlClient, projectId, projectDir, { force, nonInteractive }) {
+        await this.setExplicitIDAsync(projectId, projectDir, {
+            force,
+            nonInteractive,
+        });
+        await this.ensureOwnerSlugConsistencyAsync(graphqlClient, projectId, projectDir, {
+            force,
+            nonInteractive,
+        });
+    }
     static async initializeWithInteractiveSelectionAsync(graphqlClient, actor, projectDir) {
         var _c, _d, _e;
         const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
@@ -141,7 +222,10 @@ class ProjectInit extends EasCommand_1.default {
         const { flags: { id, force, 'non-interactive': nonInteractive }, } = await this.parse(ProjectInit);
         const { loggedIn: { actor, graphqlClient }, projectDir, } = await this.getContextAsync(ProjectInit, { nonInteractive });
         if (id) {
-            await ProjectInit.initializeWithExplicitIDAsync(id, projectDir, { force, nonInteractive });
+            await ProjectInit.initializeWithExplicitIDAsync(graphqlClient, id, projectDir, {
+                force,
+                nonInteractive,
+            });
         }
         else {
             await ProjectInit.initializeWithInteractiveSelectionAsync(graphqlClient, actor, projectDir);

package/build/commands/secret/create.js

@@ -91,7 +91,7 @@ class EnvironmentSecretCreate extends EasCommand_1.default {
                 // eslint-disable-next-line async-protect/async-suffix
                 validate: async (secretValue) => {
                     if (!secretValue) {
-                        return 'Secret value may not be empty.';
+                        return validationMessage;
                     }
                     if (secretType === EnvironmentSecret_1.SecretType.FILE) {
                         const secretFilePath = path_1.default.resolve(secretValue);
@@ -126,10 +126,10 @@ class EnvironmentSecretCreate extends EasCommand_1.default {
                 throw new Error(`Could not create secret with name ${name} on project with id ${projectId}`);
             }
             if (secretType === EnvironmentSecret_1.SecretType.STRING) {
-                log_1.default.withTick(`️Created a new secret ${chalk_1.default.bold(name)} with value ${chalk_1.default.bold(secretValue)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
+                log_1.default.withTick(`Created a new secret ${chalk_1.default.bold(name)} with value ${chalk_1.default.bold(secretValue)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
             }
             else {
-                log_1.default.withTick(`️Created a new secret ${chalk_1.default.bold(name)} from file ${chalk_1.default.bold(secretFilePath)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
+                log_1.default.withTick(`Created a new secret ${chalk_1.default.bold(name)} from file ${chalk_1.default.bold(secretFilePath)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
             }
         }
         else if (scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT) {
@@ -146,10 +146,10 @@ class EnvironmentSecretCreate extends EasCommand_1.default {
                 throw new Error(`Could not create secret with name ${name} on account with id ${ownerAccount.id}`);
             }
             if (secretType === EnvironmentSecret_1.SecretType.STRING) {
-                log_1.default.withTick(`️Created a new secret ${chalk_1.default.bold(name)} with value ${chalk_1.default.bold(secretValue)} on account ${chalk_1.default.bold(ownerAccount.name)}.`);
+                log_1.default.withTick(`Created a new secret ${chalk_1.default.bold(name)} with value ${chalk_1.default.bold(secretValue)} on account ${chalk_1.default.bold(ownerAccount.name)}.`);
             }
             else {
-                log_1.default.withTick(`️Created a new secret ${chalk_1.default.bold(name)} from file ${chalk_1.default.bold(secretFilePath)} on account ${chalk_1.default.bold(ownerAccount.name)}.`);
+                log_1.default.withTick(`Created a new secret ${chalk_1.default.bold(name)} from file ${chalk_1.default.bold(secretFilePath)} on account ${chalk_1.default.bold(ownerAccount.name)}.`);
             }
         }
     }

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

@@ -0,0 +1,16 @@
+import EasCommand from '../../commandUtils/EasCommand';
+import { EnvironmentSecretScope } from '../../graphql/queries/EnvironmentSecretsQuery';
+export default class EnvironmentSecretPush extends EasCommand {
+    static description: string;
+    static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        scope: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentSecretScope>;
+        'env-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    static contextDefinition: {
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
+    runAsync(): Promise<void>;
+}

package/build/commands/secret/push.js

@@ -0,0 +1,149 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
+const generated_1 = require("../../graphql/generated");
+const EnvironmentSecretMutation_1 = require("../../graphql/mutations/EnvironmentSecretMutation");
+const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
+const log_1 = tslib_1.__importDefault(require("../../log"));
+const ora_1 = require("../../ora");
+const projectUtils_1 = require("../../project/projectUtils");
+const prompts_1 = require("../../prompts");
+const intersection_1 = tslib_1.__importDefault(require("../../utils/expodash/intersection"));
+class EnvironmentSecretPush extends EasCommand_1.default {
+    async runAsync() {
+        const { flags: { scope, force, 'env-file': maybeEnvFilePath, 'non-interactive': nonInteractive }, } = await this.parse(EnvironmentSecretPush);
+        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(EnvironmentSecretPush, {
+            nonInteractive,
+        });
+        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId);
+        const ownerAccount = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
+        const envFilePath = await resolveEnvFilePathAsync(maybeEnvFilePath, nonInteractive);
+        if (!(await fs_extra_1.default.pathExists(envFilePath))) {
+            throw new Error(`File "${envFilePath}" does not exist`);
+        }
+        const newSecrets = dotenv_1.default.parse(await fs_extra_1.default.readFile(envFilePath));
+        await ensureSecretsDontExistOnServerAsync(graphqlClient, { projectId, scope, force }, newSecrets);
+        await createSecretsAsync(graphqlClient, {
+            scope,
+            accountId: ownerAccount.id,
+            accountName: ownerAccount.name,
+            projectId,
+            projectDisplayName,
+        }, newSecrets);
+        log_1.default.withTick(`Created the following secrets on ${scope} ${chalk_1.default.bold(scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT ? ownerAccount.name : projectDisplayName)}:`);
+        for (const secretName of Object.keys(newSecrets)) {
+            log_1.default.log(`- ${secretName}`);
+        }
+    }
+}
+exports.default = EnvironmentSecretPush;
+_a = EnvironmentSecretPush;
+EnvironmentSecretPush.description = 'read environment secrets from env file and store on the server';
+EnvironmentSecretPush.flags = {
+    scope: core_1.Flags.enum({
+        description: 'Scope for the secrets',
+        options: [EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT, EnvironmentSecretsQuery_1.EnvironmentSecretScope.PROJECT],
+        default: EnvironmentSecretsQuery_1.EnvironmentSecretScope.PROJECT,
+    }),
+    'env-file': core_1.Flags.string({
+        description: 'Env file with secrets',
+    }),
+    force: core_1.Flags.boolean({
+        description: 'Delete and recreate existing secrets',
+        default: false,
+    }),
+    ...flags_1.EASNonInteractiveFlag,
+};
+EnvironmentSecretPush.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+    ..._a.ContextOptions.LoggedIn,
+};
+async function resolveEnvFilePathAsync(maybeEnvFilePath, nonInteractive) {
+    if (maybeEnvFilePath) {
+        return maybeEnvFilePath;
+    }
+    const validationMessage = 'Env file must be passed.';
+    if (nonInteractive) {
+        throw new Error(validationMessage);
+    }
+    const { envFilePath } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'envFilePath',
+        message: 'Path to the env file with secrets:',
+        // eslint-disable-next-line async-protect/async-suffix
+        validate: async (secretValueRaw) => {
+            if (!secretValueRaw) {
+                return validationMessage;
+            }
+            const envFilePath = path_1.default.resolve(secretValueRaw);
+            if (!(await fs_extra_1.default.pathExists(envFilePath))) {
+                return `File "${envFilePath}" does not exist.`;
+            }
+            return true;
+        },
+    });
+    return envFilePath;
+}
+async function ensureSecretsDontExistOnServerAsync(graphqlClient, { projectId, scope, force }, secrets) {
+    const serverSecrets = await readAllSecretsFromServerAsync(graphqlClient, projectId, scope);
+    const commonSecretNames = findCommonSecretNames(serverSecrets, secrets);
+    if (commonSecretNames.length > 0) {
+        if (!force) {
+            log_1.default.log(`This ${scope} already has environment secrets with the following names:`);
+            for (const name of commonSecretNames) {
+                log_1.default.log(`- ${name}`);
+            }
+            log_1.default.error('Run with --force flag to proceed');
+            core_1.Errors.exit(1);
+        }
+        else {
+            const spinner = (0, ora_1.ora)('Deleting secrets already present on server...').start();
+            const commonSecretNameSet = new Set(commonSecretNames);
+            const commonServerSecrets = serverSecrets.filter(({ name }) => commonSecretNameSet.has(name));
+            await deleteSecretsAsync(graphqlClient, commonServerSecrets);
+            spinner.succeed();
+        }
+    }
+}
+async function readAllSecretsFromServerAsync(graphqlClient, projectId, scope) {
+    const { appSecrets, accountSecrets } = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.byAppIdAsync(graphqlClient, projectId);
+    return scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT ? accountSecrets : appSecrets;
+}
+function findCommonSecretNames(serverSecrets, newSecrets) {
+    const serverSecretKeys = serverSecrets.map(({ name }) => name);
+    const newSecretKeys = Object.keys(newSecrets);
+    const commonKeys = (0, intersection_1.default)(serverSecretKeys, newSecretKeys);
+    return commonKeys;
+}
+async function deleteSecretsAsync(graphqlClient, secrets) {
+    const promises = secrets.map(secret => EnvironmentSecretMutation_1.EnvironmentSecretMutation.deleteAsync(graphqlClient, secret.id));
+    await Promise.all(promises);
+}
+async function createSecretsAsync(graphqlClient, { scope, accountId, accountName, projectId, projectDisplayName, }, secrets) {
+    const promises = [];
+    const spinner = (0, ora_1.ora)(`Creating secrets on ${scope} ${chalk_1.default.bold(scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT ? accountName : projectDisplayName)}...`).start();
+    for (const [secretName, secretValue] of Object.entries(secrets)) {
+        if (scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT) {
+            promises.push(EnvironmentSecretMutation_1.EnvironmentSecretMutation.createForAccountAsync(graphqlClient, { name: secretName, value: secretValue, type: generated_1.EnvironmentSecretType.String }, accountId));
+        }
+        else {
+            promises.push(EnvironmentSecretMutation_1.EnvironmentSecretMutation.createForAppAsync(graphqlClient, { name: secretName, value: secretValue, type: generated_1.EnvironmentSecretType.String }, projectId));
+        }
+    }
+    try {
+        await Promise.all(promises);
+        spinner.succeed();
+    }
+    catch (err) {
+        spinner.fail();
+        throw err;
+    }
+}

package/build/commands/submit.d.ts

@@ -14,9 +14,10 @@ export default class Submit extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
+        analytics: import("../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../commandUtils/context/ProjectDirContextField").default;
-        projectConfig: import("../commandUtils/context/ProjectConfigContextField").default;
         loggedIn: import("../commandUtils/context/LoggedInContextField").default;
+        projectConfig: import("../commandUtils/context/ProjectConfigContextField").default;
     };
     runAsync(): Promise<void>;
     private sanitizeFlags;

package/build/commands/submit.js

@@ -18,7 +18,7 @@ const statuspageService_1 = require("../utils/statuspageService");
 class Submit extends EasCommand_1.default {
     async runAsync() {
         const { flags: rawFlags } = await this.parse(Submit);
-        const { loggedIn: { actor, graphqlClient }, projectConfig: { exp, projectId, projectDir }, } = await this.getContextAsync(Submit, {
+        const { loggedIn: { actor, graphqlClient }, projectConfig: { exp, projectId, projectDir }, analytics, } = await this.getContextAsync(Submit, {
             nonInteractive: false,
         });
         const flags = this.sanitizeFlags(rawFlags);
@@ -42,6 +42,7 @@ class Submit extends EasCommand_1.default {
                 nonInteractive: flagsWithPlatform.nonInteractive,
                 actor,
                 graphqlClient,
+                analytics,
                 exp,
                 projectId,
             });
@@ -140,4 +141,5 @@ Submit.contextDefinition = {
     ..._a.ContextOptions.LoggedIn,
     ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.ProjectDir,
+    ..._a.ContextOptions.Analytics,
 };

package/build/commands/update/index.js

@@ -114,14 +114,14 @@ class UpdatePublish extends EasCommand_1.default {
         }
         if (!hasExpoUpdates) {
             const install = await (0, prompts_1.confirmAsync)({
-                message: `You are creating an update which requires ${chalk_1.default.bold('expo-updates')} to be installed in your app.\n  Do you want EAS CLI to install it for you?`,
+                message: (0, chalk_1.default) `The module {cyan expo-updates} must be installed to load EAS updates in-app. Install?`,
                 instructions: 'The command will abort unless you agree.',
             });
             if (install) {
                 await (0, projectUtils_1.installExpoUpdatesAsync)(projectDir);
             }
             else {
-                core_1.Errors.error(`Install ${chalk_1.default.bold('expo-updates')} manually and come back later.`, {
+                core_1.Errors.error(`Install ${chalk_1.default.bold('expo-updates')} and try again.`, {
                     exit: 1,
                 });
             }

package/build/commands/update/view.js

@@ -3,13 +3,11 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
 const UpdateQuery_1 = require("../../graphql/queries/UpdateQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const utils_1 = require("../../update/utils");
-const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const json_1 = require("../../utils/json");
 class UpdateView extends EasCommand_1.default {
     async runAsync() {
@@ -24,19 +22,8 @@ class UpdateView extends EasCommand_1.default {
             (0, json_1.printJsonOnlyOutput)(updateGroupDescription);
         }
         else {
-            const groupTable = new cli_table3_1.default({
-                head: [...utils_1.UPDATE_COLUMNS],
-                wordWrap: true,
-            });
             log_1.default.log(chalk_1.default.bold('Update group:'));
-            log_1.default.log((0, formatFields_1.default)([{ label: 'ID', value: updateGroupDescription.group }]));
-            groupTable.push([
-                updateGroupDescription.message,
-                updateGroupDescription.runtimeVersion,
-                updateGroupDescription.group,
-                updateGroupDescription.platforms,
-            ]);
-            log_1.default.log(groupTable.toString());
+            log_1.default.log((0, utils_1.formatUpdateGroup)(updateGroupDescription));
         }
     }
 }

package/build/credentials/android/actions/CreateKeystore.js

@@ -16,19 +16,19 @@ class CreateKeystore {
             throw new Error(`New keystore cannot be created in non-interactive mode.`);
         }
         const projectId = ctx.projectId;
-        const keystore = await this.provideOrGenerateAsync(ctx.graphqlClient, projectId);
+        const keystore = await this.provideOrGenerateAsync(ctx.graphqlClient, ctx.analytics, projectId);
         const keystoreFragment = await ctx.android.createKeystoreAsync(ctx.graphqlClient, this.account, keystore);
         log_1.default.succeed('Created keystore');
         return keystoreFragment;
     }
-    async provideOrGenerateAsync(graphqlClient, projectId) {
+    async provideOrGenerateAsync(graphqlClient, analytics, projectId) {
         const providedKeystore = await (0, promptForCredentials_1.askForUserProvidedAsync)(credentials_1.keystoreSchema);
         if (providedKeystore) {
             const providedKeystoreWithType = (0, keystoreNew_1.getKeystoreWithType)(providedKeystore);
             (0, keystoreNew_1.validateKeystore)(providedKeystoreWithType);
             return providedKeystoreWithType;
         }
-        return await (0, keystore_1.generateRandomKeystoreAsync)(graphqlClient, projectId);
+        return await (0, keystore_1.generateRandomKeystoreAsync)(graphqlClient, analytics, projectId);
     }
 }
 exports.CreateKeystore = CreateKeystore;

package/build/credentials/android/utils/keystore.d.ts

@@ -1,4 +1,5 @@
+import { Analytics } from '../../../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { KeystoreWithType } from '../credentials';
 export declare function keytoolCommandExistsAsync(): Promise<boolean>;
-export declare function generateRandomKeystoreAsync(graphqlClient: ExpoGraphqlClient, projectId: string): Promise<KeystoreWithType>;
+export declare function generateRandomKeystoreAsync(graphqlClient: ExpoGraphqlClient, analytics: Analytics, projectId: string): Promise<KeystoreWithType>;

package/build/credentials/android/utils/keystore.js

@@ -8,7 +8,7 @@ const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const uuid_1 = require("uuid");
-const events_1 = require("../../../analytics/events");
+const AnalyticsManager_1 = require("../../../analytics/AnalyticsManager");
 const fetch_1 = tslib_1.__importDefault(require("../../../fetch"));
 const generated_1 = require("../../../graphql/generated");
 const KeystoreGenerationUrlMutation_1 = require("../../../graphql/mutations/KeystoreGenerationUrlMutation");
@@ -31,17 +31,17 @@ var KeystoreCreateStep;
     KeystoreCreateStep["Fail"] = "fail";
     KeystoreCreateStep["Success"] = "success";
 })(KeystoreCreateStep || (KeystoreCreateStep = {}));
-async function generateRandomKeystoreAsync(graphqlClient, projectId) {
+async function generateRandomKeystoreAsync(graphqlClient, analytics, projectId) {
     const keystoreData = {
         keystorePassword: crypto_1.default.randomBytes(16).toString('hex'),
         keyPassword: crypto_1.default.randomBytes(16).toString('hex'),
         keyAlias: crypto_1.default.randomBytes(16).toString('hex'),
     };
-    return await createKeystoreAsync(graphqlClient, keystoreData, projectId);
+    return await createKeystoreAsync(graphqlClient, analytics, keystoreData, projectId);
 }
 exports.generateRandomKeystoreAsync = generateRandomKeystoreAsync;
-async function createKeystoreAsync(graphqlClient, keystoreParams, projectId) {
-    events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
+async function createKeystoreAsync(graphqlClient, analytics, keystoreParams, projectId) {
+    analytics.logEvent(AnalyticsManager_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
         project_id: projectId,
         step: KeystoreCreateStep.Attempt,
         type: generated_1.AndroidKeystoreType.Jks,
@@ -63,7 +63,7 @@ async function createKeystoreAsync(graphqlClient, keystoreParams, projectId) {
                 showKeytoolDetectionMsg: !localAttempt,
             });
         }
-        events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
+        analytics.logEvent(AnalyticsManager_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
             project_id: projectId,
             step: KeystoreCreateStep.Success,
             type: generated_1.AndroidKeystoreType.Jks,
@@ -71,7 +71,7 @@ async function createKeystoreAsync(graphqlClient, keystoreParams, projectId) {
         return keystore;
     }
     catch (error) {
-        events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
+        analytics.logEvent(AnalyticsManager_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
             project_id: projectId,
             step: KeystoreCreateStep.Fail,
             reason: error.message,

package/build/credentials/context.d.ts

@@ -1,6 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
 import { EasJson } from '@expo/eas-json';
+import { Analytics } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
@@ -19,6 +20,7 @@ export declare class CredentialsContext {
     readonly projectDir: string;
     readonly user: Actor;
     readonly graphqlClient: ExpoGraphqlClient;
+    readonly analytics: Analytics;
     readonly easJsonCliConfig?: EasJson['cli'];
     private shouldAskAuthenticateAppStore;
     private projectInfo;
@@ -29,6 +31,7 @@ export declare class CredentialsContext {
         projectDir: string;
         user: Actor;
         graphqlClient: ExpoGraphqlClient;
+        analytics: Analytics;
         env?: Env;
     });
     static getExpoConfigInProject(projectDir: string, { env }?: {

package/build/credentials/context.js

@@ -22,6 +22,7 @@ class CredentialsContext {
         this.projectDir = options.projectDir;
         this.user = options.user;
         this.graphqlClient = options.graphqlClient;
+        this.analytics = options.analytics;
         this.nonInteractive = (_a = options.nonInteractive) !== null && _a !== void 0 ? _a : false;
         this.projectInfo = options.projectInfo;
     }

package/build/credentials/ios/actions/AscApiKeyUtils.js

@@ -71,7 +71,7 @@ async function provideOrGenerateAscApiKeyAsync(ctx, purpose) {
 exports.provideOrGenerateAscApiKeyAsync = provideOrGenerateAscApiKeyAsync;
 async function generateAscApiKeyAsync(ctx, purpose) {
     await ctx.appStore.ensureAuthenticatedAsync();
-    const ascApiKey = await ctx.appStore.createAscApiKeyAsync({
+    const ascApiKey = await ctx.appStore.createAscApiKeyAsync(ctx.analytics, {
         nickname: getAscApiKeyName(purpose),
     });
     return await getMinimalAscApiKeyAsync(ascApiKey);

package/build/credentials/ios/appstore/AppStoreApi.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
 import { ProfileType } from '@expo/app-store';
+import { Analytics } from '../../../analytics/AnalyticsManager';
 import { AscApiKey, AscApiKeyInfo, DistributionCertificate, DistributionCertificateStoreInfo, ProvisioningProfile, ProvisioningProfileStoreInfo, PushKey, PushKeyStoreInfo } from './Credentials.types';
 import { Options as AuthenticateOptions } from './authenticate';
 import { AuthCtx, AuthenticationMode, UserAuthCtx } from './authenticateTypes';
@@ -26,7 +27,7 @@ export default class AppStoreApi {
     createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string, profileType: ProfileType): Promise<ProvisioningProfile>;
     listAscApiKeysAsync(): Promise<AscApiKeyInfo[]>;
     getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo | null>;
-    createAscApiKeyAsync({ nickname }: {
+    createAscApiKeyAsync(analytics: Analytics, { nickname }: {
         nickname: string;
     }): Promise<AscApiKey>;
     revokeAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo>;

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

@@ -93,9 +93,9 @@ class AppStoreApi {
         const userCtx = await this.ensureUserAuthenticatedAsync();
         return await (0, ascApiKey_1.getAscApiKeyAsync)(userCtx, keyId);
     }
-    async createAscApiKeyAsync({ nickname }) {
+    async createAscApiKeyAsync(analytics, { nickname }) {
         const userCtx = await this.ensureUserAuthenticatedAsync();
-        return await (0, ascApiKey_1.createAscApiKeyAsync)(userCtx, { nickname });
+        return await (0, ascApiKey_1.createAscApiKeyAsync)(analytics, userCtx, { nickname });
     }
     async revokeAscApiKeyAsync(keyId) {
         const userCtx = await this.ensureUserAuthenticatedAsync();

package/build/credentials/ios/appstore/ascApiKey.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
 import { ApiKey, ApiKeyProps } from '@expo/apple-utils';
+import { Analytics } from '../../../analytics/AnalyticsManager';
 import { AscApiKey, AscApiKeyInfo } from './Credentials.types';
 import { AuthCtx, UserAuthCtx } from './authenticateTypes';
 /**
@@ -18,7 +19,7 @@ export declare function getAscApiKeyAsync(userAuthCtx: UserAuthCtx, keyId: strin
  * the resource does not exist. We retry with exponential backoff until the key propagates and
  * is available for download.
  * */
-export declare function downloadWithRetryAsync(key: ApiKey, { minTimeout, retries, factor, }?: {
+export declare function downloadWithRetryAsync(analytics: Analytics, key: ApiKey, { minTimeout, retries, factor, }?: {
     minTimeout?: number;
     retries?: number;
     factor?: number;
@@ -27,7 +28,7 @@ export declare function downloadWithRetryAsync(key: ApiKey, { minTimeout, retrie
  * Create an App Store Connect API Key.
  * **Does not support App Store Connect API (CI).**
  */
-export declare function createAscApiKeyAsync(userAuthCtx: UserAuthCtx, { nickname, allAppsVisible, roles, keyType, }: Partial<Pick<ApiKeyProps, 'nickname' | 'roles' | 'allAppsVisible' | 'keyType'>>): Promise<AscApiKey>;
+export declare function createAscApiKeyAsync(analytics: Analytics, userAuthCtx: UserAuthCtx, { nickname, allAppsVisible, roles, keyType, }: Partial<Pick<ApiKeyProps, 'nickname' | 'roles' | 'allAppsVisible' | 'keyType'>>): Promise<AscApiKey>;
 /**
  * Revoke an App Store Connect API Key.
  * **Does not support App Store Connect API (CI).**