eas-cli 0.58.0 → 1.0.0

package/build/graphql/generated.d.ts

@@ -24,13 +24,9 @@ export declare type Scalars = {
     Boolean: boolean;
     Int: number;
     Float: number;
-    /** Date custom scalar type */
     DateTime: any;
-    /** The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
     JSON: any;
-    /** The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
     JSONObject: any;
-    /** The `Upload` scalar type represents a file upload. */
     Upload: any;
 };
 export declare type AcceptUserInvitationResult = {
@@ -106,6 +102,8 @@ export declare type Account = {
     createdAt: Scalars['DateTime'];
     /** Environment secrets for an account */
     environmentSecrets: Array<EnvironmentSecret>;
+    /** GitHub App installations for an account */
+    githubAppInstallations: Array<GitHubAppInstallation>;
     /** Android credentials for account */
     googleServiceAccountKeys: Array<GoogleServiceAccountKey>;
     id: Scalars['ID'];
@@ -1819,6 +1817,10 @@ export declare type CreateEnvironmentSecretInput = {
     name: Scalars['String'];
     value: Scalars['String'];
 };
+export declare type CreateGitHubAppInstallationInput = {
+    accountId: Scalars['ID'];
+    installationIdentifier: Scalars['Int'];
+};
 export declare type CreateIosSubmissionInput = {
     appId: Scalars['ID'];
     archiveUrl?: InputMaybe<Scalars['String']>;
@@ -2015,6 +2017,31 @@ export declare type GetSignedAssetUploadSpecificationsResult = {
     __typename?: 'GetSignedAssetUploadSpecificationsResult';
     specifications: Array<Scalars['String']>;
 };
+export declare type GitHubAppInstallation = {
+    __typename?: 'GitHubAppInstallation';
+    account: Account;
+    actor?: Maybe<Actor>;
+    id: Scalars['ID'];
+    installationIdentifier: Scalars['Int'];
+};
+export declare type GitHubAppInstallationMutation = {
+    __typename?: 'GitHubAppInstallationMutation';
+    /** Create a GitHub App installation for an Account */
+    createGitHubAppInstallationForAccount: GitHubAppInstallation;
+    /** Delete a GitHub App installation by ID */
+    deleteGitHubAppInstallation: GitHubAppInstallation;
+};
+export declare type GitHubAppInstallationMutationCreateGitHubAppInstallationForAccountArgs = {
+    githubAppInstallationData: CreateGitHubAppInstallationInput;
+};
+export declare type GitHubAppInstallationMutationDeleteGitHubAppInstallationArgs = {
+    githubAppInstallationId: Scalars['ID'];
+};
+export declare type GitHubAppQuery = {
+    __typename?: 'GitHubAppQuery';
+    appIdentifier: Scalars['String'];
+    clientIdentifier: Scalars['String'];
+};
 export declare type GoogleServiceAccountKey = {
     __typename?: 'GoogleServiceAccountKey';
     account: Account;
@@ -2615,6 +2642,8 @@ export declare type RootMutation = {
     emailSubscription: EmailSubscriptionMutation;
     /** Mutations that create and delete EnvironmentSecrets */
     environmentSecret: EnvironmentSecretMutation;
+    /** Mutations for GitHub App installations */
+    githubAppInstallation: GitHubAppInstallationMutation;
     /** Mutations that modify a Google Service Account Key */
     googleServiceAccountKey: GoogleServiceAccountKeyMutation;
     /** Mutations that modify the build credentials for an iOS app */
@@ -2652,6 +2681,8 @@ export declare type RootMutationBuildJobArgs = {
 };
 export declare type RootQuery = {
     __typename?: 'RootQuery';
+    /** Top-level query object for querying GitHub App information and resources it has access to. */
+    GitHubApp: GitHubAppQuery;
     /**
      * This is a placeholder field
      * @deprecated Not used.
@@ -2831,6 +2862,15 @@ export declare enum StandardOffer {
     /** $348 USD per year, 30 day trial */
     YearlySub = "YEARLY_SUB"
 }
+export declare type StripeCoupon = {
+    __typename?: 'StripeCoupon';
+    amountOff?: Maybe<Scalars['String']>;
+    appliesTo?: Maybe<Scalars['String']>;
+    id: Scalars['ID'];
+    name: Scalars['String'];
+    percentOff?: Maybe<Scalars['Float']>;
+    valid: Scalars['Boolean'];
+};
 /** Represents an EAS Submission */
 export declare type Submission = ActivityTimelineProjectActivity & {
     __typename?: 'Submission';
@@ -2926,6 +2966,7 @@ export declare type SubscriptionDetails = {
     addons: Array<AddonDetails>;
     cancelledAt?: Maybe<Scalars['DateTime']>;
     concurrencies?: Maybe<Concurrencies>;
+    coupon?: Maybe<StripeCoupon>;
     endedAt?: Maybe<Scalars['DateTime']>;
     futureSubscription?: Maybe<FutureSubscription>;
     id: Scalars['ID'];

package/build/metadata/config.d.ts

@@ -8,6 +8,25 @@ export interface MetadataConfig {
     /** All App Store related configuration */
     apple?: AppleMetadata;
 }
+/**
+ * Get the static configuration file path, based on the metadata context.
+ * This uses any custom name provided, but swaps out the extension for `.json`.
+ */
+export declare function getStaticConfigFilePath({ projectDir, metadataPath, }: {
+    projectDir: string;
+    metadataPath: string;
+}): string;
+/**
+ * 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.
+ */
+export declare function loadConfigAsync({ projectDir, metadataPath, skipValidation, }: {
+    projectDir: string;
+    metadataPath: string;
+    skipValidation?: boolean;
+}): Promise<MetadataConfig>;
 /**
  * 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/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/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/projectUtils.d.ts

@@ -13,6 +13,9 @@ export declare function setProjectIdAsync(projectDir: string, options?: {
 }): Promise<ExpoConfig | undefined>;
 export declare function getProjectIdAsync(exp: ExpoConfig, options?: {
     env?: Env;
+}, findProjectRootOptions?: {
+    cwd?: string;
+    defaultToProcessCwd?: boolean;
 }): Promise<string>;
 export declare function getProjectFullNameAsync(exp: ExpoConfig): Promise<string>;
 /**
@@ -26,4 +29,5 @@ export declare function getProjectConfigDescription(projectDir: string): string;
 export declare function promptToCreateProjectIfNotExistsAsync(exp: ExpoConfig): Promise<string | null>;
 export declare function isExpoUpdatesInstalled(projectDir: string): boolean;
 export declare function isExpoUpdatesInstalledOrAvailable(projectDir: string, sdkVersion?: string): boolean;
+export declare function validateAppVersionRuntimePolicySupportAsync(projectDir: string, exp: ExpoConfig): Promise<void>;
 export declare function installExpoUpdatesAsync(projectDir: string): Promise<void>;

package/build/project/projectUtils.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installExpoUpdatesAsync = 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.setProjectIdAsync = 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"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const pkg_dir_1 = tslib_1.__importDefault(require("pkg-dir"));
+const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const generated_1 = require("../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../log"));
@@ -101,22 +103,14 @@ async function setProjectIdAsync(projectDir, options = {}) {
     return (_b = result.config) === null || _b === void 0 ? void 0 : _b.expo;
 }
 exports.setProjectIdAsync = setProjectIdAsync;
-async function getProjectIdAsync(exp, options = {}) {
+async function getProjectIdAsync(exp, options = {}, findProjectRootOptions = {}) {
     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,
-        });
-    }
     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.');
     }
@@ -202,6 +196,21 @@ function isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion) {
     return isExpoUpdatesInstalled(projectDir);
 }
 exports.isExpoUpdatesInstalledOrAvailable = isExpoUpdatesInstalledOrAvailable;
+async function validateAppVersionRuntimePolicySupportAsync(projectDir, exp) {
+    var _a;
+    if (typeof exp.runtimeVersion !== 'object' || ((_a = exp.runtimeVersion) === null || _a === void 0 ? void 0 : _a.policy) !== 'appVersion') {
+        return;
+    }
+    const maybePackageJson = resolve_from_1.default.silent(projectDir, 'expo-updates/package.json');
+    if (maybePackageJson) {
+        const { version } = await fs_extra_1.default.readJson(maybePackageJson);
+        if (semver_1.default.gte(version, '0.14.4')) {
+            return;
+        }
+    }
+    log_1.default.warn(`You need to be on SDK 46 or higher, and use expo-updates >= 0.14.4 to use appVersion runtime policy.`);
+}
+exports.validateAppVersionRuntimePolicySupportAsync = validateAppVersionRuntimePolicySupportAsync;
 async function installExpoUpdatesAsync(projectDir) {
     log_1.default.newLine();
     log_1.default.log(`Running ${chalk_1.default.bold('expo install expo-updates')}`);

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/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/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',