eas-cli 0.31.1 → 0.34.0

package/build/commands/build/index.js

@@ -7,6 +7,8 @@ const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const figures_1 = (0, tslib_1.__importDefault)(require("figures"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const build_1 = require("../../build/android/build");
 const build_2 = require("../../build/build");
@@ -19,7 +21,7 @@ const repository_1 = require("../../build/utils/repository");
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const generated_1 = require("../../graphql/generated");
 const AppPlatform_1 = require("../../graphql/types/AppPlatform");
-const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
 const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const metroConfig_1 = require("../../project/metroConfig");
@@ -28,8 +30,11 @@ const prompts_1 = require("../../prompts");
 const context_2 = require("../../submit/context");
 const submit_1 = require("../../submit/submit");
 const urls_1 = require("../../submit/utils/urls");
+const easCli_1 = require("../../utils/easCli");
 const json_1 = require("../../utils/json");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const profiles_1 = require("../../utils/profiles");
+const vcs_1 = require("../../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/clients/git"));
 class Build extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -45,45 +50,53 @@ class Build extends EasCommand_1.default {
         const { requestedPlatform } = flags;
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-        await vcs_1.default.ensureRepoExistsAsync();
+        await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
         await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
         await (0, configure_1.ensureProjectConfiguredAsync)(projectDir, requestedPlatform);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
-        await (0, devClient_1.ensureExpoDevClientInstalledForDevClientBuildsAsync)({
+        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+        const buildProfiles = await (0, profiles_1.getProfilesAsync)({
             platforms,
+            profileName: flags.profile,
+            async readProfileAsync(platform, profileName) {
+                return await easJsonReader.readBuildProfileAsync(platform, profileName);
+            },
+        });
+        await (0, devClient_1.ensureExpoDevClientInstalledForDevClientBuildsAsync)({
             projectDir,
-            profile: flags.profile,
             nonInteractive: flags.nonInteractive,
+            buildProfiles,
         });
         const startedBuilds = [];
         const buildCtxByPlatform = {};
-        for (const platform of platforms) {
+        for (const buildProfile of buildProfiles) {
             const { build: maybeBuild, buildCtx } = await this.prepareAndStartBuildAsync({
                 projectDir,
-                platform,
                 flags,
                 moreBuilds: platforms.length > 1,
+                buildProfile,
             });
             if (maybeBuild) {
-                startedBuilds.push(maybeBuild);
+                startedBuilds.push({ build: maybeBuild, buildProfile });
             }
-            buildCtxByPlatform[(0, AppPlatform_1.toAppPlatform)(platform)] = buildCtx;
+            buildCtxByPlatform[(0, AppPlatform_1.toAppPlatform)(buildProfile.platform)] = buildCtx;
         }
         if (flags.local) {
             return;
         }
         log_1.default.newLine();
-        (0, printBuildInfo_1.printLogsUrls)(startedBuilds);
+        (0, printBuildInfo_1.printLogsUrls)(startedBuilds.map(startedBuild => startedBuild.build));
         log_1.default.newLine();
         const submissions = [];
         if (flags.autoSubmit) {
-            for (const build of startedBuilds) {
+            for (const startedBuild of startedBuilds) {
                 const submission = await this.prepareAndStartSubmissionAsync({
-                    build,
-                    credentialsCtx: (0, nullthrows_1.default)((_a = buildCtxByPlatform[build.platform]) === null || _a === void 0 ? void 0 : _a.credentialsCtx),
+                    build: startedBuild.build,
+                    credentialsCtx: (0, nullthrows_1.default)((_a = buildCtxByPlatform[startedBuild.build.platform]) === null || _a === void 0 ? void 0 : _a.credentialsCtx),
                     flags,
                     moreBuilds: startedBuilds.length > 1,
                     projectDir,
+                    buildProfile: startedBuild.buildProfile,
                 });
                 submissions.push(submission);
             }
@@ -94,7 +107,7 @@ class Build extends EasCommand_1.default {
         if (!flags.wait) {
             return;
         }
-        const builds = await (0, build_2.waitForBuildEndAsync)(startedBuilds.map(build => build.id));
+        const builds = await (0, build_2.waitForBuildEndAsync)(startedBuilds.map(({ build }) => build.id));
         (0, printBuildInfo_1.printBuildResults)(builds, flags.json);
         const haveAllBuildsFailedOrCanceled = builds.every(build => (build === null || build === void 0 ? void 0 : build.status) && [generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled].includes(build === null || build === void 0 ? void 0 : build.status));
         if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
@@ -135,7 +148,7 @@ class Build extends EasCommand_1.default {
         return {
             requestedPlatform,
             skipProjectConfiguration: flags['skip-project-configuration'],
-            profile,
+            profile: profile !== null && profile !== void 0 ? profile : null,
             nonInteractive,
             local: flags['local'],
             wait: flags['wait'],
@@ -145,22 +158,20 @@ class Build extends EasCommand_1.default {
             submitProfile: (_a = flags['auto-submit-with-profile']) !== null && _a !== void 0 ? _a : profile,
         };
     }
-    async prepareAndStartBuildAsync({ projectDir, platform, flags, moreBuilds, }) {
-        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
-        const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
+    async prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, }) {
         const buildCtx = await (0, context_1.createBuildContextAsync)({
-            buildProfileName: flags.profile,
+            buildProfileName: buildProfile.profileName,
             clearCache: flags.clearCache,
-            buildProfile,
+            buildProfile: buildProfile.profile,
             local: flags.local,
             nonInteractive: flags.nonInteractive,
-            platform,
+            platform: buildProfile.platform,
             projectDir,
             skipProjectConfiguration: flags.skipProjectConfiguration,
         });
         if (moreBuilds) {
             log_1.default.newLine();
-            const appPlatform = (0, AppPlatform_1.toAppPlatform)(platform);
+            const appPlatform = (0, AppPlatform_1.toAppPlatform)(buildProfile.platform);
             log_1.default.log(`${platform_1.appPlatformEmojis[appPlatform]} ${chalk_1.default.bold(`${platform_1.appPlatformDisplayNames[appPlatform]} build`)}`);
         }
         if (buildCtx.workflow === eas_build_job_1.Workflow.MANAGED && !this.metroConfigValidated) {
@@ -186,10 +197,9 @@ class Build extends EasCommand_1.default {
         }
         return await sendBuildRequestAsync();
     }
-    async prepareAndStartSubmissionAsync({ build, credentialsCtx, flags, moreBuilds, projectDir, }) {
+    async prepareAndStartSubmissionAsync({ build, credentialsCtx, flags, moreBuilds, projectDir, buildProfile, }) {
         const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const platform = (0, AppPlatform_1.toPlatform)(build.platform);
-        const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
         const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
         const submissionCtx = await (0, context_2.createSubmissionContextAsync)({
             platform,
@@ -198,7 +208,7 @@ class Build extends EasCommand_1.default {
             profile: submitProfile,
             archiveFlags: { id: build.id },
             nonInteractive: flags.nonInteractive,
-            env: buildProfile.env,
+            env: buildProfile.profile.env,
             credentialsCtx,
         });
         if (moreBuilds) {
@@ -234,8 +244,7 @@ Build.flags = {
         description: 'Skip project configuration',
     }),
     profile: command_1.flags.string({
-        default: 'release',
-        description: 'Name of the build profile from eas.json',
+        description: 'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
         helpValue: 'PROFILE_NAME',
     }),
     'non-interactive': command_1.flags.boolean({
@@ -267,28 +276,34 @@ Build.flags = {
     }),
 };
 async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
-    if (await (0, eas_json_1.isUsingDeprecatedFormatAsync)(projectDir)) {
-        const hasMismatchedExtendsKeys = await (0, eas_json_1.hasMismatchedExtendsAsync)(projectDir);
-        if (nonInteractive) {
-            log_1.default.error('We detected that your eas.json is using a deprecated format.');
-            log_1.default.error('We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json');
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
-        const confirm = await (0, prompts_1.confirmAsync)({
-            message: 'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
-        });
-        if (confirm) {
-            await (0, eas_json_1.migrateAsync)(projectDir);
-            if (hasMismatchedExtendsKeys) {
-                log_1.default.warn('"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms');
-                log_1.default.warn('Migration was successful, but you need to manually adjust the extend rules for your profiles');
-                (0, errors_1.error)('Fix eas.json manually', { exit: 1 });
-            }
-        }
-        else {
-            log_1.default.error("Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again");
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
+    if (!(await fs_extra_1.default.pathExists(eas_json_1.EasJsonReader.formatEasJsonPath(projectDir)))) {
+        return;
+    }
+    const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+    const rawEasJson = await easJsonReader.readRawAsync();
+    if (rawEasJson === null || rawEasJson === void 0 ? void 0 : rawEasJson.cli) {
+        return;
+    }
+    if (nonInteractive) {
+        log_1.default.warn(`${figures_1.default.warning} Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${(0, log_1.link)('https://expo.fyi/eas-vcs-workflow')} for more information.`);
+        log_1.default.warn('This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.');
+        (0, vcs_1.setVcsClient)(new git_1.default());
+        return;
+    }
+    log_1.default.log(`${chalk_1.default.bold('eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.')} ${(0, log_1.learnMore)('https://expo.fyi/eas-vcs-workflow')}`);
+    log_1.default.log(`If you want to continue using the Git integration, you can opt in with ${chalk_1.default.bold('cli.requireCommit')} in ${chalk_1.default.bold('eas.json')} or with the following prompt`);
+    log_1.default.newLine();
+    const mode = await (0, prompts_1.selectAsync)('Select your preferred Git integration', [
+        { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
+        { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
+    ]);
+    rawEasJson.cli =
+        mode === 'requireCommit'
+            ? { version: `>= ${easCli_1.easCliVersion}`, requireCommit: true }
+            : { version: `>= ${easCli_1.easCliVersion}` };
+    await fs_extra_1.default.writeJSON(eas_json_1.EasJsonReader.formatEasJsonPath(projectDir), rawEasJson, { spaces: 2 });
+    if (mode === 'requireCommit') {
+        (0, vcs_1.setVcsClient)(new git_1.default());
     }
 }
 exports.handleDeprecatedEasJsonAsync = handleDeprecatedEasJsonAsync;

package/build/commands/channel/edit.js

@@ -30,7 +30,7 @@ async function getChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] })
         .toPromise());
     const updateChannelByNameResult = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName;
     if (!updateChannelByNameResult) {

package/build/commands/channel/list.js

@@ -47,7 +47,7 @@ async function getAllUpdateChannelForAppAsync({ appId, }) {
               }
             }
           }
-        `, { appId, offset: 0, limit: CHANNEL_LIMIT })
+        `, { appId, offset: 0, limit: CHANNEL_LIMIT }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 class ChannelList extends EasCommand_1.default {

package/build/commands/channel/view.js

@@ -101,7 +101,7 @@ async function getUpdateChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 exports.getUpdateChannelByNameForAppAsync = getUpdateChannelByNameForAppAsync;

package/build/commands/diagnostics.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const envinfo_1 = (0, tslib_1.__importDefault)(require("envinfo"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../commandUtils/EasCommand"));
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
-const packageJSON = require('../../package.json');
+const easCli_1 = require("../utils/easCli");
 class Diagnostics extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -28,7 +28,7 @@ class Diagnostics extends EasCommand_1.default {
             ],
             npmGlobalPackages: ['eas-cli', 'expo-cli'],
         }, {
-            title: `EAS CLI ${packageJSON.version} environment info`,
+            title: `EAS CLI ${easCli_1.easCliVersion} environment info`,
         });
         log_1.default.log(info);
     }

package/build/commands/project/info.js

@@ -19,7 +19,7 @@ async function projectInfoByIdAsync(appId) {
               }
             }
           }
-        `, { appId })
+        `, { appId }, { additionalTypenames: ['App'] })
         .toPromise());
     return data;
 }

package/build/commands/submit.js

@@ -15,6 +15,7 @@ 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");
+const profiles_1 = require("../utils/profiles");
 class Submit extends EasCommand_1.default {
     async runAsync() {
         const { flags: rawFlags } = this.parse(Submit);
@@ -27,22 +28,28 @@ class Submit extends EasCommand_1.default {
             process.exitCode = 1;
             return;
         }
-        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const platforms = (0, platform_1.toPlatforms)(flags.requestedPlatform);
+        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+        const submissionProfiles = await (0, profiles_1.getProfilesAsync)({
+            platforms,
+            profileName: flags.profile,
+            async readProfileAsync(platform, profileName) {
+                return await easJsonReader.readSubmitProfileAsync(platform, profileName);
+            },
+        });
         const submissions = [];
-        for (const platform of platforms) {
-            const profile = await easJsonReader.readSubmitProfileAsync(platform, flags.profile);
+        for (const submissionProfile of submissionProfiles) {
             const ctx = await (0, context_1.createSubmissionContextAsync)({
-                platform,
+                platform: submissionProfile.platform,
                 projectDir,
                 projectId,
-                profile,
+                profile: submissionProfile.profile,
                 archiveFlags: flags.archiveFlags,
                 nonInteractive: flags.nonInteractive,
             });
-            if (platforms.length > 1) {
+            if (submissionProfiles.length > 1) {
                 log_1.default.newLine();
-                const appPlatform = (0, AppPlatform_1.toAppPlatform)(platform);
+                const appPlatform = (0, AppPlatform_1.toAppPlatform)(submissionProfile.platform);
                 log_1.default.log(`${platform_1.appPlatformEmojis[appPlatform]} ${chalk_1.default.bold(`${platform_1.appPlatformDisplayNames[appPlatform]} submission`)}`);
             }
             const submission = await (0, submit_1.submitAsync)(ctx);
@@ -77,9 +84,7 @@ class Submit extends EasCommand_1.default {
 }
 exports.default = Submit;
 Submit.description = `submit build archive to app store
-See how to configure submits with eas.json: ${(0, log_1.learnMore)('https://docs.expo.dev/submit/eas-json/', {
-    learnMoreMessage: '',
-})}`;
+See how to configure submits with eas.json: ${(0, log_1.link)('https://docs.expo.dev/submit/eas-json/')}`;
 Submit.aliases = ['build:submit'];
 Submit.flags = {
     platform: command_1.flags.enum({
@@ -87,7 +92,7 @@ Submit.flags = {
         options: ['android', 'ios', 'all'],
     }),
     profile: command_1.flags.string({
-        description: 'Name of the submit profile from eas.json. Defaults to "release" if defined in eas.json.',
+        description: 'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
     }),
     latest: command_1.flags.boolean({
         description: 'Submit the latest build for specified platform',

package/build/commands/update/view.js

@@ -33,7 +33,7 @@ async function viewUpdateAsync({ groupId, }) {
           }
         `, {
         groupId,
-    })
+    }, { additionalTypenames: ['Update'] })
         .toPromise());
     if (data.updatesByGroup.length === 0) {
         throw new Error(`Could not find any updates with group ID: "${groupId}"`);

package/build/credentials/android/api/graphql/queries/GoogleServiceAccountKeyQuery.js

@@ -24,6 +24,8 @@ exports.GoogleServiceAccountKeyQuery = {
             ${(0, graphql_1.print)(GoogleServiceAccountKey_1.GoogleServiceAccountKeyFragmentNode)}
           `, {
             accountName,
+        }, {
+            additionalTypenames: ['GoogleServiceAccountKey'],
         })
             .toPromise());
         return data.account.byName.googleServiceAccountKeys;

package/build/credentials/context.d.ts

@@ -12,7 +12,7 @@ export declare class CredentialsContext {
     readonly projectDir: string;
     readonly user: Actor;
     private shouldAskAuthenticateAppStore;
-    private _exp?;
+    private resolvedExp?;
     constructor(options: {
         exp?: ExpoConfig;
         nonInteractive?: boolean;

package/build/credentials/context.js

@@ -23,10 +23,10 @@ class CredentialsContext {
         this.projectDir = options.projectDir;
         this.user = options.user;
         this.nonInteractive = (_a = options.nonInteractive) !== null && _a !== void 0 ? _a : false;
-        this._exp = options.exp;
-        if (!this._exp) {
+        this.resolvedExp = options.exp;
+        if (!this.resolvedExp) {
             try {
-                this._exp = (0, expoConfig_1.getExpoConfig)(options.projectDir);
+                this.resolvedExp = (0, expoConfig_1.getExpoConfig)(options.projectDir);
             }
             catch (error) {
                 // ignore error, context might be created outside of expo project
@@ -34,11 +34,11 @@ class CredentialsContext {
         }
     }
     get hasProjectContext() {
-        return !!this._exp;
+        return !!this.resolvedExp;
     }
     get exp() {
         this.ensureProjectContext();
-        return this._exp;
+        return this.resolvedExp;
     }
     ensureProjectContext() {
         if (this.hasProjectContext) {

package/build/credentials/credentialsJson/update.js

@@ -8,8 +8,8 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const target_1 = require("../../project/ios/target");
 const zipObject_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/zipObject"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
-const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/git"));
+const vcs_1 = require("../../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/clients/git"));
 const read_1 = require("./read");
 const utils_1 = require("./utils");
 /**
@@ -197,8 +197,9 @@ async function updateFileAsync(projectDir, filePath, base64Data) {
     }
 }
 async function isFileUntrackedAsync(path) {
-    if (vcs_1.default instanceof git_1.default) {
-        return await vcs_1.default.isFileUntrackedAsync(path);
+    const vcsClient = (0, vcs_1.getVcsClient)();
+    if (vcsClient instanceof git_1.default) {
+        return await vcsClient.isFileUntrackedAsync(path);
     }
     return false;
 }

package/build/credentials/errors.d.ts

@@ -1,3 +1,6 @@
 export declare class MissingCredentialsNonInteractiveError extends Error {
     constructor(message?: string);
 }
+export declare class MissingCredentialsError extends Error {
+    constructor(message?: string);
+}

package/build/credentials/errors.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MissingCredentialsNonInteractiveError = void 0;
+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.');
     }
 }
 exports.MissingCredentialsNonInteractiveError = MissingCredentialsNonInteractiveError;
+class MissingCredentialsError extends Error {
+    constructor(message) {
+        super(message !== null && message !== void 0 ? message : 'Credentials are not set up.');
+    }
+}
+exports.MissingCredentialsError = MissingCredentialsError;

package/build/credentials/ios/IosCredentialsProvider.js

@@ -65,7 +65,7 @@ class IosCredentialsProvider {
             return null;
         }
         const confirmSetup = await (0, prompts_1.confirmAsync)({
-            message: `Would you like to setup Push Notifications for your project?`,
+            message: `Would you like to set up Push Notifications for your project?`,
         });
         if (!confirmSetup) {
             return null;

package/build/credentials/ios/actions/AscApiKeyUtils.d.ts

@@ -0,0 +1,5 @@
+import { AscApiKey } from '../appstore/Credentials.types';
+import { AscApiKeyPath, MinimalAscApiKey } from '../credentials';
+export declare function promptForAscApiKeyAsync(): Promise<AscApiKeyPath>;
+export declare function promptForIssuerIdAsync(): Promise<string>;
+export declare function getMinimalAscApiKeyAsync(ascApiKey: AscApiKey): Promise<MinimalAscApiKey>;

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMinimalAscApiKeyAsync = exports.promptForIssuerIdAsync = exports.promptForAscApiKeyAsync = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const uuid = (0, tslib_1.__importStar)(require("uuid"));
+const log_1 = (0, tslib_1.__importStar)(require("../../../log"));
+const prompts_1 = require("../../../prompts");
+const promptForCredentials_1 = require("../../utils/promptForCredentials");
+const credentials_1 = require("../credentials");
+async function promptForAscApiKeyAsync() {
+    var _a, _b;
+    log_1.default.log(chalk_1.default.bold('An App Store Connect Api key is required to upload your app to the Apple App Store'));
+    log_1.default.log(`If you're not sure what this is or how to create one, ${(0, log_1.learnMore)('https://expo.fyi/creating-asc-api-key')}`);
+    const { keyP8Path } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'keyP8Path',
+        message: 'Path to App Store Connect Api Key:',
+        initial: 'AuthKey_ABCD.p8',
+        // eslint-disable-next-line async-protect/async-suffix
+        validate: async (filePath) => {
+            try {
+                const stats = await fs_extra_1.default.stat(filePath);
+                if (stats.isFile()) {
+                    return true;
+                }
+                return 'Input is not a file.';
+            }
+            catch {
+                return 'File does not exist.';
+            }
+        },
+    });
+    const regex = /^AuthKey_(?<keyId>\w+)\.p8$/; // Common ASC Api file name downloaded from Apple
+    const bestEffortKeyId = (_b = (_a = path_1.default.basename(keyP8Path).match(regex)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.keyId;
+    const ascApiKeyMetadata = await (0, promptForCredentials_1.getCredentialsFromUserAsync)(credentials_1.ascApiKeyMetadataSchema, {
+        keyId: bestEffortKeyId,
+    });
+    return { ...ascApiKeyMetadata, keyP8Path };
+}
+exports.promptForAscApiKeyAsync = promptForAscApiKeyAsync;
+async function promptForIssuerIdAsync() {
+    log_1.default.log(chalk_1.default.bold('An App Store Connect Issuer ID is required'));
+    log_1.default.log(`If you're not sure what this is or how to find yours, ${(0, log_1.learnMore)('https://expo.fyi/asc-issuer-id')}`);
+    const { issuerId } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'issuerId',
+        message: 'App Store Connect Issuer ID:',
+        validate: (input) => uuid.validate(input),
+    });
+    return issuerId;
+}
+exports.promptForIssuerIdAsync = promptForIssuerIdAsync;
+async function getMinimalAscApiKeyAsync(ascApiKey) {
+    var _a;
+    return {
+        ...ascApiKey,
+        issuerId: (_a = ascApiKey.issuerId) !== null && _a !== void 0 ? _a : (await promptForIssuerIdAsync()),
+    };
+}
+exports.getMinimalAscApiKeyAsync = getMinimalAscApiKeyAsync;

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

@@ -9,7 +9,7 @@ class CreateDistributionCertificate {
         this.account = account;
     }
     async runAsync(ctx) {
-        const distCert = await (0, DistributionCertificateUtils_1.provideOrGenerateDistributionCertificateAsync)(ctx, this.account.name);
+        const distCert = await (0, DistributionCertificateUtils_1.provideOrGenerateDistributionCertificateAsync)(ctx);
         const result = await ctx.ios.createDistributionCertificateAsync(this.account, distCert);
         log_1.default.succeed('Created distribution certificate');
         return result;

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

@@ -12,7 +12,7 @@ class CreatePushKey {
         if (ctx.nonInteractive) {
             throw new Error(`A new push key cannot be created in non-interactive mode.`);
         }
-        const pushKey = await (0, PushKeyUtils_1.provideOrGeneratePushKeyAsync)(ctx, this.account.name);
+        const pushKey = await (0, PushKeyUtils_1.provideOrGeneratePushKeyAsync)(ctx);
         const result = await ctx.ios.createPushKeyAsync(this.account, pushKey);
         log_1.default.succeed('Created push key');
         return result;

package/build/credentials/ios/actions/DistributionCertificateUtils.d.ts

@@ -12,4 +12,4 @@ export declare function selectDistributionCertificateWithDependenciesAsync(ctx:
  * select a distribution certificate from a valid set (curated on a best effort basis)
  * */
 export declare function selectValidDistributionCertificateAsync(ctx: CredentialsContext, appLookupParams: AppLookupParams): Promise<AppleDistributionCertificateFragment | null>;
-export declare function provideOrGenerateDistributionCertificateAsync(ctx: CredentialsContext, accountName: string): Promise<DistributionCertificate>;
+export declare function provideOrGenerateDistributionCertificateAsync(ctx: CredentialsContext): Promise<DistributionCertificate>;