eas-cli 0.60.0 → 1.1.1

package/build/metadata/config.js

@@ -1,11 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppleWriter = exports.createAppleReader = exports.validateConfig = void 0;
+exports.createAppleWriter = exports.createAppleReader = exports.validateConfig = exports.loadConfigAsync = exports.getStaticConfigFilePath = void 0;
 const tslib_1 = require("tslib");
 const ajv_1 = tslib_1.__importDefault(require("ajv"));
 const assert_1 = tslib_1.__importDefault(require("assert"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const reader_1 = require("./apple/config/reader");
 const writer_1 = require("./apple/config/writer");
+const errors_1 = require("./errors");
+/**
+ * Resolve the dynamic config from the user.
+ * It supports methods, async methods, or objects (json).
+ */
+async function resolveDynamicConfigAsync(configFile) {
+    const userConfigOrFunction = await Promise.resolve().then(() => tslib_1.__importStar(require(configFile))).then(file => { var _a; return (_a = file.default) !== null && _a !== void 0 ? _a : file; });
+    return typeof userConfigOrFunction === 'function'
+        ? await userConfigOrFunction()
+        : userConfigOrFunction;
+}
+/**
+ * Get the static configuration file path, based on the metadata context.
+ * This uses any custom name provided, but swaps out the extension for `.json`.
+ */
+function getStaticConfigFilePath({ projectDir, metadataPath, }) {
+    const configFile = path_1.default.join(projectDir, metadataPath);
+    const configExtension = path_1.default.extname(configFile);
+    return path_1.default.join(projectDir, `${path_1.default.basename(configFile, configExtension)}.json`);
+}
+exports.getStaticConfigFilePath = getStaticConfigFilePath;
+/**
+ * Load the store configuration from a metadata context.
+ * This can load `.json` and `.js` config files, using `require`.
+ * It throws MetadataValidationErrors when the file doesn't exist, or contains errors.
+ * The user is prompted to try anyway when errors are found.
+ */
+async function loadConfigAsync({ projectDir, metadataPath, skipValidation = false, }) {
+    const configFile = path_1.default.join(projectDir, metadataPath);
+    if (!(await fs_extra_1.default.pathExists(configFile))) {
+        throw new errors_1.MetadataValidationError(`Metadata store config file not found: "${configFile}"`);
+    }
+    const configData = await resolveDynamicConfigAsync(configFile);
+    if (!skipValidation) {
+        const { valid, errors: validationErrors } = validateConfig(configData);
+        if (!valid) {
+            throw new errors_1.MetadataValidationError(`Metadata store config errors found`, validationErrors);
+        }
+    }
+    return configData;
+}
+exports.loadConfigAsync = loadConfigAsync;
 /**
  * Run the JSON Schema validation to normalize defaults and flag early config errors.
  * This includes validating the known store limitations for every configurable property.

package/build/metadata/download.js

@@ -17,20 +17,21 @@ const telemetry_1 = require("./utils/telemetry");
  * Note, only App Store is supported at this time.
  */
 async function downloadMetadataAsync(metadataCtx) {
-    const filePath = path_1.default.resolve(metadataCtx.projectDir, metadataCtx.metadataPath);
+    const filePath = (0, config_1.getStaticConfigFilePath)(metadataCtx);
     const fileExists = await fs_extra_1.default.pathExists(filePath);
     if (fileExists) {
+        const filePathRelative = path_1.default.relative(metadataCtx.projectDir, filePath);
         const overwrite = await (0, prompts_1.confirmAsync)({
-            message: `Do you want to overwrite the existing store configuration "${metadataCtx.metadataPath}"?`,
+            message: `Do you want to overwrite the existing "${filePathRelative}"?`,
         });
         if (!overwrite) {
-            throw new errors_1.MetadataValidationError(`Store configuration already exists at "${filePath}"`);
+            throw new errors_1.MetadataValidationError(`Store config already exists at "${filePath}"`);
         }
     }
     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...');
+    log_1.default.log('Downloading App Store config...');
     const errors = [];
     const config = (0, config_1.createAppleWriter)();
     const tasks = (0, tasks_1.createAppleTasks)(metadataCtx);
@@ -52,7 +53,7 @@ async function downloadMetadataAsync(metadataCtx) {
         }
     }
     try {
-        await fs_extra_1.default.writeJson(filePath, config.toSchema(), { spaces: 2 });
+        await fs_extra_1.default.writeJSON(filePath, config.toSchema(), { spaces: 2 });
     }
     finally {
         unsubscribeTelemetry();

package/build/metadata/errors.js

@@ -75,8 +75,8 @@ function handleMetadataError(error) {
             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:');
+        log_1.default.log('Check the logs for any configuration issues.');
+        log_1.default.log('If this issue persists, open a new issue at:');
         // TODO: add execution ID to the issue template link
         log_1.default.log((0, log_1.link)('https://github.com/expo/eas-cli'));
         return;

package/build/metadata/upload.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadMetadataAsync = void 0;
 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");
@@ -18,30 +16,13 @@ const telemetry_1 = require("./utils/telemetry");
  */
 async function uploadMetadataAsync(metadataCtx) {
     var _a;
-    const filePath = path_1.default.resolve(metadataCtx.projectDir, metadataCtx.metadataPath);
-    if (!(await fs_extra_1.default.pathExists(filePath))) {
-        throw new errors_1.MetadataValidationError(`Store configuration file not found "${filePath}"`);
-    }
-    const fileData = await fs_extra_1.default.readJson(filePath);
-    const { valid, errors: validationErrors } = (0, config_1.validateConfig)(fileData);
-    if (!valid) {
-        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 storeConfig = await loadConfigWithValidationPromptAsync(metadataCtx);
     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 config = (0, config_1.createAppleReader)(storeConfig);
     const tasks = (0, tasks_1.createAppleTasks)(metadataCtx, {
         // We need to resolve a different version as soon as possible.
         // This version is the parent model of all changes we are going to push.
@@ -71,3 +52,19 @@ async function uploadMetadataAsync(metadataCtx) {
     return { appleLink: `https://appstoreconnect.apple.com/apps/${app.id}/appstore` };
 }
 exports.uploadMetadataAsync = uploadMetadataAsync;
+async function loadConfigWithValidationPromptAsync(metadataCtx) {
+    try {
+        return await (0, config_1.loadConfigAsync)(metadataCtx);
+    }
+    catch (error) {
+        if (error instanceof errors_1.MetadataValidationError) {
+            (0, errors_1.logMetadataValidationError)(error);
+            log_1.default.newLine();
+            log_1.default.warn('Without further updates, the current store configuration can fail to be synchronized with the App Store or pass App Store review.');
+            if (await (0, prompts_1.confirmAsync)({ message: 'Do you still want to push the store configuration?' })) {
+                return await (0, config_1.loadConfigAsync)({ ...metadataCtx, skipValidation: true });
+            }
+        }
+        throw error;
+    }
+}

package/build/ora.js

@@ -51,7 +51,7 @@ function ora(options) {
         // eslint-disable-next-line no-console
         console.log = logReal;
         // eslint-disable-next-line no-console
-        console.info = logReal;
+        console.info = infoReal;
         // eslint-disable-next-line no-console
         console.warn = warnReal;
         // eslint-disable-next-line no-console

package/build/project/metroConfig.js

@@ -42,7 +42,7 @@ function importMetroConfigFromProject(projectDir) {
     if (!resolvedPath) {
         throw new MetroConfigPackageMissingError('Missing package "metro-config" in the project. ' +
             'This usually means `react-native` is not installed. ' +
-            'Please verify that dependencies in package.json include "react-native" ' +
+            'Verify that dependencies in package.json include "react-native" ' +
             'and run `yarn` or `npm install`.');
     }
     return require(resolvedPath);

package/build/project/projectUtils.d.ts

@@ -8,11 +8,28 @@ export declare function findProjectRootAsync({ cwd, defaultToProcessCwd, }?: {
     cwd?: string;
     defaultToProcessCwd?: boolean;
 }): Promise<string>;
-export declare function setProjectIdAsync(projectDir: string, options?: {
+/**
+ * Save an EAS project ID to the appropriate field in the app config.
+ */
+export declare function saveProjectIdToAppConfigAsync(projectDir: string, projectId: string, options?: {
     env?: Env;
-}): Promise<ExpoConfig | undefined>;
+}): Promise<void>;
+/**
+ * Use the owner/slug to identify an EAS project on the server.
+ *
+ * @returns the EAS project ID from the server
+ */
+export declare function fetchProjectIdFromServerAsync(exp: ExpoConfig): Promise<string>;
+/**
+ * Get the EAS project ID from the app config. If the project ID is not set in the config.
+ * use the owner/slug to identify an EAS project on the server, and attempt to save the
+ * EAS project ID to the appropriate field in the app config.
+ */
 export declare function getProjectIdAsync(exp: ExpoConfig, options?: {
     env?: Env;
+}, findProjectRootOptions?: {
+    cwd?: string;
+    defaultToProcessCwd?: boolean;
 }): Promise<string>;
 export declare function getProjectFullNameAsync(exp: ExpoConfig): Promise<string>;
 /**

package/build/project/projectUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installExpoUpdatesAsync = exports.validateAppVersionRuntimePolicySupportAsync = exports.isExpoUpdatesInstalledOrAvailable = exports.isExpoUpdatesInstalled = exports.promptToCreateProjectIfNotExistsAsync = exports.getProjectConfigDescription = exports.getProjectFullNameAsync = exports.getProjectIdAsync = exports.setProjectIdAsync = exports.findProjectRootAsync = exports.getProjectAccountNameAsync = exports.getUsername = exports.getProjectAccountName = void 0;
+exports.installExpoUpdatesAsync = exports.validateAppVersionRuntimePolicySupportAsync = exports.isExpoUpdatesInstalledOrAvailable = exports.isExpoUpdatesInstalled = exports.promptToCreateProjectIfNotExistsAsync = exports.getProjectConfigDescription = exports.getProjectFullNameAsync = exports.getProjectIdAsync = exports.fetchProjectIdFromServerAsync = exports.saveProjectIdToAppConfigAsync = exports.findProjectRootAsync = exports.getProjectAccountNameAsync = exports.getUsername = exports.getProjectAccountName = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -52,7 +52,7 @@ async function findProjectRootAsync({ cwd, defaultToProcessCwd = false, } = {})
     const projectRootDir = await (0, pkg_dir_1.default)(cwd);
     if (!projectRootDir) {
         if (!defaultToProcessCwd) {
-            throw new Error('Please run this command inside a project directory.');
+            throw new Error('Run this command inside a project directory.');
         }
         else {
             return process.cwd();
@@ -71,15 +71,12 @@ async function findProjectRootAsync({ cwd, defaultToProcessCwd = false, } = {})
     }
 }
 exports.findProjectRootAsync = findProjectRootAsync;
-async function setProjectIdAsync(projectDir, options = {}) {
-    var _a, _b;
+/**
+ * Save an EAS project ID to the appropriate field in the app config.
+ */
+async function saveProjectIdToAppConfigAsync(projectDir, projectId, options = {}) {
+    var _a;
     const exp = (0, expoConfig_1.getExpoConfig)(projectDir, options);
-    const privacy = toAppPrivacy(exp.privacy);
-    const projectId = await (0, ensureProjectExists_1.ensureProjectExistsAsync)({
-        accountName: getProjectAccountName(exp, await (0, actions_1.ensureLoggedInAsync)()),
-        projectName: exp.slug,
-        privacy,
-    });
     const result = await (0, config_1.modifyConfigAsync)(projectDir, {
         extra: { ...exp.extra, eas: { ...(_a = exp.extra) === null || _a === void 0 ? void 0 : _a.eas, projectId } },
     });
@@ -99,36 +96,48 @@ async function setProjectIdAsync(projectDir, options = {}) {
         default:
             throw new Error('Unexpected result type from modifyConfigAsync');
     }
-    log_1.default.withTick(`Linked app.json to project with ID ${chalk_1.default.bold(projectId)}`);
-    return (_b = result.config) === null || _b === void 0 ? void 0 : _b.expo;
 }
-exports.setProjectIdAsync = setProjectIdAsync;
-async function getProjectIdAsync(exp, options = {}) {
-    var _a, _b, _c, _d;
-    if (!process.env.EAS_ENABLE_PROJECT_ID) {
-        const privacy = toAppPrivacy(exp.privacy);
-        return await (0, ensureProjectExists_1.ensureProjectExistsAsync)({
-            accountName: getProjectAccountName(exp, await (0, actions_1.ensureLoggedInAsync)()),
-            projectName: exp.slug,
-            privacy,
-        });
-    }
+exports.saveProjectIdToAppConfigAsync = saveProjectIdToAppConfigAsync;
+/**
+ * Use the owner/slug to identify an EAS project on the server.
+ *
+ * @returns the EAS project ID from the server
+ */
+async function fetchProjectIdFromServerAsync(exp) {
+    const privacy = toAppPrivacy(exp.privacy);
+    return await (0, ensureProjectExists_1.ensureProjectExistsAsync)({
+        accountName: getProjectAccountName(exp, await (0, actions_1.ensureLoggedInAsync)()),
+        projectName: exp.slug,
+        privacy,
+    });
+}
+exports.fetchProjectIdFromServerAsync = fetchProjectIdFromServerAsync;
+/**
+ * Get the EAS project ID from the app config. If the project ID is not set in the config.
+ * use the owner/slug to identify an EAS project on the server, and attempt to save the
+ * EAS project ID to the appropriate field in the app config.
+ */
+async function getProjectIdAsync(exp, options = {}, findProjectRootOptions = {}) {
+    var _a, _b;
     const localProjectId = (_b = (_a = exp.extra) === null || _a === void 0 ? void 0 : _a.eas) === null || _b === void 0 ? void 0 : _b.projectId;
     if (localProjectId) {
         return localProjectId;
     }
-    // Set the project ID if it is missing.
-    const projectDir = await findProjectRootAsync();
+    const projectDir = await findProjectRootAsync(findProjectRootOptions);
     if (!projectDir) {
-        throw new Error('Please run this command inside a project directory.');
+        throw new Error('Run this command inside a project directory.');
+    }
+    const projectId = await fetchProjectIdFromServerAsync(exp);
+    try {
+        await saveProjectIdToAppConfigAsync(projectDir, projectId, options);
     }
-    const newExp = await setProjectIdAsync(projectDir, options);
-    const newLocalProjectId = (_d = (_c = newExp === null || newExp === void 0 ? void 0 : newExp.extra) === null || _c === void 0 ? void 0 : _c.eas) === null || _d === void 0 ? void 0 : _d.projectId;
-    if (!newLocalProjectId) {
-        // throw if we still can't locate the projectId
-        throw new Error('Could not retrieve project ID from app.json');
+    catch (e) {
+        // saveProjectIdToAppConfigAsync already printed out a set of detailed errors and
+        // instructions on how to fix it. To mimic throwing the error but not halting
+        // execution, just warn here with the error message.
+        log_1.default.warn(e.message);
     }
-    return newLocalProjectId;
+    return projectId;
 }
 exports.getProjectIdAsync = getProjectIdAsync;
 const toAppPrivacy = (privacy) => {

package/build/project/publish.js

@@ -14,6 +14,7 @@ const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
 const PublishQuery_1 = require("../graphql/queries/PublishQuery");
 const uploads_1 = require("../uploads");
 const expoCli_1 = require("../utils/expoCli");
+const chunk_1 = tslib_1.__importDefault(require("../utils/expodash/chunk"));
 const uniqBy_1 = tslib_1.__importDefault(require("../utils/expodash/uniqBy"));
 const fileMetadataJoi = joi_1.default.object({
     assets: joi_1.default.array()
@@ -205,7 +206,12 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup, projectId, updateSpin
     updateSpinnerText === null || updateSpinnerText === void 0 ? void 0 : updateSpinnerText(totalAssets, totalAssets);
     let missingAssets = await filterOutAssetsThatAlreadyExistAsync(uniqueAssets);
     const uniqueUploadedAssetCount = missingAssets.length;
-    const { specifications } = await PublishMutation_1.PublishMutation.getUploadURLsAsync(missingAssets.map(ma => ma.contentType));
+    const missingAssetChunks = (0, chunk_1.default)(missingAssets, 100);
+    const specifications = [];
+    for (const missingAssets of missingAssetChunks) {
+        const { specifications: chunkSpecifications } = await PublishMutation_1.PublishMutation.getUploadURLsAsync(missingAssets.map(ma => ma.contentType));
+        specifications.push(...chunkSpecifications);
+    }
     updateSpinnerText === null || updateSpinnerText === void 0 ? void 0 : updateSpinnerText(totalAssets, missingAssets.length);
     const assetUploadPromiseLimit = (0, promise_limit_1.default)(15);
     const [assetLimitPerUpdateGroup] = await Promise.all([
@@ -213,7 +219,7 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup, projectId, updateSpin
         missingAssets.map((missingAsset, i) => {
             assetUploadPromiseLimit(async () => {
                 const presignedPost = JSON.parse(specifications[i]);
-                await (0, uploads_1.uploadWithPresignedPostAsync)(missingAsset.path, presignedPost);
+                await (0, uploads_1.uploadWithPresignedPostWithRetryAsync)(missingAsset.path, presignedPost);
             });
         }),
     ]);

package/build/submit/utils/errors.js

@@ -24,12 +24,12 @@ var SubmissionErrorCode;
     SubmissionErrorCode["IOS_INVALID_PROVISIONING_PROFILE_SIGNATURE"] = "SUBMISSION_SERVICE_IOS_INVALID_PROVISIONING_PROFILE_SIGNATURE";
 })(SubmissionErrorCode || (SubmissionErrorCode = {}));
 const SubmissionErrorMessages = {
-    [SubmissionErrorCode.ARCHIVE_DOWNLOAD_NOT_FOUND_ERROR]: "Failed to download the archive file (Response code: 404 Not Found). Please make sure the URL you've provided is correct.",
+    [SubmissionErrorCode.ARCHIVE_DOWNLOAD_NOT_FOUND_ERROR]: "Failed to download the archive file (Response code: 404 Not Found). Make sure the URL you've provided is correct.",
     [SubmissionErrorCode.ARCHIVE_DOWNLOAD_FORBIDDEN_ERROR]: 'Failed to download the archive file (Response code: 403 Forbidden). This is most probably caused by trying to upload an expired build artifact. All EAS build artifacts expire after 30 days.',
     [SubmissionErrorCode.ARCHIVE_EXTRACT_CORRUPT_ARCHIVE_ERROR]: 'The compressed archive is corrupt, in an unsupported format, or contains an invalid application format. Supported files include .apk, .aab, and .ipa files and one of these files compressed into a .tar.gz archive.',
     [SubmissionErrorCode.ARCHIVE_EXTRACT_NO_FILES_FOUND_ERROR]: "EAS Submit couldn't find a valid build artifact within provided compressed archive.\n" +
         'If you provide a tar.gz archive, it should contain at least one .apk/.aab/.ipa file, depending on the submission platform.',
-    [SubmissionErrorCode.ANDROID_UNKNOWN_ERROR]: "We couldn't figure out what went wrong. Please see logs to learn more.",
+    [SubmissionErrorCode.ANDROID_UNKNOWN_ERROR]: "We couldn't figure out what went wrong. See logs to learn more.",
     [SubmissionErrorCode.ANDROID_FIRST_UPLOAD_ERROR]: "You haven't submitted this app to Google Play Store yet. The first submission of the app needs to be performed manually.\n" +
         `${(0, log_1.learnMore)('https://expo.fyi/first-android-submission')}.`,
     [SubmissionErrorCode.ANDROID_OLD_VERSION_CODE_ERROR]: "You've already submitted this version of the app.\n" +
@@ -42,22 +42,22 @@ const SubmissionErrorMessages = {
         'Versions are identified by Build Numbers (expo.ios.buildNumber in app.json).\n' +
         "If you're submitting an Expo project built with EAS Build, increment the build number in app.json and build the project again.\n" +
         `${(0, log_1.learnMore)('https://expo.fyi/bumping-ios-build-number')}.`,
-    [SubmissionErrorCode.IOS_UNKNOWN_ERROR]: "We couldn't figure out what went wrong. Please see logs to learn more.",
+    [SubmissionErrorCode.IOS_UNKNOWN_ERROR]: "We couldn't figure out what went wrong. See logs to learn more.",
     [SubmissionErrorCode.IOS_MISSING_APP_ICON]: 'Your iOS app icon is missing or is an invalid format. The icon must be a 1024x1024 PNG image with no transparency.\n' +
-        'Please check your icon image and icon configuration in app.json.\n' +
+        'Check your icon image and icon configuration in app.json.\n' +
         `${(0, log_1.learnMore)('https://docs.expo.dev/guides/app-icons/')}`,
     [SubmissionErrorCode.IOS_INVALID_SIGNATURE]: 'Your app signature seems to be invalid.\n' +
-        "Please check your iOS Distribution Certificate and your app's Provisioning Profile.\n" +
+        "Check your iOS Distribution Certificate and your app's Provisioning Profile.\n" +
         `${(0, log_1.learnMore)('https://docs.expo.dev/distribution/app-signing')}`,
-    [SubmissionErrorCode.IOS_INCORRECT_CREDENTIALS]: 'Your Apple ID or app-specific password is incorrect. Please verify that you entered them correctly and try again.',
+    [SubmissionErrorCode.IOS_INCORRECT_CREDENTIALS]: 'Your Apple ID or app-specific password is incorrect. Verify that you entered them correctly and try again.',
     [SubmissionErrorCode.IOS_IPAD_INVALID_ORIENTATION]: "Your app doesn't support iPad multitasking and has to require full screen.\n" +
         "If you're submitting a managed Expo project, set the `expo.ios.requireFullScreen` to true in app.json and build the project again.\n" +
         `${(0, log_1.learnMore)('https://expo.fyi/ipad-requires-fullscreen')}`,
-    [SubmissionErrorCode.IOS_APPLE_MAINTENANCE]: 'It looks like Apple servers are undergoing an unscheduled maintenance. Please try again later.',
+    [SubmissionErrorCode.IOS_APPLE_MAINTENANCE]: 'It looks like Apple servers are undergoing an unscheduled maintenance. Try again later.',
     [SubmissionErrorCode.IOS_INVALID_PROVISIONING_PROFILE_SIGNATURE]: 'Invalid Provisioning Profile Signature (ITMS-90165)\n' +
         "Some of Apple's certificates have expired.\n" +
-        'Please delete your Provisioning Profile from your account. Then rebuild the app interactively to generate a new one, and try submitting it to the App Store again.',
-    [SubmissionErrorCode.UPLOAD_TAKING_TOO_LONG_ERROR]: 'Submission has reached the timeout limit. Please try again.',
+        'Delete your Provisioning Profile from your account. Then rebuild the app interactively to generate a new one, and try submitting it to the App Store again.',
+    [SubmissionErrorCode.UPLOAD_TAKING_TOO_LONG_ERROR]: 'Submission has reached the timeout limit. Try again.',
 };
 function printSubmissionError(error) {
     if (error.errorCode &&

package/build/submit/utils/wait.js

@@ -12,14 +12,11 @@ const APP_STORE_NAMES = {
     [generated_1.AppPlatform.Android]: 'Google Play Store',
     [generated_1.AppPlatform.Ios]: 'Apple App Store Connect',
 };
-const CHECK_TIMEOUT_MS = 3600000;
 const CHECK_INTERVAL_MS = 5000;
 async function waitForSubmissionsEndAsync(initialSubmissions) {
     log_1.default.log(`Waiting for submission${initialSubmissions.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`);
     const spinner = (0, ora_1.ora)(`Submitting`).start();
-    let time = new Date().getTime();
-    const timeoutTime = time + CHECK_TIMEOUT_MS;
-    while (time <= timeoutTime) {
+    while (true) {
         const submissions = await Promise.all(initialSubmissions.map(({ id }) => {
             try {
                 return SubmissionQuery_1.SubmissionQuery.byIdAsync(id, { useCache: false });
@@ -69,11 +66,8 @@ async function waitForSubmissionsEndAsync(initialSubmissions) {
                 return submissions.map(s => (0, nullthrows_1.default)(s));
             }
         }
-        time = new Date().getTime();
         await (0, promise_1.sleepAsync)(CHECK_INTERVAL_MS);
     }
-    spinner.warn('Timed out');
-    throw new Error('Timeout reached! It is taking longer than expected to complete, aborting...');
 }
 exports.waitForSubmissionsEndAsync = waitForSubmissionsEndAsync;
 function getSingleSpinnerText(submission) {

package/build/update/utils.js

@@ -52,7 +52,7 @@ function formatUpdate(update) {
 exports.formatUpdate = formatUpdate;
 function ensureValidVersions(exp, platform) {
     var _a, _b;
-    const error = new Error(`Couldn't find either ${chalk_1.default.bold('runtimeVersion')} or ${chalk_1.default.bold('sdkVersion')} to configure ${chalk_1.default.bold('expo-updates')}. Please specify at least one of these properties under the ${chalk_1.default.bold('expo')} key in ${chalk_1.default.bold('app.json')}. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions/')}`);
+    const error = new Error(`Couldn't find either ${chalk_1.default.bold('runtimeVersion')} or ${chalk_1.default.bold('sdkVersion')} to configure ${chalk_1.default.bold('expo-updates')}. Specify at least one of these properties under the ${chalk_1.default.bold('expo')} key in ${chalk_1.default.bold('app.json')}. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions/')}`);
     if ([platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform) &&
         !(((_a = exp.android) === null || _a === void 0 ? void 0 : _a.runtimeVersion) || exp.runtimeVersion) &&
         !exp.sdkVersion) {

package/build/uploads.d.ts

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

package/build/uploads.js

@@ -1,24 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixS3Url = exports.uploadWithPresignedPostAsync = exports.uploadFileAtPathToS3Async = void 0;
+exports.fixS3Url = exports.uploadWithPresignedPostWithRetryAsync = exports.uploadFileAtPathToS3Async = 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 nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
 const url_1 = require("url");
 const fetch_1 = tslib_1.__importDefault(require("./fetch"));
 const UploadSessionMutation_1 = require("./graphql/mutations/UploadSessionMutation");
 async function uploadFileAtPathToS3Async(type, path, handleProgressEvent) {
     const presignedPost = await UploadSessionMutation_1.UploadSessionMutation.createUploadSessionAsync(type);
     (0, assert_1.default)(presignedPost.fields.key, 'key is not specified in in presigned post');
-    const response = await uploadWithPresignedPostAsync(path, presignedPost, handleProgressEvent);
+    const response = await uploadWithPresignedPostWithProgressAsync(path, presignedPost, handleProgressEvent);
     const location = (0, nullthrows_1.default)(response.headers.get('location'), `location does not exist in response headers (make sure you're uploading to AWS S3)`);
     const url = fixS3Url(location);
     return { url, bucketKey: presignedPost.fields.key };
 }
 exports.uploadFileAtPathToS3Async = uploadFileAtPathToS3Async;
-async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressEvent) {
+async function uploadWithPresignedPostWithRetryAsync(file, presignedPost) {
+    return await (0, promise_retry_1.default)(async (retry) => {
+        // retry fetch errors (usually connection or DNS errors)
+        let response;
+        try {
+            response = await uploadWithPresignedPostAsync(file, presignedPost);
+        }
+        catch (e) {
+            return retry(e);
+        }
+        // retry 408, 429, 5xx as suggested by google
+        if (response.status === 408 ||
+            response.status === 429 ||
+            (response.status >= 500 && response.status <= 599)) {
+            return retry(new Error(`Presigned upload responded with a ${response.status} status`));
+        }
+        // don't retry other errors
+        if (!response.ok) {
+            throw new Error(`Presigned upload responded with a ${response.status} status`);
+        }
+        return response;
+    }, 
+    // retry parameters match google suggested defaults: https://cloud.google.com/storage/docs/retry-strategy#node.js
+    {
+        retries: 3,
+        factor: 2,
+    });
+}
+exports.uploadWithPresignedPostWithRetryAsync = uploadWithPresignedPostWithRetryAsync;
+async function createPresignedPostFormDataAsync(file, presignedPost) {
     const fileStat = await fs_extra_1.default.stat(file);
     const fileSize = fileStat.size;
     const form = new form_data_1.default();
@@ -26,6 +56,21 @@ async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressE
         form.append(fieldKey, fieldValue);
     }
     form.append('file', fs_extra_1.default.createReadStream(file), { knownLength: fileSize });
+    return { form, fileSize };
+}
+async function uploadWithPresignedPostAsync(file, presignedPost) {
+    const { form } = await createPresignedPostFormDataAsync(file, presignedPost);
+    const formHeaders = form.getHeaders();
+    return await (0, fetch_1.default)(presignedPost.url, {
+        method: 'POST',
+        body: form,
+        headers: {
+            ...formHeaders,
+        },
+    });
+}
+async function uploadWithPresignedPostWithProgressAsync(file, presignedPost, handleProgressEvent) {
+    const { form, fileSize } = await createPresignedPostFormDataAsync(file, presignedPost);
     const formHeaders = form.getHeaders();
     const uploadPromise = (0, fetch_1.default)(presignedPost.url, {
         method: 'POST',
@@ -35,32 +80,26 @@ async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressE
         },
     });
     let currentSize = 0;
-    if (handleProgressEvent) {
-        form.addListener('data', (chunk) => {
-            currentSize += Buffer.byteLength(chunk);
-            handleProgressEvent({
-                progress: {
-                    total: fileSize,
-                    percent: currentSize / fileSize,
-                    transferred: currentSize,
-                },
-            });
+    form.addListener('data', (chunk) => {
+        currentSize += Buffer.byteLength(chunk);
+        handleProgressEvent({
+            progress: {
+                total: fileSize,
+                percent: currentSize / fileSize,
+                transferred: currentSize,
+            },
         });
-        try {
-            const response = await uploadPromise;
-            handleProgressEvent({ isComplete: true });
-            return response;
-        }
-        catch (error) {
-            handleProgressEvent({ isComplete: true, error });
-            throw error;
-        }
+    });
+    try {
+        const response = await uploadPromise;
+        handleProgressEvent({ isComplete: true });
+        return response;
     }
-    else {
-        return await uploadPromise;
+    catch (error) {
+        handleProgressEvent({ isComplete: true, error });
+        throw error;
     }
 }
-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

package/build/vcs/clients/git.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isGitCaseSensitiveAsync = void 0;
 const tslib_1 = require("tslib");
+const PackageManagerUtils = tslib_1.__importStar(require("@expo/package-manager"));
 const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -12,6 +13,7 @@ const git_1 = require("../git");
 const vcs_1 = require("../vcs");
 class GitClient extends vcs_1.Client {
     async ensureRepoExistsAsync() {
+        var _a;
         if (!(await (0, git_1.isGitInstalledAsync)())) {
             log_1.default.error(`${chalk_1.default.bold('git')} command not found. Install it before proceeding or set ${chalk_1.default.bold('EAS_NO_VCS=1')} to use EAS CLI without Git (or any other version control system).`);
             log_1.default.error((0, log_1.learnMore)('https://expo.fyi/eas-vcs-workflow'));
@@ -22,13 +24,15 @@ class GitClient extends vcs_1.Client {
         }
         log_1.default.warn("It looks like you haven't initialized the git repository yet.");
         log_1.default.warn('EAS Build requires you to use a git repository for your project.');
+        const cwd = process.cwd();
+        const repoRoot = (_a = PackageManagerUtils.findWorkspaceRoot(cwd)) !== null && _a !== void 0 ? _a : cwd;
         const confirmInit = await (0, prompts_1.confirmAsync)({
-            message: `Would you like us to run 'git init' in the current directory for you?`,
+            message: `Would you like us to run 'git init' in ${repoRoot} for you?`,
         });
         if (!confirmInit) {
             throw new Error('A git repository is required for building your project. Initialize it and run this command again.');
         }
-        await (0, spawn_async_1.default)('git', ['init']);
+        await (0, spawn_async_1.default)('git', ['init'], { cwd: repoRoot });
         log_1.default.log("We're going to make an initial commit for your repository.");
         const { message } = await (0, prompts_1.promptAsync)({
             type: 'text',

package/build/vcs/local.d.ts

@@ -15,5 +15,6 @@ export declare class Ignore {
     constructor(rootDir: string);
     initIgnoreAsync(): Promise<void>;
     ignores(relativePath: string): boolean;
+    private readIgnoreFileAsync;
 }
 export declare function makeShallowCopyAsync(src: string, dst: string): Promise<void>;