eas-cli 2.1.0 → 2.2.0

package/build/commands/secret/create.js

@@ -1,29 +1,33 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
+const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+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 EnvironmentSecretMutation_1 = require("../../graphql/mutations/EnvironmentSecretMutation");
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
+const EnvironmentSecret_1 = require("../../graphql/types/EnvironmentSecret");
 const log_1 = tslib_1.__importDefault(require("../../log"));
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const Account_1 = require("../../user/Account");
-const User_1 = require("../../user/User");
-const actions_1 = require("../../user/actions");
 class EnvironmentSecretCreate extends EasCommand_1.default {
     async runAsync() {
-        const actor = await (0, actions_1.ensureLoggedInAsync)();
-        let { flags: { name, value: secretValue, scope, force }, } = await this.parse(EnvironmentSecretCreate);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const accountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        const { slug } = exp;
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
+        let { flags: { name, value: secretValue, scope, force, type: secretType, 'non-interactive': nonInteractive, }, } = await this.parse(EnvironmentSecretCreate);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(EnvironmentSecretCreate, {
+            nonInteractive,
+        });
+        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(projectId);
+        const ownerAccount = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(projectId);
         if (!scope) {
             const validationMessage = 'Secret scope may not be empty.';
+            if (nonInteractive) {
+                throw new Error(validationMessage);
+            }
             ({ scope } = await (0, prompts_1.promptAsync)({
                 type: 'select',
                 name: 'scope',
@@ -36,13 +40,17 @@ class EnvironmentSecretCreate extends EasCommand_1.default {
             }));
         }
         if (!name) {
+            const validationMessage = 'Secret name may not be empty.';
+            if (nonInteractive) {
+                throw new Error(validationMessage);
+            }
             ({ name } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'name',
                 message: `Secret name:`,
                 validate: value => {
                     if (!value) {
-                        return 'Secret name may not be empty.';
+                        return validationMessage;
                     }
                     // this validation regex here is just to shorten the feedback loop
                     // the source of truth is in www's EnvironmentSecretValidator class
@@ -53,59 +61,100 @@ class EnvironmentSecretCreate extends EasCommand_1.default {
                 },
             }));
             if (!name) {
-                throw new Error('Secret name may not be empty.');
+                throw new Error(validationMessage);
             }
         }
+        if (!secretType) {
+            if (nonInteractive) {
+                throw new Error('Secret type may not be empty in non-interactive mode');
+            }
+            secretType = await (0, prompts_1.selectAsync)('Select secret type', [
+                {
+                    title: 'string',
+                    value: EnvironmentSecret_1.SecretType.STRING,
+                },
+                {
+                    title: 'file',
+                    value: EnvironmentSecret_1.SecretType.FILE,
+                },
+            ]);
+        }
         if (!secretValue) {
             const validationMessage = 'Secret value may not be empty.';
+            if (nonInteractive) {
+                throw new Error(validationMessage);
+            }
             ({ secretValue } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'secretValue',
-                message: 'Secret value:',
-                validate: value => (value ? true : validationMessage),
+                message: secretType === EnvironmentSecret_1.SecretType.STRING ? 'Secret value:' : 'Local file path:',
+                // eslint-disable-next-line async-protect/async-suffix
+                validate: async (secretValue) => {
+                    if (!secretValue) {
+                        return 'Secret value may not be empty.';
+                    }
+                    if (secretType === EnvironmentSecret_1.SecretType.FILE) {
+                        const secretFilePath = path_1.default.resolve(secretValue);
+                        if (!(await fs_extra_1.default.pathExists(secretFilePath))) {
+                            return `File "${secretValue}" does not exist.`;
+                        }
+                    }
+                    return true;
+                },
             }));
-            if (!secretValue) {
-                throw new Error(validationMessage);
+        }
+        (0, assert_1.default)(secretValue);
+        let secretFilePath;
+        if (secretType === EnvironmentSecret_1.SecretType.FILE) {
+            secretFilePath = path_1.default.resolve(secretValue);
+            if (!(await fs_extra_1.default.pathExists(secretFilePath))) {
+                throw new Error(`File "${secretValue}" does not exist`);
             }
         }
         if (scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.PROJECT) {
             if (force) {
-                const existingSecrets = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.byAppIdAsync(projectId);
+                const { appSecrets: existingSecrets } = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.byAppIdAsync(projectId);
                 const existingSecret = existingSecrets.find(secret => secret.name === name);
                 if (existingSecret) {
                     await EnvironmentSecretMutation_1.EnvironmentSecretMutation.deleteAsync(existingSecret.id);
-                    log_1.default.withTick(`Deleting existing secret ${chalk_1.default.bold(name)} on project ${chalk_1.default.bold(`@${accountName}/${slug}`)}.`);
+                    log_1.default.withTick(`Deleting existing secret ${chalk_1.default.bold(name)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
                 }
             }
-            const secret = await EnvironmentSecretMutation_1.EnvironmentSecretMutation.createForAppAsync({ name, value: secretValue }, projectId);
+            const secret = await EnvironmentSecretMutation_1.EnvironmentSecretMutation.createForAppAsync({ name, value: secretValue, type: EnvironmentSecret_1.SecretTypeToEnvironmentSecretType[secretType] }, projectId);
             if (!secret) {
                 throw new Error(`Could not create secret with name ${name} on project with id ${projectId}`);
             }
-            log_1.default.withTick(`️Created a new secret ${chalk_1.default.bold(name)} on project ${chalk_1.default.bold(`@${accountName}/${slug}`)}.`);
+            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)}.`);
+            }
+            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)}.`);
+            }
         }
         else if (scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT) {
-            const ownerAccount = (0, Account_1.findAccountByName)(actor.accounts, accountName);
-            if (!ownerAccount) {
-                log_1.default.warn(`Your account (${(0, User_1.getActorDisplayName)(actor)}) doesn't have access to the ${chalk_1.default.bold(accountName)} account`);
-                return;
-            }
             if (force) {
-                const existingSecrets = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.byAccountNameAsync(ownerAccount.name);
+                const { accountSecrets: existingSecrets } = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.byAppIdAsync(projectId);
                 const existingSecret = existingSecrets.find(secret => secret.name === name);
                 if (existingSecret) {
                     await EnvironmentSecretMutation_1.EnvironmentSecretMutation.deleteAsync(existingSecret.id);
                     log_1.default.withTick(`Deleting existing secret ${chalk_1.default.bold(name)} on account ${chalk_1.default.bold(ownerAccount.name)}.`);
                 }
             }
-            const secret = await EnvironmentSecretMutation_1.EnvironmentSecretMutation.createForAccountAsync({ name, value: secretValue }, ownerAccount.id);
+            const secret = await EnvironmentSecretMutation_1.EnvironmentSecretMutation.createForAccountAsync({ name, value: secretValue, type: EnvironmentSecret_1.SecretTypeToEnvironmentSecretType[secretType] }, ownerAccount.id);
             if (!secret) {
                 throw new Error(`Could not create secret with name ${name} on account with id ${ownerAccount.id}`);
             }
-            log_1.default.withTick(`️Created a new secret ${chalk_1.default.bold(name)} on account ${chalk_1.default.bold(ownerAccount.name)}.`);
+            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)}.`);
+            }
+            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)}.`);
+            }
         }
     }
 }
 exports.default = EnvironmentSecretCreate;
+_a = EnvironmentSecretCreate;
 EnvironmentSecretCreate.description = 'create an environment secret on the current project or owner account';
 EnvironmentSecretCreate.flags = {
     scope: core_1.Flags.enum({
@@ -117,10 +166,18 @@ EnvironmentSecretCreate.flags = {
         description: 'Name of the secret',
     }),
     value: core_1.Flags.string({
-        description: 'Value of the secret',
+        description: 'Text value or path to a file to store in the secret',
+    }),
+    type: core_1.Flags.enum({
+        description: 'The type of secret',
+        options: [EnvironmentSecret_1.SecretType.STRING, EnvironmentSecret_1.SecretType.FILE],
     }),
     force: core_1.Flags.boolean({
         description: 'Delete and recreate existing secrets',
         default: false,
     }),
+    ...flags_1.EASNonInteractiveFlag,
+};
+EnvironmentSecretCreate.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

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

@@ -2,7 +2,11 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class EnvironmentSecretDelete extends EasCommand {
     static description: string;
     static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/secret/delete.js

@@ -1,25 +1,27 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const EnvironmentSecretMutation_1 = require("../../graphql/mutations/EnvironmentSecretMutation");
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
-const expoConfig_1 = require("../../project/expoConfig");
-const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 class EnvironmentSecretDelete extends EasCommand_1.default {
     async runAsync() {
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        let { flags: { id }, } = await this.parse(EnvironmentSecretDelete);
+        let { flags: { id, 'non-interactive': nonInteractive }, } = await this.parse(EnvironmentSecretDelete);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(EnvironmentSecretDelete, {
+            nonInteractive,
+        });
         let secret;
         if (!id) {
             const validationMessage = 'You must select which secret to delete.';
-            const secrets = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
+            if (nonInteractive) {
+                throw new Error(validationMessage);
+            }
+            const secrets = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.allAsync(projectId);
             ({ secret } = await (0, prompts_1.promptAsync)({
                 type: 'autocomplete',
                 name: 'secret',
@@ -34,26 +36,33 @@ class EnvironmentSecretDelete extends EasCommand_1.default {
                 throw new Error(validationMessage);
             }
         }
-        log_1.default.addNewLineIfNone();
-        log_1.default.warn(`You are about to permanently delete secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id: "${id}".\nThis action is irreversible.`);
-        log_1.default.newLine();
-        const confirmed = await (0, prompts_1.toggleConfirmAsync)({
-            message: `Are you sure you wish to proceed?${(secret === null || secret === void 0 ? void 0 : secret.scope) === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT
-                ? ' This secret is applied across your whole account and may affect multiple apps.'
-                : ''}`,
-        });
-        if (!confirmed) {
-            log_1.default.error(`Canceled deletion of secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id: "${id}".`);
-            process.exit(1);
+        if (!nonInteractive) {
+            log_1.default.addNewLineIfNone();
+            log_1.default.warn(`You are about to permanently delete secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id: "${id}".\nThis action is irreversible.`);
+            log_1.default.newLine();
+            const confirmed = await (0, prompts_1.toggleConfirmAsync)({
+                message: `Are you sure you wish to proceed?${(secret === null || secret === void 0 ? void 0 : secret.scope) === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT
+                    ? ' This secret is applied across your whole account and may affect multiple apps.'
+                    : ''}`,
+            });
+            if (!confirmed) {
+                log_1.default.error(`Canceled deletion of secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id: "${id}".`);
+                process.exit(1);
+            }
         }
         await EnvironmentSecretMutation_1.EnvironmentSecretMutation.deleteAsync(id);
         log_1.default.withTick(`️Deleted secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id "${id}".`);
     }
 }
 exports.default = EnvironmentSecretDelete;
+_a = EnvironmentSecretDelete;
 EnvironmentSecretDelete.description = 'delete an environment secret by ID';
 EnvironmentSecretDelete.flags = {
     id: core_1.Flags.string({
         description: 'ID of the secret to delete',
     }),
+    ...flags_1.EASNonInteractiveFlag,
+};
+EnvironmentSecretDelete.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

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

@@ -1,5 +1,8 @@
 import EasCommand from '../../commandUtils/EasCommand';
 export default class EnvironmentSecretList extends EasCommand {
     static description: string;
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/secret/list.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -6,30 +7,35 @@ const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
 const dateformat_1 = tslib_1.__importDefault(require("dateformat"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
+const EnvironmentSecret_1 = require("../../graphql/types/EnvironmentSecret");
 const log_1 = tslib_1.__importDefault(require("../../log"));
-const expoConfig_1 = require("../../project/expoConfig");
-const projectUtils_1 = require("../../project/projectUtils");
 class EnvironmentSecretList extends EasCommand_1.default {
     async runAsync() {
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        if (!projectDir) {
-            throw new Error("Run this command inside your project's directory");
-        }
-        const secrets = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(EnvironmentSecretList, {
+            nonInteractive: true,
+        });
+        const secrets = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.allAsync(projectId);
         const table = new cli_table3_1.default({
-            head: ['Name', 'Scope', 'ID', 'Updated at'],
+            head: ['Name', 'Type', 'Scope', 'ID', 'Updated at'],
             wordWrap: true,
         });
         for (const secret of secrets) {
-            const { name, createdAt: updatedAt, scope, id } = secret;
-            table.push([name, scope, id, (0, dateformat_1.default)(updatedAt, 'mmm dd HH:MM:ss')]);
+            const { name, createdAt: updatedAt, scope, id, type } = secret;
+            table.push([
+                name,
+                EnvironmentSecret_1.EnvironmentSecretTypeToSecretType[type],
+                scope,
+                id,
+                (0, dateformat_1.default)(updatedAt, 'mmm dd HH:MM:ss'),
+            ]);
         }
         log_1.default.log((0, chalk_1.default) `{bold Secrets for this account and project:}`);
         log_1.default.log(table.toString());
     }
 }
 exports.default = EnvironmentSecretList;
+_a = EnvironmentSecretList;
 EnvironmentSecretList.description = 'list environment secrets available for your current app';
+EnvironmentSecretList.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+};

package/build/commands/submit.d.ts

@@ -13,6 +13,11 @@ export default class Submit extends EasCommand {
         wait: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
+    static contextDefinition: {
+        projectDir: import("../commandUtils/context/ProjectDirContextField").default;
+        projectConfig: import("../commandUtils/context/ProjectConfigContextField").default;
+        actor: import("../commandUtils/context/ActorContextField").default;
+    };
     runAsync(): Promise<void>;
     private sanitizeFlags;
     private ensurePlatformSelectedAsync;

package/build/commands/submit.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const eas_json_1 = require("@expo/eas-json");
@@ -9,8 +10,6 @@ const generated_1 = require("../graphql/generated");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const platform_1 = require("../platform");
-const expoConfig_1 = require("../project/expoConfig");
-const projectUtils_1 = require("../project/projectUtils");
 const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
 const urls_1 = require("../submit/utils/urls");
@@ -19,28 +18,31 @@ const statuspageService_1 = require("../utils/statuspageService");
 class Submit extends EasCommand_1.default {
     async runAsync() {
         const { flags: rawFlags } = await this.parse(Submit);
+        const { actor, projectConfig: { exp, projectId, projectDir }, } = await this.getContextAsync(Submit, {
+            nonInteractive: false,
+        });
         const flags = this.sanitizeFlags(rawFlags);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)([generated_1.StatuspageServiceName.EasSubmit]);
         const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
         const platforms = (0, platform_1.toPlatforms)(flagsWithPlatform.requestedPlatform);
         const submissionProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
-            easJsonReader: new eas_json_1.EasJsonReader(projectDir),
+            easJsonAccessor: new eas_json_1.EasJsonAccessor(projectDir),
             platforms,
             profileName: flagsWithPlatform.profile,
         });
         const submissions = [];
         for (const submissionProfile of submissionProfiles) {
+            // this command doesn't make use of env when getting the project config
             const ctx = await (0, context_1.createSubmissionContextAsync)({
                 platform: submissionProfile.platform,
                 projectDir,
-                projectId,
                 profile: submissionProfile.profile,
                 archiveFlags: flagsWithPlatform.archiveFlags,
                 nonInteractive: flagsWithPlatform.nonInteractive,
+                actor,
+                exp,
+                projectId,
             });
             if (submissionProfiles.length > 1) {
                 log_1.default.newLine();
@@ -91,6 +93,7 @@ class Submit extends EasCommand_1.default {
     }
 }
 exports.default = Submit;
+_a = Submit;
 Submit.description = 'submit app binary to App Store and/or Play Store';
 Submit.aliases = ['build:submit'];
 Submit.flags = {
@@ -99,6 +102,7 @@ Submit.flags = {
         options: ['android', 'ios', 'all'],
     }),
     profile: core_1.Flags.string({
+        char: 'e',
         description: 'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
     }),
     latest: core_1.Flags.boolean({
@@ -131,3 +135,8 @@ Submit.flags = {
         description: 'Run command in non-interactive mode',
     }),
 };
+Submit.contextDefinition = {
+    ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.ProjectConfig,
+    ..._a.ContextOptions.ProjectDir,
+};

package/build/commands/update/configure.d.ts

@@ -4,5 +4,8 @@ export default class UpdateConfigure extends EasCommand {
     static flags: {
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/update/configure.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
@@ -11,7 +12,6 @@ const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasComm
 const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const platform_1 = require("../../platform");
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const workflow_1 = require("../../project/workflow");
 const UpdatesModule_1 = require("../../update/android/UpdatesModule");
@@ -22,9 +22,10 @@ class UpdateConfigure extends EasCommand_1.default {
     async runAsync() {
         log_1.default.log('💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.');
         const { flags } = await this.parse(UpdateConfigure);
+        const { projectConfig: { projectId, exp, projectDir }, } = await this.getContextAsync(UpdateConfigure, {
+            nonInteractive: true,
+        });
         const platform = flags.platform;
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
         if (!(0, projectUtils_1.isExpoUpdatesInstalledOrAvailable)(projectDir, exp.sdkVersion)) {
             await (0, projectUtils_1.installExpoUpdatesAsync)(projectDir);
         }
@@ -40,17 +41,18 @@ class UpdateConfigure extends EasCommand_1.default {
                 android: androidWorkflow,
                 ios: iosWorkflow,
             },
+            projectId,
         });
         log_1.default.withTick(`Configured ${chalk_1.default.bold('app.json')} for EAS Update`);
         // configure native files for EAS Update
         if ([platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform) &&
             androidWorkflow === eas_build_job_1.Workflow.GENERIC) {
-            await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, updatedExp);
+            await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, updatedExp, projectId);
             log_1.default.withTick(`Configured ${chalk_1.default.bold('AndroidManifest.xml')} for EAS Update`);
         }
         if ([platform_1.RequestedPlatform.Ios, platform_1.RequestedPlatform.All].includes(platform) &&
             iosWorkflow === eas_build_job_1.Workflow.GENERIC) {
-            await (0, UpdatesModule_2.syncUpdatesConfigurationAsync)(projectDir, updatedExp);
+            await (0, UpdatesModule_2.syncUpdatesConfigurationAsync)(projectDir, updatedExp, projectId);
             log_1.default.withTick(`Configured ${chalk_1.default.bold('Expo.plist')} for EAS Update`);
         }
         log_1.default.addNewLineIfNone();
@@ -58,6 +60,7 @@ class UpdateConfigure extends EasCommand_1.default {
     }
 }
 exports.default = UpdateConfigure;
+_a = UpdateConfigure;
 UpdateConfigure.description = 'configure the project to support EAS Update';
 UpdateConfigure.flags = {
     platform: core_1.Flags.enum({
@@ -67,9 +70,12 @@ UpdateConfigure.flags = {
         default: 'all',
     }),
 };
-async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, workflows, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-    const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
+UpdateConfigure.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+};
+async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, workflows, projectId, }) {
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    // this command is non-interactive in the way it was designed
     const easUpdateURL = (0, api_1.getEASUpdateURL)(projectId);
     const updates = { ...exp.updates, url: easUpdateURL };
     const androidDefaultRuntimeVersion = workflows['android'] === eas_build_job_1.Workflow.GENERIC
@@ -78,8 +84,8 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
     const iosDefaultRuntimeVersion = workflows['ios'] === eas_build_job_1.Workflow.GENERIC
         ? DEFAULT_BARE_RUNTIME_VERSION
         : DEFAULT_MANAGED_RUNTIME_VERSION;
-    const newAndroidRuntimeVersion = (_c = (_b = (_a = exp.android) === null || _a === void 0 ? void 0 : _a.runtimeVersion) !== null && _b !== void 0 ? _b : exp.runtimeVersion) !== null && _c !== void 0 ? _c : androidDefaultRuntimeVersion;
-    const newIosRuntimeVersion = (_f = (_e = (_d = exp.ios) === null || _d === void 0 ? void 0 : _d.runtimeVersion) !== null && _e !== void 0 ? _e : exp.runtimeVersion) !== null && _f !== void 0 ? _f : iosDefaultRuntimeVersion;
+    const newAndroidRuntimeVersion = (_d = (_c = (_b = exp.android) === null || _b === void 0 ? void 0 : _b.runtimeVersion) !== null && _c !== void 0 ? _c : exp.runtimeVersion) !== null && _d !== void 0 ? _d : androidDefaultRuntimeVersion;
+    const newIosRuntimeVersion = (_g = (_f = (_e = exp.ios) === null || _e === void 0 ? void 0 : _e.runtimeVersion) !== null && _f !== void 0 ? _f : exp.runtimeVersion) !== null && _g !== void 0 ? _g : iosDefaultRuntimeVersion;
     let newConfig;
     let newConfigOnlyAddedValues;
     switch (platform) {
@@ -188,13 +194,13 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
         }
     }
     const result = await (0, config_1.modifyConfigAsync)(projectDir, newConfig);
-    const preexistingAndroidRuntimeVersion = (_h = (_g = exp.android) === null || _g === void 0 ? void 0 : _g.runtimeVersion) !== null && _h !== void 0 ? _h : exp.runtimeVersion;
-    const preexistingIosRuntimeVersion = (_k = (_j = exp.ios) === null || _j === void 0 ? void 0 : _j.runtimeVersion) !== null && _k !== void 0 ? _k : exp.runtimeVersion;
+    const preexistingAndroidRuntimeVersion = (_j = (_h = exp.android) === null || _h === void 0 ? void 0 : _h.runtimeVersion) !== null && _j !== void 0 ? _j : exp.runtimeVersion;
+    const preexistingIosRuntimeVersion = (_l = (_k = exp.ios) === null || _k === void 0 ? void 0 : _k.runtimeVersion) !== null && _l !== void 0 ? _l : exp.runtimeVersion;
     switch (result.type) {
         case 'success':
-            if ((_l = exp.updates) === null || _l === void 0 ? void 0 : _l.url) {
+            if ((_m = exp.updates) === null || _m === void 0 ? void 0 : _m.url) {
                 if (exp.updates.url !== easUpdateURL) {
-                    log_1.default.withTick(`Overwrote "${(_m = exp.updates) === null || _m === void 0 ? void 0 : _m.url}" with "${easUpdateURL}" for the updates.url value in app.json`);
+                    log_1.default.withTick(`Overwrote "${(_o = exp.updates) === null || _o === void 0 ? void 0 : _o.url}" with "${easUpdateURL}" for the updates.url value in app.json`);
                 }
             }
             else {
@@ -202,11 +208,11 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
             }
             if (!preexistingAndroidRuntimeVersion &&
                 [platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform)) {
-                log_1.default.withTick(`Set ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Android]} runtimeVersion to "${JSON.stringify((_p = (_o = newConfig.android) === null || _o === void 0 ? void 0 : _o.runtimeVersion) !== null && _p !== void 0 ? _p : newConfig.runtimeVersion)}" in app.json`);
+                log_1.default.withTick(`Set ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Android]} runtimeVersion to "${JSON.stringify((_q = (_p = newConfig.android) === null || _p === void 0 ? void 0 : _p.runtimeVersion) !== null && _q !== void 0 ? _q : newConfig.runtimeVersion)}" in app.json`);
             }
             if (!preexistingIosRuntimeVersion &&
                 [platform_1.RequestedPlatform.Ios, platform_1.RequestedPlatform.All].includes(platform)) {
-                log_1.default.withTick(`Set ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Ios]} runtimeVersion to "${JSON.stringify((_r = (_q = newConfig.ios) === null || _q === void 0 ? void 0 : _q.runtimeVersion) !== null && _r !== void 0 ? _r : newConfig.runtimeVersion)}" in app.json`);
+                log_1.default.withTick(`Set ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Ios]} runtimeVersion to "${JSON.stringify((_s = (_r = newConfig.ios) === null || _r === void 0 ? void 0 : _r.runtimeVersion) !== null && _s !== void 0 ? _s : newConfig.runtimeVersion)}" in app.json`);
             }
             break;
         case 'warn': {

package/build/commands/update/delete.d.ts

@@ -8,6 +8,7 @@ export default class UpdateDelete extends EasCommand {
     }[];
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/update/delete.js

@@ -1,10 +1,10 @@
 "use strict";
 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 graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const client_1 = require("../../graphql/client");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
@@ -24,11 +24,11 @@ async function deleteUpdateGroupAsync({ group, }) {
 }
 class UpdateDelete extends EasCommand_1.default {
     async runAsync() {
-        const { args: { groupId: group }, flags: { json: jsonFlag }, } = await this.parse(UpdateDelete);
+        const { args: { groupId: group }, flags: { json: jsonFlag, 'non-interactive': nonInteractive }, } = await this.parse(UpdateDelete);
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
-        else {
+        if (!nonInteractive) {
             const shouldAbort = await (0, prompts_1.confirmAsync)({
                 message: `🚨${chalk_1.default.red('CAUTION')}🚨\n\n` +
                     `${chalk_1.default.yellow(`This will delete all of the updates in group "${group}".`)} ${chalk_1.default.red('This is a permanent operation.')}\n\n` +
@@ -60,8 +60,5 @@ UpdateDelete.args = [
     },
 ];
 UpdateDelete.flags = {
-    json: core_1.Flags.boolean({
-        description: `Return a json with the group ID of the deleted updates.`,
-        default: false,
-    }),
+    ...flags_1.EasNonInteractiveAndJsonFlags,
 };