eas-cli 1.0.0 → 1.2.0

package/build/commands/branch/create.js

@@ -54,7 +54,7 @@ class BranchCreate extends EasCommand_1.default {
             ({ name } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'name',
-                message: 'Please name the branch:',
+                message: 'Provide a branch name:',
                 initial: (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
                     `branch-${Math.random().toString(36).substr(2, 4)}`,
                 validate: value => (value ? true : validationMessage),

package/build/commands/branch/delete.js

@@ -67,7 +67,7 @@ class BranchDelete extends EasCommand_1.default {
             ({ name } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'name',
-                message: 'Please enter the name of the branch to delete:',
+                message: 'Provide the name of the branch to delete:',
                 validate: value => (value ? true : validationMessage),
             }));
         }

package/build/commands/branch/rename.js

@@ -50,7 +50,7 @@ class BranchRename extends EasCommand_1.default {
             ({ currentName } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'currentName',
-                message: 'Please enter the current name of the branch to rename:',
+                message: "Provide the name of the branch you'd like to rename:",
                 validate: value => (value ? true : validationMessage),
             }));
         }
@@ -62,7 +62,7 @@ class BranchRename extends EasCommand_1.default {
             ({ newName } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'newName',
-                message: `Please rename ${currentName}`,
+                message: `Rename ${currentName}`,
                 validate: value => (value ? true : validationMessage),
             }));
         }

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

@@ -19,5 +19,6 @@ export default class Build extends EasCommand {
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     runAsync(): Promise<void>;
-    private sanitizeFlagsAsync;
+    private sanitizeFlags;
+    private ensurePlatformSelectedAsync;
 }

package/build/commands/build/index.js

@@ -6,21 +6,29 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
 const types_1 = require("../../build/types");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
 const json_1 = require("../../utils/json");
+const statuspageService_1 = require("../../utils/statuspageService");
 class Build extends EasCommand_1.default {
     async runAsync() {
         const { flags: rawFlags } = await this.parse(Build);
         if (rawFlags.json) {
             (0, json_1.enableJsonOutput)();
         }
-        const flags = await this.sanitizeFlagsAsync(rawFlags);
+        const flags = this.sanitizeFlags(rawFlags);
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(projectDir, flags);
+        if (!flags.localBuildOptions.enable) {
+            await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)(flags.autoSubmit
+                ? [generated_1.StatuspageServiceName.EasBuild, generated_1.StatuspageServiceName.EasSubmit]
+                : [generated_1.StatuspageServiceName.EasBuild]);
+        }
+        const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
+        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(projectDir, flagsWithPlatform);
     }
-    async sanitizeFlagsAsync(flags) {
+    sanitizeFlags(flags) {
         var _a, _b;
         const nonInteractive = flags['non-interactive'];
         if (!flags.local && flags.output) {
@@ -32,21 +40,10 @@ class Build extends EasCommand_1.default {
         if (flags.json && !nonInteractive) {
             core_1.Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
         }
-        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.platform);
-        if (flags.local) {
-            if (flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined) {
-                // TODO: implement this
-                core_1.Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
-            }
-            if (requestedPlatform === platform_1.RequestedPlatform.All) {
-                core_1.Errors.error('Builds for multiple platforms are not supported with flag --local', {
-                    exit: 1,
-                });
-            }
-            else if (process.platform !== 'darwin' && requestedPlatform === platform_1.RequestedPlatform.Ios) {
-                core_1.Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
-            }
-        }
+        const requestedPlatform = flags.platform &&
+            Object.values(platform_1.RequestedPlatform).includes(flags.platform.toLowerCase())
+            ? flags.platform.toLowerCase()
+            : undefined;
         if (flags['skip-credentials-check']) {
             log_1.default.warnDeprecatedFlag('skip-credentials-check', 'Build credentials validation is always skipped with the --non-interactive flag. You can also skip interactively.');
             log_1.default.newLine();
@@ -82,6 +79,27 @@ class Build extends EasCommand_1.default {
             message,
         };
     }
+    async ensurePlatformSelectedAsync(flags) {
+        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.requestedPlatform);
+        if (flags.localBuildOptions.enable) {
+            if (flags.autoSubmit) {
+                // TODO: implement this
+                core_1.Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
+            }
+            if (requestedPlatform === platform_1.RequestedPlatform.All) {
+                core_1.Errors.error('Builds for multiple platforms are not supported with flag --local', {
+                    exit: 1,
+                });
+            }
+            else if (process.platform !== 'darwin' && requestedPlatform === platform_1.RequestedPlatform.Ios) {
+                core_1.Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+            }
+        }
+        return {
+            ...flags,
+            requestedPlatform,
+        };
+    }
 }
 exports.default = Build;
 Build.description = 'start a build';

package/build/commands/channel/create.js

@@ -57,7 +57,7 @@ class ChannelCreate extends EasCommand_1.default {
             ({ name: channelName } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'name',
-                message: 'Please name the channel:',
+                message: 'Provide a channel name:',
                 validate: value => (value ? true : validationMessage),
             }));
         }

package/build/commands/channel/delete.js

@@ -35,7 +35,7 @@ class ChannelDelete extends EasCommand_1.default {
             name = (await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'name',
-                message: 'Please enter the name of the channel to delete:',
+                message: 'Provide the name of the channel to delete:',
                 validate: (value) => (value ? true : 'Channel name may not be empty.'),
             })).name;
         }

package/build/commands/channel/edit.js

@@ -74,7 +74,7 @@ class ChannelEdit extends EasCommand_1.default {
         const channelName = (_a = args.name) !== null && _a !== void 0 ? _a : (await promptForChannelAsync());
         const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
         if (existingChannel.updateBranches.length > 1) {
-            throw new Error('There is a rollout in progress. Please manage it with "channel:rollout" instead.');
+            throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
         }
         const branchName = (_b = flags.branch) !== null && _b !== void 0 ? _b : (await promptForBranchAsync());
         const branch = await BranchQuery_1.BranchQuery.getBranchByNameAsync({
@@ -82,7 +82,7 @@ class ChannelEdit extends EasCommand_1.default {
             name: branchName,
         });
         if (!branch) {
-            throw new Error(`Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
+            throw new Error(`Could not find a branch named "${branchName}". Check what branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
         }
         const channel = await updateChannelBranchMappingAsync({
             channelId: existingChannel.id,
@@ -125,7 +125,7 @@ async function promptForChannelAsync() {
     const { name } = await (0, prompts_1.promptAsync)({
         type: 'text',
         name: 'name',
-        message: 'Please enter the name of the channel to edit:',
+        message: 'Provide the name of the channel to edit:',
         validate: value => (value ? true : 'The channel name may not be empty.'),
     });
     return name;

package/build/commands/channel/rollout.js

@@ -48,7 +48,7 @@ async function startRolloutAsync({ channelName, branchName, percent, jsonFlag, p
         name: branchName,
     });
     if (!branch) {
-        throw new Error(`Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
+        throw new Error(`Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
     }
     const oldBranchId = currentBranchMapping.data[0].branchId;
     if (branch.id === oldBranchId) {
@@ -114,7 +114,7 @@ async function endRolloutAsync({ channelName, branchName, jsonFlag, projectId, c
             name: branchName,
         });
         if (!branch) {
-            throw new Error(`Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
+            throw new Error(`Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
         }
         switch (branch.id) {
             case newBranch.id:
@@ -176,7 +176,7 @@ class ChannelRollout extends EasCommand_1.default {
             channelName: channelName,
         });
         if (!channel) {
-            throw new Error(`Could not find a channel named "${channelName}". Please check what channels exist on this project with ${chalk_1.default.bold('eas channel:list')}.`);
+            throw new Error(`Could not find a channel named "${channelName}". Check which channels exist on this project with ${chalk_1.default.bold('eas channel:list')}.`);
         }
         const { branchMapping: currentBranchMapping, isRollout } = (0, view_1.getBranchMapping)(channel.branchMapping);
         if (currentBranchMapping.data.length === 0) {

package/build/commands/channel/view.js

@@ -119,7 +119,7 @@ class ChannelView extends EasCommand_1.default {
             ({ name: channelName } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'name',
-                message: 'Please name the channel:',
+                message: 'Provide a channel name:',
                 validate: value => (value ? true : validationMessage),
             }));
         }

package/build/commands/credentials.d.ts

@@ -1,5 +1,8 @@
 import EasCommand from '../commandUtils/EasCommand';
 export default class Credentials extends EasCommand {
     static description: string;
+    static flags: {
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/credentials.js

@@ -1,12 +1,17 @@
 "use strict";
 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 SelectPlatform_1 = require("../credentials/manager/SelectPlatform");
 class Credentials extends EasCommand_1.default {
     async runAsync() {
-        await new SelectPlatform_1.SelectPlatform().runAsync();
+        const { flags } = await this.parse(Credentials);
+        await new SelectPlatform_1.SelectPlatform(flags.platform).runAsync();
     }
 }
 exports.default = Credentials;
 Credentials.description = 'manage credentials';
+Credentials.flags = {
+    platform: core_1.Flags.enum({ char: 'p', options: ['android', 'ios'] }),
+};

package/build/commands/project/init.js

@@ -15,7 +15,9 @@ class ProjectInit extends EasCommand_1.default {
             log_1.default.error(`app.json is already linked to project with ID: ${chalk_1.default.bold((_d = (_c = exp.extra) === null || _c === void 0 ? void 0 : _c.eas) === null || _d === void 0 ? void 0 : _d.projectId)}`);
             return;
         }
-        await (0, projectUtils_1.setProjectIdAsync)(projectDir);
+        const projectId = await (0, projectUtils_1.fetchProjectIdFromServerAsync)(exp);
+        await (0, projectUtils_1.saveProjectIdToAppConfigAsync)(projectDir, projectId);
+        log_1.default.withTick(`Linked app.json to project with ID ${chalk_1.default.bold(projectId)}`);
     }
 }
 exports.default = ProjectInit;

package/build/commands/secret/list.js

@@ -16,7 +16,7 @@ class EnvironmentSecretList extends EasCommand_1.default {
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
         if (!projectDir) {
-            throw new Error("Please run this command inside your project's directory");
+            throw new Error("Run this command inside your project's directory");
         }
         const secrets = await EnvironmentSecretsQuery_1.EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
         const table = new cli_table3_1.default({

package/build/commands/submit.d.ts

@@ -14,5 +14,6 @@ export default class Submit extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;
-    private sanitizeFlagsAsync;
+    private sanitizeFlags;
+    private ensurePlatformSelectedAsync;
 }

package/build/commands/submit.js

@@ -5,6 +5,7 @@ const eas_json_1 = require("@expo/eas-json");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand"));
+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");
@@ -14,19 +15,22 @@ const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
 const urls_1 = require("../submit/utils/urls");
 const profiles_1 = require("../utils/profiles");
+const statuspageService_1 = require("../utils/statuspageService");
 class Submit extends EasCommand_1.default {
     async runAsync() {
         const { flags: rawFlags } = await this.parse(Submit);
-        const flags = await this.sanitizeFlagsAsync(rawFlags);
+        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);
-        const platforms = (0, platform_1.toPlatforms)(flags.requestedPlatform);
+        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),
             platforms,
-            profileName: flags.profile,
+            profileName: flagsWithPlatform.profile,
         });
         const submissions = [];
         for (const submissionProfile of submissionProfiles) {
@@ -35,8 +39,8 @@ class Submit extends EasCommand_1.default {
                 projectDir,
                 projectId,
                 profile: submissionProfile.profile,
-                archiveFlags: flags.archiveFlags,
-                nonInteractive: flags.nonInteractive,
+                archiveFlags: flagsWithPlatform.archiveFlags,
+                nonInteractive: flagsWithPlatform.nonInteractive,
             });
             if (submissionProfiles.length > 1) {
                 log_1.default.newLine();
@@ -48,24 +52,22 @@ class Submit extends EasCommand_1.default {
         }
         log_1.default.newLine();
         (0, urls_1.printSubmissionDetailsUrls)(submissions);
-        if (flags.wait) {
+        if (flagsWithPlatform.wait) {
             const completedSubmissions = await (0, submit_1.waitToCompleteAsync)(submissions, {
-                verbose: flags.verbose,
+                verbose: flagsWithPlatform.verbose,
             });
             (0, submit_1.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish)(completedSubmissions);
         }
     }
-    async sanitizeFlagsAsync(flags) {
+    sanitizeFlags(flags) {
         const { platform, verbose, wait, profile, 'non-interactive': nonInteractive, ...archiveFlags } = flags;
         if (!flags.platform && nonInteractive) {
             core_1.Errors.error('--platform is required when building in non-interactive mode', { exit: 1 });
         }
-        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.platform);
-        if (requestedPlatform === platform_1.RequestedPlatform.All) {
-            if (archiveFlags.id || archiveFlags.path || archiveFlags.url) {
-                core_1.Errors.error('--id, --path, and --url params are only supported when performing a single-platform submit', { exit: 1 });
-            }
-        }
+        const requestedPlatform = flags.platform &&
+            Object.values(platform_1.RequestedPlatform).includes(flags.platform.toLowerCase())
+            ? flags.platform.toLowerCase()
+            : undefined;
         return {
             archiveFlags,
             requestedPlatform,
@@ -75,6 +77,18 @@ class Submit extends EasCommand_1.default {
             nonInteractive,
         };
     }
+    async ensurePlatformSelectedAsync(flags) {
+        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.requestedPlatform);
+        if (requestedPlatform === platform_1.RequestedPlatform.All) {
+            if (flags.archiveFlags.id || flags.archiveFlags.path || flags.archiveFlags.url) {
+                core_1.Errors.error('--id, --path, and --url params are only supported when performing a single-platform submit', { exit: 1 });
+            }
+        }
+        return {
+            ...flags,
+            requestedPlatform,
+        };
+    }
 }
 exports.default = Submit;
 Submit.description = 'submit app binary to App Store and/or Play Store';

package/build/commands/update/index.js

@@ -16,6 +16,7 @@ const url_1 = require("../../build/utils/url");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const fetch_1 = tslib_1.__importDefault(require("../../fetch"));
 const client_1 = require("../../graphql/client");
+const generated_1 = require("../../graphql/generated");
 const PublishMutation_1 = require("../../graphql/mutations/PublishMutation");
 const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
 const UpdateQuery_1 = require("../../graphql/queries/UpdateQuery");
@@ -32,6 +33,7 @@ const code_signing_1 = require("../../utils/code-signing");
 const uniqBy_1 = tslib_1.__importDefault(require("../../utils/expodash/uniqBy"));
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const json_1 = require("../../utils/json");
+const statuspageService_1 = require("../../utils/statuspageService");
 const vcs_1 = require("../../vcs");
 const create_1 = require("../branch/create");
 const create_2 = require("../channel/create");
@@ -109,6 +111,7 @@ class UpdatePublish extends EasCommand_1.default {
         const expPrivate = (0, expoConfig_1.getExpoConfig)(projectDir, {
             isPublicConfig: false,
         });
+        await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)([generated_1.StatuspageServiceName.EasUpdate]);
         const codeSigningInfo = await (0, code_signing_1.getCodeSigningInfoAsync)(expPrivate, privateKeyPath);
         const hasExpoUpdates = (0, projectUtils_1.isExpoUpdatesInstalledOrAvailable)(projectDir, exp.sdkVersion);
         if (!hasExpoUpdates && nonInteractive) {
@@ -153,7 +156,7 @@ class UpdatePublish extends EasCommand_1.default {
                 ({ name: branchName } = await (0, prompts_1.promptAsync)({
                     type: 'text',
                     name: 'name',
-                    message: 'No branches found. Creating a new one. Please name the new branch:',
+                    message: 'No branches found. Provide a branch name:',
                     initial: (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
                         `branch-${Math.random().toString(36).substr(2, 4)}`,
                     validate: value => (value ? true : validationMessage),
@@ -229,7 +232,7 @@ class UpdatePublish extends EasCommand_1.default {
                 ({ publishMessage: message } = await (0, prompts_1.promptAsync)({
                     type: 'text',
                     name: 'publishMessage',
-                    message: `Please enter an update message.`,
+                    message: `Provide an update message.`,
                     initial: `Republish "${oldMessage}" - group: ${group}`,
                     validate: (value) => (value ? true : validationMessage),
                 }));
@@ -250,7 +253,7 @@ class UpdatePublish extends EasCommand_1.default {
                 ({ publishMessage: message } = await (0, prompts_1.promptAsync)({
                     type: 'text',
                     name: 'publishMessage',
-                    message: `Please enter an update message.`,
+                    message: `Provide an update message.`,
                     initial: (_c = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _c === void 0 ? void 0 : _c.trim(),
                     validate: (value) => (value ? true : validationMessage),
                 }));
@@ -529,7 +532,7 @@ async function checkEASUpdateURLIsSetAsync(exp) {
     const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
     const expectedURL = (0, api_1.getEASUpdateURL)(projectId);
     if (configuredURL !== expectedURL) {
-        throw new Error(`The update URL is incorrectly configured for EAS Update. Please set updates.url to ${expectedURL} in your app.json.`);
+        throw new Error(`The update URL is incorrectly configured for EAS Update. Set updates.url to ${expectedURL} in your ${chalk_1.default.bold('app.json')}.`);
     }
 }
 const truncatePublishUpdateMessage = (originalMessage) => {

package/build/commands/update/list.js

@@ -47,7 +47,7 @@ class BranchView extends EasCommand_1.default {
                 ({ name: branchInteractive } = await (0, prompts_1.promptAsync)({
                     type: 'text',
                     name: 'name',
-                    message: 'Please enter the name of the branch whose updates you wish to view:',
+                    message: 'Provide the name of the branch whose updates you wish to view:',
                     initial: (_a = (await (0, vcs_1.getVcsClient)().getBranchNameAsync())) !== null && _a !== void 0 ? _a : undefined,
                     validate: (value) => (value ? true : validationMessage),
                 }));

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

@@ -35,7 +35,7 @@ class RemoveKeystore {
         log_1.default.newLine();
         log_1.default.warn(`Clearing your Android build credentials from our build servers is a ${chalk_1.default.bold('PERMANENT and IRREVERSIBLE action.')}`);
         log_1.default.warn(chalk_1.default.bold('Android Keystore must be identical to the one previously used to submit your app to the Google Play Store.'));
-        log_1.default.warn('Please read https://docs.expo.dev/distribution/building-standalone-apps/#if-you-choose-to-build-for-android for more info before proceeding.');
+        log_1.default.warn('Read https://docs.expo.dev/distribution/building-standalone-apps/#if-you-choose-to-build-for-android for more info before proceeding.');
         log_1.default.newLine();
         log_1.default.warn(chalk_1.default.bold('Your Keystore will be backed up to your current directory if you continue.'));
         log_1.default.newLine();

package/build/credentials/android/api/GraphqlClient.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatProjectFullName = exports.getGoogleServiceAccountKeysForAccountAsync = exports.deleteGoogleServiceAccountKeyAsync = exports.createGoogleServiceAccountKeyAsync = exports.deleteFcmAsync = exports.createFcmAsync = exports.deleteKeystoreAsync = exports.createKeystoreAsync = exports.createOrUpdateDefaultIosAppBuildCredentialsAsync = exports.createOrUpdateAndroidAppBuildCredentialsByNameAsync = exports.getAndroidAppBuildCredentialsByNameAsync = exports.getDefaultAndroidAppBuildCredentialsAsync = exports.createAndroidAppBuildCredentialsAsync = exports.updateAndroidAppBuildCredentialsAsync = exports.updateAndroidAppCredentialsAsync = exports.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync = exports.getLegacyAndroidAppBuildCredentialsAsync = exports.getLegacyAndroidAppCredentialsWithCommonFieldsAsync = exports.getAndroidAppBuildCredentialsListAsync = exports.getAndroidAppCredentialsWithCommonFieldsAsync = void 0;
-const AppQuery_1 = require("../../ios/api/graphql/queries/AppQuery");
+const AppQuery_1 = require("../../../graphql/queries/AppQuery");
 const AndroidAppBuildCredentialsMutation_1 = require("./graphql/mutations/AndroidAppBuildCredentialsMutation");
 const AndroidAppCredentialsMutation_1 = require("./graphql/mutations/AndroidAppCredentialsMutation");
 const AndroidFcmMutation_1 = require("./graphql/mutations/AndroidFcmMutation");

package/build/credentials/context.d.ts

@@ -1,5 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
+import { EasJson } from '@expo/eas-json';
 import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
@@ -12,10 +13,12 @@ export declare class CredentialsContext {
     readonly nonInteractive: boolean;
     readonly projectDir: string;
     readonly user: Actor;
+    readonly easJsonCliConfig?: EasJson['cli'];
     private shouldAskAuthenticateAppStore;
     private resolvedExp?;
     constructor(options: {
         exp?: ExpoConfig;
+        easJsonCliConfig?: EasJson['cli'];
         nonInteractive?: boolean;
         projectDir: string;
         user: Actor;

package/build/credentials/context.js

@@ -20,6 +20,7 @@ class CredentialsContext {
         this.appStore = new AppStoreApi_1.default();
         this.ios = IosGraphqlClient;
         this.shouldAskAuthenticateAppStore = true;
+        this.easJsonCliConfig = options.easJsonCliConfig;
         this.projectDir = options.projectDir;
         this.user = options.user;
         this.nonInteractive = (_a = options.nonInteractive) !== null && _a !== void 0 ? _a : false;

package/build/credentials/errors.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnsupportedCredentialsChoiceError = exports.MissingCredentialsError = exports.MissingCredentialsNonInteractiveError = void 0;
 class MissingCredentialsNonInteractiveError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'Credentials are not set up. Please run this command again in interactive mode.');
+        super(message !== null && message !== void 0 ? message : 'Credentials are not set up. Run this command again in interactive mode.');
     }
 }
 exports.MissingCredentialsNonInteractiveError = MissingCredentialsNonInteractiveError;

package/build/credentials/ios/IosCredentialsProvider.d.ts

@@ -17,6 +17,7 @@ export default class IosCredentialsProvider {
     private getLocalAsync;
     private getRemoteAsync;
     private getPushKeyAsync;
+    private disablePushNotificationsSetupInEasJsonAsync;
     private assertProvisioningProfileType;
 }
 export {};

package/build/credentials/ios/IosCredentialsProvider.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const eas_json_1 = require("@expo/eas-json");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const target_1 = require("../../project/ios/target");
 const prompts_1 = require("../../prompts");
@@ -12,6 +13,12 @@ const BuildCredentialsUtils_1 = require("./actions/BuildCredentialsUtils");
 const SetUpBuildCredentials_1 = require("./actions/SetUpBuildCredentials");
 const SetUpPushKey_1 = require("./actions/SetUpPushKey");
 const provisioningProfile_1 = require("./utils/provisioningProfile");
+var PushNotificationSetupOption;
+(function (PushNotificationSetupOption) {
+    PushNotificationSetupOption[PushNotificationSetupOption["YES"] = 0] = "YES";
+    PushNotificationSetupOption[PushNotificationSetupOption["NO"] = 1] = "NO";
+    PushNotificationSetupOption[PushNotificationSetupOption["NO_DONT_ASK_AGAIN"] = 2] = "NO_DONT_ASK_AGAIN";
+})(PushNotificationSetupOption || (PushNotificationSetupOption = {}));
 class IosCredentialsProvider {
     constructor(ctx, options) {
         this.ctx = ctx;
@@ -47,6 +54,7 @@ class IosCredentialsProvider {
         }).runAsync(this.ctx);
     }
     async getPushKeyAsync(ctx, targets) {
+        var _a;
         if (ctx.nonInteractive) {
             return null;
         }
@@ -63,13 +71,33 @@ class IosCredentialsProvider {
             log_1.default.succeed(`Push Notifications setup for ${app.projectName}: ${applicationTarget.bundleIdentifier}`);
             return null;
         }
-        const confirmSetup = await (0, prompts_1.confirmAsync)({
-            message: `Would you like to set up Push Notifications for your project?`,
-        });
-        if (!confirmSetup) {
+        if (((_a = ctx.easJsonCliConfig) === null || _a === void 0 ? void 0 : _a.promptToConfigurePushNotfications) === false) {
             return null;
         }
-        return await setupPushKeyAction.runAsync(ctx);
+        const setupOption = await (0, prompts_1.selectAsync)(`Would you like to set up Push Notifications for your project?`, [
+            { title: 'Yes', value: PushNotificationSetupOption.YES },
+            { title: 'No', value: PushNotificationSetupOption.NO },
+            {
+                title: `No, don't ask again (preference will be saved to eas.json)`,
+                value: PushNotificationSetupOption.NO_DONT_ASK_AGAIN,
+            },
+        ]);
+        if (setupOption === PushNotificationSetupOption.YES) {
+            return await setupPushKeyAction.runAsync(ctx);
+        }
+        else {
+            if (setupOption === PushNotificationSetupOption.NO_DONT_ASK_AGAIN) {
+                await this.disablePushNotificationsSetupInEasJsonAsync(ctx);
+            }
+            return null;
+        }
+    }
+    async disablePushNotificationsSetupInEasJsonAsync(ctx) {
+        const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(ctx.projectDir);
+        const easJson = await fs_extra_1.default.readJSON(easJsonPath);
+        easJson.cli = { ...easJson === null || easJson === void 0 ? void 0 : easJson.cli, promptToConfigurePushNotfications: false };
+        await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+        log_1.default.withTick('Updated eas.json');
     }
     assertProvisioningProfileType(provisioningProfile, targetName) {
         const isAdHoc = (0, provisioningProfile_1.isAdHocProfile)(provisioningProfile);

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

@@ -96,8 +96,8 @@ async function selectValidDistributionCertificateAsync(ctx, appLookupParams) {
 exports.selectValidDistributionCertificateAsync = selectValidDistributionCertificateAsync;
 const APPLE_DIST_CERTS_TOO_MANY_GENERATED_ERROR = `
 You can have only ${chalk_1.default.underline('three')} Apple Distribution Certificates generated on your Apple Developer account.
-Please revoke the old ones or reuse existing from your other apps.
-Please remember that Apple Distribution Certificates are not application specific!
+Revoke the old ones or reuse existing from your other apps.
+Remember that Apple Distribution Certificates are not application specific!
 `;
 async function provideOrGenerateDistributionCertificateAsync(ctx) {
     if (!ctx.nonInteractive) {

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

@@ -34,7 +34,7 @@ class SetUpAdhocProvisioningProfile {
                 return (0, nullthrows_1.default)(await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, generated_1.IosDistributionType.AdHoc));
             }
             else {
-                throw new errors_1.MissingCredentialsNonInteractiveError('Provisioning profile is not configured correctly. Please run this command again in interactive mode.');
+                throw new errors_1.MissingCredentialsNonInteractiveError('Provisioning profile is not configured correctly. Run this command again in interactive mode.');
             }
         }
         const currentBuildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, generated_1.IosDistributionType.AdHoc);

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

@@ -59,7 +59,7 @@ class SetUpInternalProvisioningProfile {
         }
         else {
             if (adhocBuildCredentialsExist && enterpriseBuildCredentialsExist) {
-                throw new Error(`You're in non-interactive mode. You have set up both adhoc and universal distribution credentials. Please set the 'enterpriseProvisioning' property (to 'adhoc' or 'universal') in eas.json to choose the credentials to use.`);
+                throw new Error(`You're in non-interactive mode. You have set up both adhoc and universal distribution credentials. Set the 'enterpriseProvisioning' property (to 'adhoc' or 'universal') in eas.json to choose the credentials to use.`);
             }
             else if (adhocBuildCredentialsExist) {
                 return await this.setupAdhocProvisioningProfileAsync(ctx);
@@ -68,7 +68,7 @@ class SetUpInternalProvisioningProfile {
                 return await this.setupUniversalProvisioningProfileAsync(ctx);
             }
             else {
-                throw new Error(`You're in non-interactive mode. EAS CLI couldn't find any credentials suitable for internal distribution. Please run again in interactive mode.`);
+                throw new Error(`You're in non-interactive mode. EAS CLI couldn't find any credentials suitable for internal distribution. Run this command again in interactive mode.`);
             }
         }
     }