eas-cli 0.53.1 → 0.55.0

package/build/metadata/apple/tasks/app-review-detail.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppReviewDetailTask = void 0;
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const log_1 = tslib_1.__importDefault(require("../../../log"));
+const log_2 = require("../../utils/log");
+const task_1 = require("../task");
+/** Handle all contact, demo account, or instruction info that are required for the App Store review team. */
+class AppReviewDetailTask extends task_1.AppleTask {
+    constructor() {
+        super(...arguments);
+        this.name = () => 'app review detail';
+    }
+    async prepareAsync({ context }) {
+        var _a;
+        (0, assert_1.default)(context.version, `App version not initialized, can't download store review details`);
+        context.reviewDetail = (_a = (await context.version.getAppStoreReviewDetailAsync())) !== null && _a !== void 0 ? _a : undefined;
+    }
+    async downloadAsync({ config, context }) {
+        if (context.reviewDetail) {
+            config.setReviewDetails(context.reviewDetail.attributes);
+        }
+    }
+    async uploadAsync({ config, context }) {
+        const reviewDetail = config.getReviewDetails();
+        if (!reviewDetail) {
+            return log_1.default.log((0, chalk_1.default) `{dim - Skipped store review details, not configured}`);
+        }
+        (0, assert_1.default)(context.version, `App version not initialized, can't upload store review details`);
+        const { versionString } = context.version.attributes;
+        if (!context.reviewDetail) {
+            // We can't set the demo required property when creating, omit it from the request
+            const { demoAccountRequired, ...reviewDetailsToCreate } = reviewDetail;
+            context.reviewDetail = await (0, log_2.logAsync)(() => context.version.createReviewDetailAsync(reviewDetailsToCreate), {
+                pending: `Creating store review details for ${chalk_1.default.bold(versionString)}...`,
+                success: `Created store review details for ${chalk_1.default.bold(versionString)}`,
+                failure: `Failed creating store review details for ${chalk_1.default.bold(versionString)}`,
+            });
+        }
+        context.reviewDetail = await (0, log_2.logAsync)(() => context.reviewDetail.updateAsync(reviewDetail), {
+            pending: `Updating store review details for ${chalk_1.default.bold(versionString)}...`,
+            success: `Updated store review details for ${chalk_1.default.bold(versionString)}`,
+            failure: `Failed updating store review details for ${chalk_1.default.bold(versionString)}`,
+        });
+    }
+}
+exports.AppReviewDetailTask = AppReviewDetailTask;

package/build/metadata/apple/tasks/app-version.js

@@ -11,11 +11,12 @@ const retry_1 = require("../../utils/retry");
 const task_1 = require("../task");
 class AppVersionTask extends task_1.AppleTask {
     constructor(options = {}) {
+        var _a, _b;
         super();
         this.name = () => (this.options.editLive ? 'live app version' : 'editable app version');
         this.options = {
-            platform: options.platform || apple_utils_1.Platform.IOS,
-            editLive: options.editLive || false,
+            platform: (_a = options.platform) !== null && _a !== void 0 ? _a : apple_utils_1.Platform.IOS,
+            editLive: (_b = options.editLive) !== null && _b !== void 0 ? _b : false,
         };
     }
     async prepareAsync({ context }) {
@@ -42,13 +43,14 @@ class AppVersionTask extends task_1.AppleTask {
             log_1.default.log((0, chalk_1.default) `{dim - Skipped version and release update, not configured}`);
         }
         else {
-            const description = [version && 'version info', release && 'release info']
+            const { versionString } = context.version.attributes;
+            const description = [version && 'version', release && 'release']
                 .filter(Boolean)
                 .join(' and ');
             context.version = await (0, log_2.logAsync)(() => context.version.updateAsync({ ...version, ...release }), {
-                pending: `Updating ${description}...`,
-                success: `Updated ${description}`,
-                failure: `Failed updating ${description}`,
+                pending: `Updating ${description} info for ${chalk_1.default.bold(versionString)}...`,
+                success: `Updated ${description} info for ${chalk_1.default.bold(versionString)}`,
+                failure: `Failed updating ${description} info for ${chalk_1.default.bold(versionString)}`,
             });
         }
         const locales = config.getLocales();
@@ -62,12 +64,14 @@ class AppVersionTask extends task_1.AppleTask {
                     continue;
                 }
                 const oldModel = context.versionLocales.find(model => model.attributes.locale === locale);
-                await (0, log_2.logAsync)(() => oldModel
-                    ? oldModel.updateAsync(attributes)
-                    : context.version.createLocalizationAsync({ ...attributes, locale }), {
-                    pending: `${oldModel ? 'Updating' : 'Creating'} localized version for ${locale}...`,
-                    success: `${oldModel ? 'Updated' : 'Created'} localized version for ${locale}`,
-                    failure: `Failed ${oldModel ? 'updating' : 'creating'} localized version for ${locale}`,
+                await (0, log_2.logAsync)(async () => {
+                    return oldModel
+                        ? await oldModel.updateAsync(attributes)
+                        : await context.version.createLocalizationAsync({ ...attributes, locale });
+                }, {
+                    pending: `${oldModel ? 'Updating' : 'Creating'} localized version for ${chalk_1.default.bold(locale)}...`,
+                    success: `${oldModel ? 'Updated' : 'Created'} localized version for ${chalk_1.default.bold(locale)}`,
+                    failure: `Failed ${oldModel ? 'updating' : 'creating'} localized version for ${chalk_1.default.bold(locale)}`,
                 });
             }
             context.versionLocales = await context.version.getLocalizationsAsync();

package/build/metadata/apple/tasks/index.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAppleTasks = void 0;
 const age_rating_1 = require("./age-rating");
 const app_info_1 = require("./app-info");
+const app_review_detail_1 = require("./app-review-detail");
 const app_version_1 = require("./app-version");
 /**
  * List of all eligible tasks to sync local store configuration to the App store.
  */
 function createAppleTasks(_ctx) {
-    return [new app_version_1.AppVersionTask(), new app_info_1.AppInfoTask(), new age_rating_1.AgeRatingTask()];
+    return [new app_version_1.AppVersionTask(), new app_info_1.AppInfoTask(), new age_rating_1.AgeRatingTask(), new app_review_detail_1.AppReviewDetailTask()];
 }
 exports.createAppleTasks = createAppleTasks;

package/build/metadata/apple/types.d.ts

@@ -1,20 +1,18 @@
 /// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
-import type { AgeRatingDeclarationProps, AppCategoryId, AppSubcategoryId } from '@expo/apple-utils';
+import type { AgeRatingDeclarationProps } from '@expo/apple-utils';
 export declare type AppleLocale = string;
 export interface AppleMetadata {
     copyright?: string;
     info?: Record<AppleLocale, AppleInfo>;
-    categories?: AppCategoryId[] | AppleCategory;
+    categories?: AppleCategory;
     release?: AppleRelease;
     advisory?: AppleAdvisory;
     preview?: Record<string, string[]>;
     review?: AppleReview;
 }
 export declare type AppleAdvisory = Partial<AgeRatingDeclarationProps>;
-export interface AppleCategory {
-    category: AppCategoryId;
-    subcategory?: AppSubcategoryId[];
-}
+/** Apps can define up to two categories, or categories with up to two subcategories */
+export declare type AppleCategory = (string | string[])[];
 export interface AppleRelease {
     isPhasedReleaseEnabled?: boolean;
     shouldResetRatings?: boolean;
@@ -39,12 +37,12 @@ export interface AppleInfo {
     supportUrl?: string;
 }
 export interface AppleReview {
-    firstName?: string;
-    lastName?: string;
-    phone?: string;
-    email?: string;
+    firstName: string;
+    lastName: string;
+    phone: string;
+    email: string;
     demoUsername?: string;
     demoPassword?: string;
+    demoRequired?: boolean;
     notes?: string;
-    attachment?: string;
 }

package/build/metadata/context.js

@@ -4,34 +4,27 @@ exports.ensureMetadataAppStoreAuthenticatedAsync = exports.createMetadataContext
 const tslib_1 = require("tslib");
 const apple_utils_1 = require("@expo/apple-utils");
 const eas_build_job_1 = require("@expo/eas-build-job");
+const eas_json_1 = require("@expo/eas-json");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const authenticate_1 = require("../credentials/ios/appstore/authenticate");
 const expoConfig_1 = require("../project/expoConfig");
 const bundleIdentifier_1 = require("../project/ios/bundleIdentifier");
 const actions_1 = require("../user/actions");
-const profiles_1 = require("../utils/profiles");
 /**
  * Metadata uses the submission profile to find the configured metadata filename.
  * Note, only iOS is supported for metadata right now.
  */
 async function createMetadataContextAsync(params) {
-    var _a, _b;
-    const submissionProfiles = await (0, profiles_1.getProfilesAsync)({
-        type: 'submit',
-        platforms: [eas_build_job_1.Platform.IOS],
-        projectDir: params.projectDir,
-        profileName: params.profileName,
-    });
-    const submissionProfile = submissionProfiles.find(profile => profile.platform === eas_build_job_1.Platform.IOS);
-    (0, assert_1.default)(submissionProfile, 'Could not resolve the iOS submission profile, only iOS is supported for metadata');
-    const iosSubmissionProfile = submissionProfile.profile;
+    var _a, _b, _c;
+    const easJsonReader = new eas_json_1.EasJsonReader(params.projectDir);
+    const submitProfile = await easJsonReader.getSubmitProfileAsync(eas_build_job_1.Platform.IOS, params.profileName);
     const exp = (_a = params.exp) !== null && _a !== void 0 ? _a : (0, expoConfig_1.getExpoConfig)(params.projectDir);
     const user = await (0, actions_1.ensureLoggedInAsync)();
-    const bundleIdentifier = await (0, bundleIdentifier_1.getBundleIdentifierAsync)(params.projectDir, exp);
+    const bundleIdentifier = (_b = submitProfile.bundleIdentifier) !== null && _b !== void 0 ? _b : (await (0, bundleIdentifier_1.getBundleIdentifierAsync)(params.projectDir, exp));
     return {
         platform: eas_build_job_1.Platform.IOS,
-        profile: iosSubmissionProfile,
-        metadataPath: (_b = iosSubmissionProfile.metadataPath) !== null && _b !== void 0 ? _b : 'store.config.json',
+        profile: submitProfile,
+        metadataPath: (_c = submitProfile.metadataPath) !== null && _c !== void 0 ? _c : 'store.config.json',
         user,
         credentialsCtx: params.credentialsCtx,
         bundleIdentifier,

package/build/metadata/download.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const events_1 = require("../analytics/events");
+const log_1 = tslib_1.__importDefault(require("../log"));
 const prompts_1 = require("../prompts");
 const tasks_1 = require("./apple/tasks");
 const config_1 = require("./config");
@@ -28,6 +29,8 @@ async function downloadMetadataAsync(metadataCtx) {
     }
     const { app, auth } = await (0, context_1.ensureMetadataAppStoreAuthenticatedAsync)(metadataCtx);
     const { unsubscribeTelemetry, executionId } = (0, telemetry_1.subscribeTelemetry)(events_1.MetadataEvent.APPLE_METADATA_DOWNLOAD, { app, auth });
+    log_1.default.addNewLineIfNone();
+    log_1.default.log('Downloading App Store configuration...');
     const errors = [];
     const config = (0, config_1.createAppleWriter)();
     const tasks = (0, tasks_1.createAppleTasks)(metadataCtx);
@@ -48,8 +51,12 @@ async function downloadMetadataAsync(metadataCtx) {
             errors.push(error);
         }
     }
-    await fs_extra_1.default.writeJson(filePath, config.toSchema(), { spaces: 2 });
-    unsubscribeTelemetry();
+    try {
+        await fs_extra_1.default.writeJson(filePath, config.toSchema(), { spaces: 2 });
+    }
+    finally {
+        unsubscribeTelemetry();
+    }
     if (errors.length > 0) {
         throw new errors_1.MetadataDownloadError(errors, executionId);
     }

package/build/metadata/errors.d.ts

@@ -5,8 +5,8 @@ import type { ErrorObject } from 'ajv';
  * and should contain useful information for the user to solve before trying again.
  */
 export declare class MetadataValidationError extends Error {
-    readonly errors?: ErrorObject[] | undefined;
-    constructor(message?: string, errors?: ErrorObject[] | undefined);
+    readonly errors: ErrorObject[];
+    constructor(message?: string, errors?: ErrorObject[]);
 }
 /**
  * If a single entity failed to update, we don't block the other entities from uploading.
@@ -30,6 +30,11 @@ export declare class MetadataDownloadError extends Error {
     readonly executionId: string;
     constructor(errors: Error[], executionId: string);
 }
+/**
+ * Log the encountered metadata validation error in detail for the user.
+ * This should help communicate any possible configuration error and help the user resolve it.
+ */
+export declare function logMetadataValidationError(error: MetadataValidationError): void;
 /**
  * Handle a thrown metadata error by informing the user what went wrong.
  * If a normal error is thrown, this method will re-throw that error to avoid consuming it.

package/build/metadata/errors.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMetadataError = exports.MetadataDownloadError = exports.MetadataUploadError = exports.MetadataValidationError = void 0;
+exports.handleMetadataError = exports.logMetadataValidationError = exports.MetadataDownloadError = exports.MetadataUploadError = exports.MetadataValidationError = void 0;
 const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log_1 = tslib_1.__importStar(require("../log"));
 /**
  * Before syncing data to the ASC API, we need to validate the metadata config.
@@ -9,7 +10,7 @@ const log_1 = tslib_1.__importStar(require("../log"));
  * and should contain useful information for the user to solve before trying again.
  */
 class MetadataValidationError extends Error {
-    constructor(message, errors) {
+    constructor(message, errors = []) {
         super(message !== null && message !== void 0 ? message : 'Store configuration validation failed');
         this.errors = errors;
     }
@@ -43,6 +44,20 @@ class MetadataDownloadError extends Error {
     }
 }
 exports.MetadataDownloadError = MetadataDownloadError;
+/**
+ * Log the encountered metadata validation error in detail for the user.
+ * This should help communicate any possible configuration error and help the user resolve it.
+ */
+function logMetadataValidationError(error) {
+    var _a;
+    log_1.default.newLine();
+    log_1.default.error(chalk_1.default.bold(error.message));
+    if (((_a = error.errors) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        // TODO(cedric): group errors by property to make multiple errors for same property more readable
+        log_1.default.log(error.errors.map(err => `  - ${chalk_1.default.bold(err.dataPath)} ${err.message}`).join('\n'));
+    }
+}
+exports.logMetadataValidationError = logMetadataValidationError;
 /**
  * Handle a thrown metadata error by informing the user what went wrong.
  * If a normal error is thrown, this method will re-throw that error to avoid consuming it.
@@ -50,12 +65,16 @@ exports.MetadataDownloadError = MetadataDownloadError;
 function handleMetadataError(error) {
     var _a;
     if (error instanceof MetadataValidationError) {
-        log_1.default.error(error.message);
-        log_1.default.log((_a = error.errors) === null || _a === void 0 ? void 0 : _a.map(err => `  - ${err.dataPath} ${err.message}`).join('\n'));
-        return;
+        return logMetadataValidationError(error);
     }
     if (error instanceof MetadataDownloadError || error instanceof MetadataUploadError) {
-        log_1.default.error(error.message);
+        log_1.default.newLine();
+        log_1.default.error(chalk_1.default.bold(error.message));
+        if (((_a = error.errors) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            log_1.default.newLine();
+            log_1.default.error(error.errors.map(err => err.message).join('\n\n'));
+        }
+        log_1.default.newLine();
         log_1.default.log('Please check the logs for any configuration issues.');
         log_1.default.log('If this issue persists, please open a new issue at:');
         // TODO: add execution ID to the issue template link

package/build/metadata/upload.d.ts

@@ -3,4 +3,6 @@ import { MetadataContext } from './context';
  * Sync a local store configuration with the stores.
  * Note, only App Store is supported at this time.
  */
-export declare function uploadMetadataAsync(metadataCtx: MetadataContext): Promise<void>;
+export declare function uploadMetadataAsync(metadataCtx: MetadataContext): Promise<{
+    appleLink: string;
+}>;

package/build/metadata/upload.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const events_1 = require("../analytics/events");
+const log_1 = tslib_1.__importDefault(require("../log"));
+const prompts_1 = require("../prompts");
 const tasks_1 = require("./apple/tasks");
 const config_1 = require("./config");
 const context_1 = require("./context");
@@ -19,13 +21,24 @@ async function uploadMetadataAsync(metadataCtx) {
     if (!(await fs_extra_1.default.pathExists(filePath))) {
         throw new errors_1.MetadataValidationError(`Store configuration file not found "${filePath}"`);
     }
-    const { app, auth } = await (0, context_1.ensureMetadataAppStoreAuthenticatedAsync)(metadataCtx);
-    const { unsubscribeTelemetry, executionId } = (0, telemetry_1.subscribeTelemetry)(events_1.MetadataEvent.APPLE_METADATA_UPLOAD, { app, auth });
     const fileData = await fs_extra_1.default.readJson(filePath);
     const { valid, errors: validationErrors } = (0, config_1.validateConfig)(fileData);
     if (!valid) {
-        throw new errors_1.MetadataValidationError(`Store configuration errors found`, validationErrors);
+        const error = new errors_1.MetadataValidationError(`Store configuration errors found`, validationErrors);
+        (0, errors_1.logMetadataValidationError)(error);
+        log_1.default.newLine();
+        log_1.default.warn('Without further updates, the current store configuration may fail to be synchronized with the App Store or pass App Store review.');
+        const attempt = await (0, prompts_1.confirmAsync)({
+            message: 'Do you still want to push the store configuration?',
+        });
+        if (!attempt) {
+            throw error;
+        }
     }
+    const { app, auth } = await (0, context_1.ensureMetadataAppStoreAuthenticatedAsync)(metadataCtx);
+    const { unsubscribeTelemetry, executionId } = (0, telemetry_1.subscribeTelemetry)(events_1.MetadataEvent.APPLE_METADATA_UPLOAD, { app, auth });
+    log_1.default.addNewLineIfNone();
+    log_1.default.log('Uploading App Store configuration...');
     const errors = [];
     const config = (0, config_1.createAppleReader)(fileData);
     const tasks = (0, tasks_1.createAppleTasks)(metadataCtx);
@@ -50,5 +63,6 @@ async function uploadMetadataAsync(metadataCtx) {
     if (errors.length > 0) {
         throw new errors_1.MetadataUploadError(errors, executionId);
     }
+    return { appleLink: `https://appstoreconnect.apple.com/apps/${app.id}/appstore` };
 }
 exports.uploadMetadataAsync = uploadMetadataAsync;

package/build/metadata/utils/date.d.ts

@@ -9,4 +9,4 @@
  *   "pointer": "/data/attributes/earliestReleaseDate"
  * }
  */
-export declare function removeDatePrecision(date: any): null | Date;
+export declare function removeDatePrecision(date: null | undefined | string | number | Date): null | Date;

package/build/project/android/applicationId.js

@@ -10,6 +10,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const appJson_1 = require("../../build/utils/appJson");
+const env_1 = tslib_1.__importDefault(require("../../env"));
 const log_1 = tslib_1.__importStar(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
@@ -37,6 +38,9 @@ class AmbiguousApplicationIdError extends Error {
 }
 exports.AmbiguousApplicationIdError = AmbiguousApplicationIdError;
 async function getApplicationIdFromBareAsync(projectDir, gradleContext) {
+    if (env_1.default.overrideAndroidApplicationId) {
+        return env_1.default.overrideAndroidApplicationId;
+    }
     const errorMessage = 'Could not read applicationId from Android project.';
     if (gradleContext) {
         const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);

package/build/project/ensureProjectExists.js

@@ -27,7 +27,10 @@ async function ensureProjectExistsAsync(projectInfo) {
     const account = (0, Account_1.findAccountByName)(actor.accounts, accountName);
     (0, assert_1.default)(account, `You must have access to the ${accountName} account to run this command`);
     const projectDashboardUrl = (0, url_1.getProjectDashboardUrl)(accountName, projectName);
-    const projectLink = (0, terminal_link_1.default)(projectFullName, projectDashboardUrl);
+    const projectLink = (0, terminal_link_1.default)(projectFullName, projectDashboardUrl, {
+        // https://github.com/sindresorhus/terminal-link/issues/18#issuecomment-1068020361
+        fallback: () => `${projectFullName} (${projectDashboardUrl})`,
+    });
     const spinner = (0, ora_1.ora)(`Linking to project ${chalk_1.default.bold(projectFullName)}`).start();
     const maybeId = await findProjectIdByAccountNameAndSlugNullableAsync(accountName, projectName);
     if (maybeId) {

package/build/project/publish.d.ts

@@ -73,5 +73,10 @@ export declare function filterOutAssetsThatAlreadyExistAsync(uniqueAssetsWithSto
 })[]): Promise<(RawAsset & {
     storageKey: string;
 })[]>;
-export declare function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAssets): Promise<void>;
+declare type AssetUploadResult = {
+    assetCount: number;
+    uniqueAssetCount: number;
+    uniqueUploadedAssetCount: number;
+};
+export declare function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAssets, updateSpinnerText?: (updatedText: string) => void): Promise<AssetUploadResult>;
 export {};

package/build/project/publish.js

@@ -8,10 +8,10 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const joi_1 = tslib_1.__importDefault(require("joi"));
 const mime_1 = tslib_1.__importDefault(require("mime"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const promise_limit_1 = tslib_1.__importDefault(require("promise-limit"));
 const generated_1 = require("../graphql/generated");
 const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
 const PublishQuery_1 = require("../graphql/queries/PublishQuery");
-const log_1 = tslib_1.__importDefault(require("../log"));
 const uploads_1 = require("../uploads");
 const expoCli_1 = require("../utils/expoCli");
 const uniqBy_1 = tslib_1.__importDefault(require("../utils/expodash/uniqBy"));
@@ -107,7 +107,13 @@ async function buildBundlesAsync({ projectDir, inputDir, }) {
     if (!packageJSON) {
         throw new Error('Could not locate package.json');
     }
-    await (0, expoCli_1.expoCommandAsync)(projectDir, ['export', '--output-dir', inputDir, '--experimental-bundle'], { silent: !log_1.default.isDebug });
+    await (0, expoCli_1.expoCommandAsync)(projectDir, [
+        'export',
+        '--output-dir',
+        inputDir,
+        '--experimental-bundle',
+        '--non-interactive',
+    ]);
 }
 exports.buildBundlesAsync = buildBundlesAsync;
 async function resolveInputDirectoryAsync(customInputDirectory) {
@@ -178,7 +184,7 @@ async function filterOutAssetsThatAlreadyExistAsync(uniqueAssetsWithStorageKey)
     return missingAssets;
 }
 exports.filterOutAssetsThatAlreadyExistAsync = filterOutAssetsThatAlreadyExistAsync;
-async function uploadAssetsAsync(assetsForUpdateInfoGroup) {
+async function uploadAssetsAsync(assetsForUpdateInfoGroup, updateSpinnerText) {
     let assets = [];
     let platform;
     for (platform in assetsForUpdateInfoGroup) {
@@ -188,6 +194,7 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup) {
             ...assetsForUpdateInfoGroup[platform].assets,
         ];
     }
+    updateSpinnerText === null || updateSpinnerText === void 0 ? void 0 : updateSpinnerText(`${assets.length} ${assets.length === 1 ? 'asset' : 'assets'} present`);
     const assetsWithStorageKey = await Promise.all(assets.map(async (asset) => {
         return {
             ...asset,
@@ -195,12 +202,18 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup) {
         };
     }));
     const uniqueAssets = (0, uniqBy_1.default)(assetsWithStorageKey, asset => asset.storageKey);
+    updateSpinnerText === null || updateSpinnerText === void 0 ? void 0 : updateSpinnerText(`${uniqueAssets.length} unique ${uniqueAssets.length === 1 ? 'asset' : 'assets'} found`);
     let missingAssets = await filterOutAssetsThatAlreadyExistAsync(uniqueAssets);
+    const uniqueUploadedAssetCount = missingAssets.length;
     const { specifications } = await PublishMutation_1.PublishMutation.getUploadURLsAsync(missingAssets.map(ma => ma.contentType));
+    const assetUploadPromiseLimit = (0, promise_limit_1.default)(15);
     await Promise.all(missingAssets.map((missingAsset, i) => {
-        const presignedPost = JSON.parse(specifications[i]);
-        return (0, uploads_1.uploadWithPresignedPostAsync)(missingAsset.path, presignedPost);
+        assetUploadPromiseLimit(async () => {
+            const presignedPost = JSON.parse(specifications[i]);
+            return (0, uploads_1.uploadWithPresignedPostAsync)(missingAsset.path, presignedPost);
+        });
     }));
+    updateSpinnerText === null || updateSpinnerText === void 0 ? void 0 : updateSpinnerText(`${missingAssets.length} new ${missingAssets.length === 1 ? 'asset' : 'assets'} uploading`);
     // Wait up to TIMEOUT_LIMIT for assets to be uploaded and processed
     const start = Date.now();
     let timeout = 1;
@@ -213,5 +226,10 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup) {
             throw new Error('Asset upload timed out. Please try again.');
         }
     }
+    return {
+        assetCount: assets.length,
+        uniqueAssetCount: uniqueAssets.length,
+        uniqueUploadedAssetCount,
+    };
 }
 exports.uploadAssetsAsync = uploadAssetsAsync;

package/build/project/workflow.js

@@ -8,23 +8,25 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const vcs_1 = require("../vcs");
 async function resolveWorkflowAsync(projectDir, platform) {
-    let platformWorkflowMarker;
+    let platformWorkflowMarkers;
     try {
-        platformWorkflowMarker =
+        platformWorkflowMarkers =
             platform === eas_build_job_1.Platform.ANDROID
-                ? await config_plugins_1.AndroidConfig.Paths.getAndroidManifestAsync(projectDir)
-                : config_plugins_1.IOSConfig.Paths.getPBXProjectPath(projectDir);
+                ? [
+                    path_1.default.join(projectDir, 'android/app/build.gradle'),
+                    await config_plugins_1.AndroidConfig.Paths.getAndroidManifestAsync(projectDir),
+                ]
+                : [config_plugins_1.IOSConfig.Paths.getPBXProjectPath(projectDir)];
     }
     catch {
         return eas_build_job_1.Workflow.MANAGED;
     }
-    if (await fs_extra_1.default.pathExists(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;
-    }
-    else {
-        return eas_build_job_1.Workflow.MANAGED;
+    for (const marker of platformWorkflowMarkers) {
+        if ((await fs_extra_1.default.pathExists(marker)) &&
+            !(await (0, vcs_1.getVcsClient)().isFileIgnoredAsync(path_1.default.relative(projectDir, marker)))) {
+            return eas_build_job_1.Workflow.GENERIC;
+        }
     }
+    return eas_build_job_1.Workflow.MANAGED;
 }
 exports.resolveWorkflowAsync = resolveWorkflowAsync;

package/build/uploads.d.ts

@@ -6,3 +6,9 @@ export declare function uploadAsync(type: UploadSessionType, path: string, handl
     bucketKey: string;
 }>;
 export declare function uploadWithPresignedPostAsync(file: string, presignedPost: PresignedPost, handleProgressEvent?: ProgressHandler): Promise<string>;
+/**
+ * S3 returns broken URLs, sth like:
+ * https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c
+ * This function replaces %2F with /.
+ */
+export declare function fixArchiveUrl(archiveUrl: string): string;

package/build/uploads.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadWithPresignedPostAsync = exports.uploadAsync = void 0;
+exports.fixArchiveUrl = exports.uploadWithPresignedPostAsync = exports.uploadAsync = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const url_1 = require("url");
 const fetch_1 = tslib_1.__importDefault(require("./fetch"));
 const UploadSessionMutation_1 = require("./graphql/mutations/UploadSessionMutation");
 async function uploadAsync(type, path, handleProgressEvent) {
@@ -45,7 +46,7 @@ async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressE
         try {
             const response = await uploadPromise;
             handleProgressEvent({ isComplete: true });
-            return String(response.headers.get('location'));
+            return fixArchiveUrl(String(response.headers.get('location')));
         }
         catch (error) {
             handleProgressEvent({ isComplete: true, error });
@@ -54,7 +55,18 @@ async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressE
     }
     else {
         const response = await uploadPromise;
-        return String(response.headers.get('location'));
+        return fixArchiveUrl(String(response.headers.get('location')));
     }
 }
 exports.uploadWithPresignedPostAsync = uploadWithPresignedPostAsync;
+/**
+ * S3 returns broken URLs, sth like:
+ * https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c
+ * This function replaces %2F with /.
+ */
+function fixArchiveUrl(archiveUrl) {
+    const parsed = new url_1.URL(archiveUrl);
+    parsed.pathname = decodeURIComponent(parsed.pathname);
+    return parsed.toString();
+}
+exports.fixArchiveUrl = fixArchiveUrl;

package/build/utils/expodash/uniq.d.ts

@@ -0,0 +1 @@
+export default function uniq<T = any>(items: T[]): T[];

package/build/{metadata/utils/array.js → utils/expodash/uniq.js}

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unique = void 0;
-function unique(items) {
+function uniq(items) {
     const set = new Set(items);
     return [...set];
 }
-exports.unique = unique;
+exports.default = uniq;

package/build/utils/profiles.d.ts

@@ -1,13 +1,13 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, ProfileType, SubmitProfile } from '@expo/eas-json';
+import { BuildProfile, EasJsonReader, ProfileType, SubmitProfile } from '@expo/eas-json';
 declare type EasProfile<T extends ProfileType> = T extends 'build' ? BuildProfile<Platform> : SubmitProfile<Platform>;
 export declare type ProfileData<T extends ProfileType> = {
     profile: EasProfile<T>;
     platform: Platform;
     profileName: string;
 };
-export declare function getProfilesAsync<T extends ProfileType>({ projectDir, platforms, profileName, type, }: {
-    projectDir: string;
+export declare function getProfilesAsync<T extends ProfileType>({ easJsonReader, platforms, profileName, type, }: {
+    easJsonReader: EasJsonReader;
     platforms: Platform[];
     profileName?: string;
     type: T;