eas-cli 0.31.1 → 0.34.0

package/build/graphql/queries/UserQuery.js

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

package/build/graphql/queries/WebhookQuery.js

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

package/build/log.d.ts

@@ -11,17 +11,25 @@ export default class Log {
     static succeed(message: string): void;
     static withTick(...args: any[]): void;
     private static consoleLog;
-    private static consoleWarn;
-    private static consoleError;
     private static withTextColor;
     private static isLastLineNewLine;
     private static updateIsLastLineNewLine;
 }
 /**
+ * Prints a link for given URL, using text if provided, otherwise text is just the URL.
+ * Format links as dim (unless disabled) and with an underline.
+ *
+ * @example https://expo.dev
+ */
+export declare function link(url: string, { text, dim }?: {
+    text?: string;
+    dim?: boolean;
+}): string;
+/**
+ * Provide a consistent "Learn more" link experience.
  * Format links as dim (unless disabled) with an underline.
  *
  * @example Learn more: https://expo.dev
- * @param url
  */
 export declare function learnMore(url: string, { learnMoreMessage: maybeLearnMoreMessage, dim, }?: {
     learnMoreMessage?: string;

package/build/log.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.learnMore = void 0;
+exports.learnMore = exports.link = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const figures_1 = (0, tslib_1.__importDefault)(require("figures"));
@@ -20,10 +20,10 @@ class Log {
         }
     }
     static error(...args) {
-        Log.consoleError(...Log.withTextColor(args, chalk_1.default.red));
+        Log.consoleLog(...Log.withTextColor(args, chalk_1.default.red));
     }
     static warn(...args) {
-        Log.consoleWarn(...Log.withTextColor(args, chalk_1.default.yellow));
+        Log.consoleLog(...Log.withTextColor(args, chalk_1.default.yellow));
     }
     static debug(...args) {
         if (Log.isDebug) {
@@ -47,16 +47,6 @@ class Log {
         // eslint-disable-next-line no-console
         console.log(...args);
     }
-    static consoleWarn(...args) {
-        Log.updateIsLastLineNewLine(args);
-        // eslint-disable-next-line no-console
-        console.warn(...args);
-    }
-    static consoleError(...args) {
-        Log.updateIsLastLineNewLine(args);
-        // eslint-disable-next-line no-console
-        console.error(...args);
-    }
     static withTextColor(args, chalkColor) {
         return args.map(arg => chalkColor(arg));
     }
@@ -79,19 +69,30 @@ exports.default = Log;
 Log.isDebug = (0, getenv_1.boolish)('EXPO_DEBUG', false);
 Log.isLastLineNewLine = false;
 /**
- * Format links as dim (unless disabled) with an underline.
+ * Prints a link for given URL, using text if provided, otherwise text is just the URL.
+ * Format links as dim (unless disabled) and with an underline.
  *
- * @example Learn more: https://expo.dev
- * @param url
+ * @example https://expo.dev
  */
-function learnMore(url, { learnMoreMessage: maybeLearnMoreMessage, dim = true, } = {}) {
+function link(url, { text = url, dim = true } = {}) {
+    let output;
     // Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
     if (terminal_link_1.default.isSupported) {
-        const text = (0, terminal_link_1.default)(maybeLearnMoreMessage !== null && maybeLearnMoreMessage !== void 0 ? maybeLearnMoreMessage : 'Learn more.', url);
-        return dim ? chalk_1.default.dim(text) : text;
+        output = (0, terminal_link_1.default)(text, url);
     }
-    const learnMoreMessage = maybeLearnMoreMessage !== null && maybeLearnMoreMessage !== void 0 ? maybeLearnMoreMessage : 'Learn more';
-    const text = `${learnMoreMessage === '' ? learnMoreMessage : `${learnMoreMessage}: `}${chalk_1.default.underline(url)}`;
-    return dim ? chalk_1.default.dim(text) : text;
+    else {
+        output = `${text === url ? '' : text + ': '}${chalk_1.default.underline(url)}`;
+    }
+    return dim ? chalk_1.default.dim(output) : output;
+}
+exports.link = link;
+/**
+ * Provide a consistent "Learn more" link experience.
+ * Format links as dim (unless disabled) with an underline.
+ *
+ * @example Learn more: https://expo.dev
+ */
+function learnMore(url, { learnMoreMessage: maybeLearnMoreMessage, dim = true, } = {}) {
+    return link(url, { text: maybeLearnMoreMessage !== null && maybeLearnMoreMessage !== void 0 ? maybeLearnMoreMessage : 'Learn more', dim });
 }
 exports.learnMore = learnMore;

package/build/project/android/applicationId.d.ts

@@ -2,4 +2,4 @@ import { ExpoConfig } from '@expo/config';
 import { GradleBuildContext } from './gradle';
 export declare function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir: string, exp: ExpoConfig): Promise<string>;
 export declare function getApplicationIdAsync(projectDir: string, exp: ExpoConfig, gradleContext?: GradleBuildContext): Promise<string>;
-export declare function warnIfAndroidPackageDefinedInAppConfigForGenericProject(projectDir: string, exp: ExpoConfig): void;
+export declare function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir: string, exp: ExpoConfig): void;

package/build/project/android/applicationId.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.warnIfAndroidPackageDefinedInAppConfigForGenericProject = exports.getApplicationIdAsync = exports.ensureApplicationIdIsDefinedForManagedProjectAsync = void 0;
+exports.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject = exports.getApplicationIdAsync = exports.ensureApplicationIdIsDefinedForManagedProjectAsync = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const config_plugins_1 = require("@expo/config-plugins");
@@ -9,6 +9,7 @@ const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
+const appJson_1 = require("../../build/utils/appJson");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
@@ -32,7 +33,7 @@ exports.ensureApplicationIdIsDefinedForManagedProjectAsync = ensureApplicationId
 async function getApplicationIdAsync(projectDir, exp, gradleContext) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
-        warnIfAndroidPackageDefinedInAppConfigForGenericProject(projectDir, exp);
+        warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
         const errorMessage = 'Could not read application id from Android project.';
         if (gradleContext) {
             const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);
@@ -90,7 +91,7 @@ async function configureApplicationIdAsync(projectDir, exp) {
         initial: suggestedAndroidApplicationId,
         validate: value => (isApplicationIdValid(value) ? true : INVALID_APPLICATION_ID_MESSAGE),
     });
-    const rawStaticConfig = await fs_extra_1.default.readJSON(paths.staticConfigPath);
+    const rawStaticConfig = (0, appJson_1.readAppJson)(paths.staticConfigPath);
     rawStaticConfig.expo = {
         ...rawStaticConfig.expo,
         android: { ...(_a = rawStaticConfig.expo) === null || _a === void 0 ? void 0 : _a.android, package: packageName },
@@ -103,14 +104,14 @@ function isApplicationIdValid(applicationId) {
     return /^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/.test(applicationId);
 }
 let warnPrinted = false;
-function warnIfAndroidPackageDefinedInAppConfigForGenericProject(projectDir, exp) {
+function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp) {
     if (config_plugins_1.AndroidConfig.Package.getPackage(exp) && !warnPrinted) {
-        log_1.default.warn(`Specifying "android.package" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is deprecated for generic projects.\n` +
+        log_1.default.warn(`Specifying "android.package" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is deprecated for bare workflow projects.\n` +
             'EAS Build depends only on the value in the native code. Please remove the deprecated configuration.');
         warnPrinted = true;
     }
 }
-exports.warnIfAndroidPackageDefinedInAppConfigForGenericProject = warnIfAndroidPackageDefinedInAppConfigForGenericProject;
+exports.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject = warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject;
 async function getSuggestedApplicationIdAsync(exp) {
     // Attempt to use the ios bundle id first since it's convenient to have them aligned.
     const maybeBundleId = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp);

package/build/project/ios/bundleIdentifier.d.ts

@@ -4,5 +4,5 @@ export declare function getBundleIdentifierAsync(projectDir: string, exp: ExpoCo
     targetName?: string;
     buildConfiguration?: string;
 }): Promise<string>;
-export declare function warnIfBundleIdentifierDefinedInAppConfigForGenericProject(projectDir: string, exp: ExpoConfig): void;
+export declare function warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir: string, exp: ExpoConfig): void;
 export declare function isWildcardBundleIdentifier(bundleIdentifier: string): boolean;

package/build/project/ios/bundleIdentifier.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWildcardBundleIdentifier = exports.warnIfBundleIdentifierDefinedInAppConfigForGenericProject = exports.getBundleIdentifierAsync = exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = void 0;
+exports.isWildcardBundleIdentifier = exports.warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject = exports.getBundleIdentifierAsync = exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const config_plugins_1 = require("@expo/config-plugins");
@@ -8,6 +8,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const appJson_1 = require("../../build/utils/appJson");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const prompts_1 = require("../../prompts");
 const actions_1 = require("../../user/actions");
@@ -28,7 +29,7 @@ exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = ensureBundleIden
 async function getBundleIdentifierAsync(projectDir, exp, { targetName, buildConfiguration } = {}) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
-        warnIfBundleIdentifierDefinedInAppConfigForGenericProject(projectDir, exp);
+        warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
         const bundleIdentifier = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(projectDir, {
             targetName,
             buildConfiguration,
@@ -77,7 +78,7 @@ async function configureBundleIdentifierAsync(projectDir, exp) {
         initial: suggestedBundleIdentifier,
         validate: value => (isBundleIdentifierValid(value) ? true : INVALID_BUNDLE_IDENTIFIER_MESSAGE),
     });
-    const rawStaticConfig = await fs_extra_1.default.readJSON(paths.staticConfigPath);
+    const rawStaticConfig = (0, appJson_1.readAppJson)(paths.staticConfigPath);
     rawStaticConfig.expo = {
         ...rawStaticConfig.expo,
         ios: { ...(_a = rawStaticConfig.expo) === null || _a === void 0 ? void 0 : _a.ios, bundleIdentifier },
@@ -90,14 +91,14 @@ function isBundleIdentifierValid(bundleIdentifier) {
     return /^[a-zA-Z0-9-.]+$/.test(bundleIdentifier);
 }
 let warnPrinted = false;
-function warnIfBundleIdentifierDefinedInAppConfigForGenericProject(projectDir, exp) {
+function warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp) {
     if (config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp) && !warnPrinted) {
-        log_1.default.warn(`Specifying "ios.bundleIdentifier" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is deprecated for generic projects.\n` +
+        log_1.default.warn(`Specifying "ios.bundleIdentifier" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is deprecated for bare workflow projects.\n` +
             'EAS Build depends only on the value in the native code. Please remove the deprecated configuration.');
         warnPrinted = true;
     }
 }
-exports.warnIfBundleIdentifierDefinedInAppConfigForGenericProject = warnIfBundleIdentifierDefinedInAppConfigForGenericProject;
+exports.warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject = warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject;
 function isWildcardBundleIdentifier(bundleIdentifier) {
     const wildcardRegex = /^[A-Za-z0-9.-]+\*$/;
     return wildcardRegex.test(bundleIdentifier);

package/build/project/projectUtils.js

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

package/build/project/publish.js

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

package/build/project/workflow.js

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

package/build/submit/ArchiveSource.d.ts

@@ -1,11 +1,13 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildFragment } from '../graphql/generated';
+export declare const BUILD_LIST_ITEM_COUNT = 4;
 export declare enum ArchiveSourceType {
     url = 0,
     latest = 1,
     path = 2,
     buildId = 3,
-    prompt = 4
+    buildList = 4,
+    prompt = 5
 }
 interface ArchiveSourceBase {
     sourceType: ArchiveSourceType;
@@ -28,6 +30,9 @@ interface ArchiveBuildIdSource extends ArchiveSourceBase {
     sourceType: ArchiveSourceType.buildId;
     id: string;
 }
+interface ArchiveBuildListSource extends ArchiveSourceBase {
+    sourceType: ArchiveSourceType.buildList;
+}
 interface ArchivePromptSource extends ArchiveSourceBase {
     sourceType: ArchiveSourceType.prompt;
 }
@@ -36,7 +41,7 @@ export interface Archive {
     source: ArchiveSource;
     url?: string;
 }
-export declare type ArchiveSource = ArchiveUrlSource | ArchiveLatestSource | ArchivePathSource | ArchiveBuildIdSource | ArchivePromptSource;
+export declare type ArchiveSource = ArchiveUrlSource | ArchiveLatestSource | ArchivePathSource | ArchiveBuildIdSource | ArchiveBuildListSource | ArchivePromptSource;
 export declare function getArchiveAsync(source: ArchiveSource): Promise<Archive>;
 export declare function isUuidV4(s: string): boolean;
 export {};

package/build/submit/ArchiveSource.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUuidV4 = exports.getArchiveAsync = exports.ArchiveSourceType = void 0;
+exports.isUuidV4 = exports.getArchiveAsync = exports.ArchiveSourceType = exports.BUILD_LIST_ITEM_COUNT = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const url_1 = require("url");
 const uuid = (0, tslib_1.__importStar)(require("uuid"));
+const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
@@ -13,13 +14,15 @@ const platform_1 = require("../platform");
 const prompts_1 = require("../prompts");
 const builds_1 = require("./utils/builds");
 const files_1 = require("./utils/files");
+exports.BUILD_LIST_ITEM_COUNT = 4;
 var ArchiveSourceType;
 (function (ArchiveSourceType) {
     ArchiveSourceType[ArchiveSourceType["url"] = 0] = "url";
     ArchiveSourceType[ArchiveSourceType["latest"] = 1] = "latest";
     ArchiveSourceType[ArchiveSourceType["path"] = 2] = "path";
     ArchiveSourceType[ArchiveSourceType["buildId"] = 3] = "buildId";
-    ArchiveSourceType[ArchiveSourceType["prompt"] = 4] = "prompt";
+    ArchiveSourceType[ArchiveSourceType["buildList"] = 4] = "buildList";
+    ArchiveSourceType[ArchiveSourceType["prompt"] = 5] = "prompt";
 })(ArchiveSourceType = exports.ArchiveSourceType || (exports.ArchiveSourceType = {}));
 async function getArchiveAsync(source) {
     switch (source.sourceType) {
@@ -38,6 +41,9 @@ async function getArchiveAsync(source) {
         case ArchiveSourceType.buildId: {
             return await handleBuildIdSourceAsync(source);
         }
+        case ArchiveSourceType.buildList: {
+            return await handleBuildListSourceAsync(source);
+        }
     }
 }
 exports.getArchiveAsync = getArchiveAsync;
@@ -67,7 +73,7 @@ async function handleUrlSourceAsync(source) {
 }
 async function handleLatestSourceAsync(source) {
     try {
-        const latestBuild = await (0, builds_1.getLatestBuildForSubmissionAsync)((0, AppPlatform_1.toAppPlatform)(source.platform), source.projectId);
+        const [latestBuild] = await (0, builds_1.getRecentBuildsForSubmissionAsync)((0, AppPlatform_1.toAppPlatform)(source.platform), source.projectId);
         if (!latestBuild) {
             log_1.default.error(chalk_1.default.bold("Couldn't find any builds for this project on EAS servers. It looks like you haven't run 'eas build' yet."));
             return getArchiveAsync({
@@ -128,6 +134,83 @@ async function handleBuildIdSourceAsync(source) {
         });
     }
 }
+async function handleBuildListSourceAsync(source) {
+    try {
+        const appPlatform = (0, AppPlatform_1.toAppPlatform)(source.platform);
+        const expiryDate = new Date(); // artifacts expire after 30 days
+        expiryDate.setDate(expiryDate.getDate() - 30);
+        const recentBuilds = await (0, builds_1.getRecentBuildsForSubmissionAsync)(appPlatform, source.projectId, {
+            limit: exports.BUILD_LIST_ITEM_COUNT,
+        });
+        if (recentBuilds.length < 1) {
+            log_1.default.error(chalk_1.default.bold(`Couldn't find any ${platform_1.appPlatformDisplayNames[appPlatform]} builds for this project on EAS servers. ` +
+                "It looks like you haven't run 'eas build' yet."));
+            return getArchiveAsync({
+                ...source,
+                sourceType: ArchiveSourceType.prompt,
+            });
+        }
+        if (recentBuilds.every(it => new Date(it.updatedAt) < expiryDate)) {
+            log_1.default.error(chalk_1.default.bold('It looks like all of your build artifacts have expired. ' +
+                'EAS keeps your build artifacts only for 30 days.'));
+            return getArchiveAsync({
+                ...source,
+                sourceType: ArchiveSourceType.prompt,
+            });
+        }
+        const choices = recentBuilds.map(build => formatBuildChoice(build, expiryDate));
+        choices.push({
+            title: 'None of the above (select another option)',
+            value: null,
+        });
+        const { selectedBuild } = await (0, prompts_1.promptAsync)({
+            name: 'selectedBuild',
+            type: 'select',
+            message: 'Which build would you like to submit?',
+            choices: choices.map(choice => ({ ...choice, title: `- ${choice.title}` })),
+            // @ts-expect-error field documented in npm, but not defined in typescript
+            warn: 'This artifact has expired',
+        });
+        if (selectedBuild == null) {
+            return getArchiveAsync({
+                ...source,
+                sourceType: ArchiveSourceType.prompt,
+            });
+        }
+        return {
+            build: selectedBuild,
+            source,
+        };
+    }
+    catch (err) {
+        log_1.default.error(err);
+        throw err;
+    }
+}
+function formatBuildChoice(build, expiryDate) {
+    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, } = build;
+    const formatValue = (field) => field ? chalk_1.default.bold(field) : chalk_1.default.dim('Unknown');
+    const buildDate = new Date(updatedAt);
+    const maybeRuntimeVersion = runtimeVersion ? `Runtime: ${formatValue(runtimeVersion)}` : null;
+    const maybeSdkVersion = sdkVersion ? `SDK: ${formatValue(sdkVersion)}` : null;
+    const appBuildVersionString = `${platform === generated_1.AppPlatform.Android ? 'Version code' : 'Build number'}: ${formatValue(appBuildVersion)}`;
+    const title = [
+        `ID: ${chalk_1.default.dim(id)}, Finished at: ${chalk_1.default.bold(buildDate.toLocaleString())}`,
+        [
+            `\tApp version: ${formatValue(appVersion)}, ${appBuildVersionString}`,
+            maybeRuntimeVersion,
+            maybeSdkVersion,
+        ]
+            .filter(it => it != null)
+            .join(', '),
+        `\tProfile: ${formatValue(buildProfile)}, Release channel: ${formatValue(releaseChannel)}`,
+    ].join('\n');
+    return {
+        title,
+        value: build,
+        disabled: buildDate < expiryDate,
+    };
+}
 async function handlePromptSourceAsync(source) {
     const { sourceType: sourceTypeRaw } = await (0, prompts_1.promptAsync)({
         name: 'sourceType',
@@ -135,16 +218,16 @@ async function handlePromptSourceAsync(source) {
         message: 'What would you like to submit?',
         choices: [
             {
-                title: 'Latest finished build from EAS',
-                value: ArchiveSourceType.latest,
+                title: 'Select a build from EAS',
+                value: ArchiveSourceType.buildList,
             },
-            { title: 'I have a url to the app archive', value: ArchiveSourceType.url },
+            { title: 'Provide a URL to the app archive', value: ArchiveSourceType.url },
             {
-                title: 'Local app binary file',
+                title: 'Provide a path to a local app binary file',
                 value: ArchiveSourceType.path,
             },
             {
-                title: 'A build identified by a build ID',
+                title: 'Provide a build ID to identify a build on EAS',
                 value: ArchiveSourceType.buildId,
             },
         ],
@@ -167,10 +250,10 @@ async function handlePromptSourceAsync(source) {
                 path,
             });
         }
-        case ArchiveSourceType.latest: {
+        case ArchiveSourceType.buildList: {
             return getArchiveAsync({
                 ...source,
-                sourceType: ArchiveSourceType.latest,
+                sourceType: ArchiveSourceType.buildList,
             });
         }
         case ArchiveSourceType.buildId: {
@@ -181,7 +264,7 @@ async function handlePromptSourceAsync(source) {
                 id,
             });
         }
-        case ArchiveSourceType.prompt:
+        default:
             throw new Error('This should never happen');
     }
 }

package/build/submit/ios/AscApiKeySource.d.ts

@@ -0,0 +1,28 @@
+import { AscApiKeyPath, MinimalAscApiKey } from '../../credentials/ios/credentials';
+export declare enum AscApiKeySourceType {
+    path = 0,
+    prompt = 1
+}
+interface AscApiKeySourceBase {
+    sourceType: AscApiKeySourceType;
+}
+interface AscApiKeyPromptSource extends AscApiKeySourceBase {
+    sourceType: AscApiKeySourceType.prompt;
+}
+interface AscApiKeyEnvVarSource extends AscApiKeySourceBase {
+    sourceType: AscApiKeySourceType.path;
+    path: AscApiKeyPath;
+}
+export declare type AscApiKeySource = AscApiKeyEnvVarSource | AscApiKeyPromptSource;
+declare type AscApiKeySummary = {
+    source: 'local' | 'EAS servers';
+    path?: string;
+    keyId: string;
+};
+export declare type AscApiKeyResult = {
+    result: MinimalAscApiKey;
+    summary: AscApiKeySummary;
+};
+export declare function getAscApiKeyLocallyAsync(source: AscApiKeySource): Promise<AscApiKeyResult>;
+export declare function getAscApiKeyPathAsync(source: AscApiKeySource): Promise<AscApiKeyPath>;
+export {};

package/build/submit/ios/AscApiKeySource.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAscApiKeyPathAsync = exports.getAscApiKeyLocallyAsync = exports.AscApiKeySourceType = void 0;
+const tslib_1 = require("tslib");
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const AscApiKeyUtils_1 = require("../../credentials/ios/actions/AscApiKeyUtils");
+const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const files_1 = require("../utils/files");
+var AscApiKeySourceType;
+(function (AscApiKeySourceType) {
+    AscApiKeySourceType[AscApiKeySourceType["path"] = 0] = "path";
+    AscApiKeySourceType[AscApiKeySourceType["prompt"] = 1] = "prompt";
+})(AscApiKeySourceType = exports.AscApiKeySourceType || (exports.AscApiKeySourceType = {}));
+async function getAscApiKeyLocallyAsync(source) {
+    const ascApiKeyPath = await getAscApiKeyPathAsync(source);
+    const { keyP8Path, keyId, issuerId } = ascApiKeyPath;
+    const keyP8 = await fs_extra_1.default.readFile(keyP8Path, 'utf-8');
+    return {
+        result: { keyP8, keyId, issuerId },
+        summary: {
+            source: 'local',
+            path: keyP8Path,
+            keyId,
+        },
+    };
+}
+exports.getAscApiKeyLocallyAsync = getAscApiKeyLocallyAsync;
+async function getAscApiKeyPathAsync(source) {
+    switch (source.sourceType) {
+        case AscApiKeySourceType.path:
+            return await handlePathSourceAsync(source);
+        case AscApiKeySourceType.prompt:
+            return await handlePromptSourceAsync(source);
+    }
+}
+exports.getAscApiKeyPathAsync = getAscApiKeyPathAsync;
+async function handlePathSourceAsync(source) {
+    const { keyP8Path } = source.path;
+    if (!(await (0, files_1.isExistingFileAsync)(keyP8Path))) {
+        log_1.default.warn(`File ${keyP8Path} doesn't exist.`);
+        return await getAscApiKeyPathAsync({ sourceType: AscApiKeySourceType.prompt });
+    }
+    return source.path;
+}
+async function handlePromptSourceAsync(_source) {
+    const ascApiKeyPath = await (0, AscApiKeyUtils_1.promptForAscApiKeyAsync)();
+    return await getAscApiKeyPathAsync({
+        sourceType: AscApiKeySourceType.path,
+        path: ascApiKeyPath,
+    });
+}

package/build/submit/ios/IosSubmitCommand.d.ts

@@ -5,8 +5,10 @@ export default class IosSubmitCommand {
     private ctx;
     constructor(ctx: SubmissionContext<Platform.IOS>);
     runAsync(): Promise<SubmissionFragment>;
+    private resolveCredentialSubmissionOptionsAsync;
     private resolveSubmissionOptionsAsync;
     private resolveAppSpecificPasswordSource;
+    private resolveAscApiKeySource;
     private resolveArchiveSource;
     private resolveAscAppIdentifierAsync;
     private resolveAppleIdUsernameAsync;