eas-cli 0.55.1 → 0.56.0

package/build/graphql/generated.js

@@ -114,6 +114,7 @@ var BuildPriority;
 (function (BuildPriority) {
     BuildPriority["High"] = "HIGH";
     BuildPriority["Normal"] = "NORMAL";
+    BuildPriority["NormalPlus"] = "NORMAL_PLUS";
 })(BuildPriority = exports.BuildPriority || (exports.BuildPriority = {}));
 var BuildResourceClass;
 (function (BuildResourceClass) {

package/build/graphql/mutations/AppVersionMutation.d.ts

@@ -0,0 +1,11 @@
+import { AppPlatform } from '../generated';
+export declare const AppVersionMutation: {
+    createAppVersionAsync(appVersionInput: {
+        appId: string;
+        platform: AppPlatform;
+        applicationIdentifier: string;
+        storeVersion: string;
+        buildVersion: string;
+        runtimeVersion?: string;
+    }): Promise<string>;
+};

package/build/graphql/mutations/AppVersionMutation.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppVersionMutation = void 0;
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const client_1 = require("../client");
+exports.AppVersionMutation = {
+    async createAppVersionAsync(appVersionInput) {
+        var _a;
+        const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation CreateAppVersionMutation($appVersionInput: AppVersionInput!) {
+              appVersion {
+                createAppVersion(appVersionInput: $appVersionInput) {
+                  id
+                }
+              }
+            }
+          `, {
+            appVersionInput,
+        })
+            .toPromise());
+        const appVersionId = (_a = data.appVersion) === null || _a === void 0 ? void 0 : _a.createAppVersion.id;
+        (0, assert_1.default)(appVersionId, 'AppVersion ID must be defined');
+        return appVersionId;
+    },
+};

package/build/graphql/queries/AppVersionQuery.d.ts

@@ -0,0 +1,4 @@
+import { AppPlatform, AppVersion } from '../generated';
+export declare const AppVersionQuery: {
+    latestVersionAsync(appId: string, platform: AppPlatform, applicationIdentifier: string): Promise<Pick<AppVersion, 'storeVersion' | 'buildVersion'> | null>;
+};

package/build/graphql/queries/AppVersionQuery.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppVersionQuery = void 0;
+const tslib_1 = require("tslib");
+const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const client_1 = require("../client");
+exports.AppVersionQuery = {
+    async latestVersionAsync(appId, platform, applicationIdentifier) {
+        var _a;
+        const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .query((0, graphql_tag_1.default) `
+            query LatestAppVersion(
+              $appId: String!
+              $platform: AppPlatform!
+              $applicationIdentifier: String!
+            ) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  latestAppVersionByPlatformAndApplicationIdentifier(
+                    platform: $platform
+                    applicationIdentifier: $applicationIdentifier
+                  ) {
+                    id
+                    storeVersion
+                    buildVersion
+                  }
+                }
+              }
+            }
+          `, { appId, applicationIdentifier, platform }, {
+            additionalTypenames: ['App', 'AppVersion'],
+        })
+            .toPromise());
+        return (_a = data.app.byId.latestAppVersionByPlatformAndApplicationIdentifier) !== null && _a !== void 0 ? _a : null;
+    },
+};

package/build/platform.d.ts

@@ -12,4 +12,5 @@ export declare enum RequestedPlatform {
 }
 export declare const requestedPlatformDisplayNames: Record<RequestedPlatform, string>;
 export declare function selectRequestedPlatformAsync(platform?: string): Promise<RequestedPlatform>;
+export declare function selectPlatformAsync(platform?: string): Promise<Platform>;
 export declare function toPlatforms(requestedPlatform: RequestedPlatform): Platform[];

package/build/platform.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPlatforms = exports.selectRequestedPlatformAsync = exports.requestedPlatformDisplayNames = exports.RequestedPlatform = exports.appPlatformEmojis = exports.appPlatformDisplayNames = void 0;
+exports.toPlatforms = exports.selectPlatformAsync = exports.selectRequestedPlatformAsync = exports.requestedPlatformDisplayNames = exports.RequestedPlatform = exports.appPlatformEmojis = exports.appPlatformDisplayNames = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const generated_1 = require("./graphql/generated");
 const prompts_1 = require("./prompts");
@@ -42,6 +42,22 @@ async function selectRequestedPlatformAsync(platform) {
     return requestedPlatform;
 }
 exports.selectRequestedPlatformAsync = selectRequestedPlatformAsync;
+async function selectPlatformAsync(platform) {
+    if (platform && Object.values(eas_build_job_1.Platform).includes(platform.toLowerCase())) {
+        return platform.toLowerCase();
+    }
+    const { resolvedPlatform } = await (0, prompts_1.promptAsync)({
+        type: 'select',
+        message: 'Select platform',
+        name: 'resolvedPlatform',
+        choices: [
+            { title: 'Android', value: eas_build_job_1.Platform.ANDROID },
+            { title: 'iOS', value: eas_build_job_1.Platform.IOS },
+        ],
+    });
+    return resolvedPlatform;
+}
+exports.selectPlatformAsync = selectPlatformAsync;
 function toPlatforms(requestedPlatform) {
     if (requestedPlatform === RequestedPlatform.All) {
         return [eas_build_job_1.Platform.ANDROID, eas_build_job_1.Platform.IOS];

package/build/project/android/applicationId.js

@@ -120,8 +120,8 @@ exports.isApplicationIdValid = isApplicationIdValid;
 let warnPrinted = false;
 function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp) {
     if (config_plugins_1.AndroidConfig.Package.getPackage(exp) && !warnPrinted) {
-        log_1.default.warn(`Specifying "android.package" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is deprecated for bare workflow projects.\n` +
-            'EAS Build depends only on the value in the native code. Please remove the deprecated configuration.');
+        log_1.default.warn(`Specified value for "android.package" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is ignored because an ${chalk_1.default.bold('android')} directory was detected in the project.\n` +
+            'EAS Build will use the value found in the native code.');
         warnPrinted = true;
     }
 }

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

@@ -0,0 +1,3 @@
+export declare const VERSION_CODE_REQUIREMENTS: string;
+export declare function isValidVersionCode(versionCode: string | number): boolean;
+export declare function getNextVersionCode(versionCode: string | number): number;

package/build/project/android/versions.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNextVersionCode = exports.isValidVersionCode = exports.VERSION_CODE_REQUIREMENTS = void 0;
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const MAX_VERSION_CODE = 2000000000;
+exports.VERSION_CODE_REQUIREMENTS = `versionCode needs to be a positive integer smaller or equal to ${MAX_VERSION_CODE}`;
+function isValidVersionCode(versionCode) {
+    const numericVersionCode = typeof versionCode === 'string' ? Number(versionCode) : versionCode;
+    return (Number.isInteger(numericVersionCode) &&
+        numericVersionCode <= MAX_VERSION_CODE &&
+        numericVersionCode > 0);
+}
+exports.isValidVersionCode = isValidVersionCode;
+function getNextVersionCode(versionCode) {
+    (0, assert_1.default)(isValidVersionCode(versionCode), `Invalid versionCode ${versionCode}`);
+    const numericVersionCode = typeof versionCode === 'string' ? Number(versionCode) : versionCode;
+    if (numericVersionCode >= MAX_VERSION_CODE) {
+        throw new Error(`Invalid value: ${exports.VERSION_CODE_REQUIREMENTS}.`);
+    }
+    return numericVersionCode + 1;
+}
+exports.getNextVersionCode = getNextVersionCode;

package/build/project/applicationIdentifier.d.ts

@@ -0,0 +1,4 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+export declare function getApplicationIdentifierAsync(projectDir: string, exp: ExpoConfig, buildProfile: BuildProfile, platform: Platform): Promise<string>;

package/build/project/applicationIdentifier.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getApplicationIdentifierAsync = void 0;
+const eas_build_job_1 = require("@expo/eas-build-job");
+const applicationId_1 = require("./android/applicationId");
+const gradle_1 = require("./android/gradle");
+const bundleIdentifier_1 = require("./ios/bundleIdentifier");
+const scheme_1 = require("./ios/scheme");
+const target_1 = require("./ios/target");
+const workflow_1 = require("./workflow");
+async function getApplicationIdentifierAsync(projectDir, exp, buildProfile, platform) {
+    if (platform === eas_build_job_1.Platform.ANDROID) {
+        const profile = buildProfile;
+        const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
+        const gradleContext = await (0, gradle_1.resolveGradleBuildContextAsync)(projectDir, profile);
+        if (workflow === eas_build_job_1.Workflow.MANAGED) {
+            await (0, applicationId_1.ensureApplicationIdIsDefinedForManagedProjectAsync)(projectDir, exp);
+        }
+        return await (0, applicationId_1.getApplicationIdAsync)(projectDir, exp, gradleContext);
+    }
+    else {
+        const profile = buildProfile;
+        const xcodeBuildContext = await (0, scheme_1.resolveXcodeBuildContextAsync)({ exp, projectDir, nonInteractive: false }, profile);
+        const targets = await (0, target_1.resolveTargetsAsync)({
+            projectDir,
+            exp,
+            xcodeBuildContext,
+            env: profile.env,
+        });
+        const applicationTarget = (0, target_1.findApplicationTarget)(targets);
+        return await (0, bundleIdentifier_1.getBundleIdentifierAsync)(projectDir, exp, {
+            targetName: applicationTarget.targetName,
+            buildConfiguration: applicationTarget.buildConfiguration,
+        });
+    }
+}
+exports.getApplicationIdentifierAsync = getApplicationIdentifierAsync;

package/build/project/ios/bundleIdentifier.js

@@ -104,8 +104,8 @@ exports.isBundleIdentifierValid = isBundleIdentifierValid;
 let warnPrinted = false;
 function warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp) {
     if (config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp) && !warnPrinted) {
-        log_1.default.warn(`Specifying "ios.bundleIdentifier" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is deprecated for bare workflow projects.\n` +
-            'EAS Build depends only on the value in the native code. Please remove the deprecated configuration.');
+        log_1.default.warn(`Specified value for "ios.bundleIdentifier" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} is ignored because an ${chalk_1.default.bold('ios')} directory was detected in the project.\n` +
+            'EAS Build will use the value found in the native code.');
         warnPrinted = true;
     }
 }

package/build/project/ios/target.js

@@ -55,6 +55,7 @@ exports.resolveMangedProjectTargetsAsync = resolveMangedProjectTargetsAsync;
 async function resolveBareProjectTargetsAsync({ exp, projectDir, xcodeBuildContext, }) {
     const { buildScheme, buildConfiguration } = xcodeBuildContext;
     const result = [];
+    const pbxProject = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(projectDir);
     const applicationTarget = await config_plugins_1.IOSConfig.Target.findApplicationTargetWithDependenciesAsync(projectDir, buildScheme);
     const bundleIdentifier = await (0, bundleIdentifier_1.getBundleIdentifierAsync)(projectDir, exp, {
         targetName: applicationTarget.name,
@@ -69,6 +70,7 @@ async function resolveBareProjectTargetsAsync({ exp, projectDir, xcodeBuildConte
         bundleIdentifier,
         buildConfiguration,
         entitlements: entitlements !== null && entitlements !== void 0 ? entitlements : {},
+        buildSettings: resolveBareProjectBuildSettings(pbxProject, applicationTarget.name, buildConfiguration),
     });
     const dependencies = await resolveBareProjectDependenciesAsync({
         exp,
@@ -76,6 +78,7 @@ async function resolveBareProjectTargetsAsync({ exp, projectDir, xcodeBuildConte
         buildConfiguration,
         target: applicationTarget,
         bundleIdentifier,
+        pbxProject,
     });
     if (dependencies.length > 0) {
         result.push(...dependencies);
@@ -96,7 +99,7 @@ async function resolveTargetsAsync(opts) {
     }
 }
 exports.resolveTargetsAsync = resolveTargetsAsync;
-async function resolveBareProjectDependenciesAsync({ exp, projectDir, buildConfiguration, target, bundleIdentifier, }) {
+async function resolveBareProjectDependenciesAsync({ exp, projectDir, buildConfiguration, target, bundleIdentifier, pbxProject, }) {
     const result = [];
     if (target.dependencies && target.dependencies.length > 0) {
         for (const dependency of target.dependencies) {
@@ -114,6 +117,7 @@ async function resolveBareProjectDependenciesAsync({ exp, projectDir, buildConfi
                 bundleIdentifier: dependencyBundleIdentifier,
                 parentBundleIdentifier: bundleIdentifier,
                 entitlements: entitlements !== null && entitlements !== void 0 ? entitlements : {},
+                buildSettings: resolveBareProjectBuildSettings(pbxProject, dependency.name, buildConfiguration),
             });
             const dependencyDependencies = await resolveBareProjectDependenciesAsync({
                 exp,
@@ -121,6 +125,7 @@ async function resolveBareProjectDependenciesAsync({ exp, projectDir, buildConfi
                 buildConfiguration,
                 target: dependency,
                 bundleIdentifier: dependencyBundleIdentifier,
+                pbxProject,
             });
             if (dependencyDependencies.length > 0) {
                 result.push(...dependencyDependencies);
@@ -145,3 +150,11 @@ function findTargetByName(targets, name) {
     return target;
 }
 exports.findTargetByName = findTargetByName;
+function resolveBareProjectBuildSettings(project, targetName, buildConfiguration) {
+    var _a;
+    const xcBuildConfiguration = config_plugins_1.IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+        targetName,
+        buildConfiguration,
+    });
+    return (_a = xcBuildConfiguration === null || xcBuildConfiguration === void 0 ? void 0 : xcBuildConfiguration.buildSettings) !== null && _a !== void 0 ? _a : {};
+}

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

@@ -0,0 +1,3 @@
+export declare const BUILD_NUMBER_REQUIREMENTS = "buildNumber needs to consist only of up to 3 dot-separated positive integers";
+export declare function isValidBuildNumber(buildNumber: string): boolean;
+export declare function getNextBuildNumber(buildNumber: string): string;

package/build/project/ios/versions.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNextBuildNumber = exports.isValidBuildNumber = exports.BUILD_NUMBER_REQUIREMENTS = void 0;
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+exports.BUILD_NUMBER_REQUIREMENTS = `buildNumber needs to consist only of up to 3 dot-separated positive integers`;
+function isValidBuildNumber(buildNumber) {
+    return !!buildNumber.match(/^\d+(\.\d+)?(\.\d+)?$/);
+}
+exports.isValidBuildNumber = isValidBuildNumber;
+function getNextBuildNumber(buildNumber) {
+    (0, assert_1.default)(isValidBuildNumber(buildNumber), `Invalid buildNumber ${buildNumber}`);
+    const comps = buildNumber.split('.');
+    comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
+    return comps.join('.');
+}
+exports.getNextBuildNumber = getNextBuildNumber;

package/build/project/publish.d.ts

@@ -2,7 +2,6 @@
 import { ExpoConfig, Platform } from '@expo/config';
 import Joi from 'joi';
 import { PartialManifestAsset } from '../graphql/generated';
-export declare const TIMEOUT_LIMIT = 60000;
 export declare type PublishPlatform = Extract<'android' | 'ios', Platform>;
 declare type Metadata = {
     version: number;
@@ -78,5 +77,5 @@ declare type AssetUploadResult = {
     uniqueAssetCount: number;
     uniqueUploadedAssetCount: number;
 };
-export declare function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAssets, updateSpinnerText?: (updatedText: string) => void): Promise<AssetUploadResult>;
+export declare function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAssets, updateSpinnerText?: (totalAssets: number, missingAssets: number) => void): Promise<AssetUploadResult>;
 export {};

package/build/project/publish.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.loadMetadata = exports.resolveInputDirectoryAsync = exports.buildBundlesAsync = exports.buildUnsortedUpdateInfoGroupAsync = exports.convertAssetToUpdateInfoGroupFormatAsync = exports.getStorageKeyForAssetAsync = exports.getStorageKey = exports.getBase64URLEncoding = exports.guessContentTypeFromExtension = exports.MetadataJoi = exports.TIMEOUT_LIMIT = void 0;
+exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.loadMetadata = exports.resolveInputDirectoryAsync = exports.buildBundlesAsync = exports.buildUnsortedUpdateInfoGroupAsync = exports.convertAssetToUpdateInfoGroupFormatAsync = exports.getStorageKeyForAssetAsync = exports.getStorageKey = exports.getBase64URLEncoding = exports.guessContentTypeFromExtension = exports.MetadataJoi = void 0;
 const tslib_1 = require("tslib");
 const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
 const crypto_1 = tslib_1.__importDefault(require("crypto"));
@@ -15,7 +15,6 @@ const PublishQuery_1 = require("../graphql/queries/PublishQuery");
 const uploads_1 = require("../uploads");
 const expoCli_1 = require("../utils/expoCli");
 const uniqBy_1 = tslib_1.__importDefault(require("../utils/expodash/uniqBy"));
-exports.TIMEOUT_LIMIT = 60000; // 1 minute
 const fileMetadataJoi = joi_1.default.object({
     assets: joi_1.default.array()
         .required()
@@ -113,6 +112,7 @@ async function buildBundlesAsync({ projectDir, inputDir, }) {
         inputDir,
         '--experimental-bundle',
         '--non-interactive',
+        '--dump-sourcemap',
     ]);
 }
 exports.buildBundlesAsync = buildBundlesAsync;
@@ -194,7 +194,6 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup, updateSpinnerText) {
             ...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,
@@ -202,10 +201,12 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup, updateSpinnerText) {
         };
     }));
     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`);
+    const totalAssets = uniqueAssets.length;
+    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));
+    updateSpinnerText === null || updateSpinnerText === void 0 ? void 0 : updateSpinnerText(totalAssets, missingAssets.length);
     const assetUploadPromiseLimit = (0, promise_limit_1.default)(15);
     await Promise.all(missingAssets.map((missingAsset, i) => {
         assetUploadPromiseLimit(async () => {
@@ -213,18 +214,13 @@ async function uploadAssetsAsync(assetsForUpdateInfoGroup, updateSpinnerText) {
             await (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;
     while (missingAssets.length > 0) {
-        const timeoutPromise = new Promise(resolve => setTimeout(resolve, timeout * 1000)); // linear backoff
+        const timeoutPromise = new Promise(resolve => setTimeout(resolve, Math.min(timeout * 1000, 5000))); // linear backoff
         missingAssets = await filterOutAssetsThatAlreadyExistAsync(missingAssets);
         await timeoutPromise; // await after filterOutAssetsThatAlreadyExistAsync for easy mocking with jest.runAllTimers
         timeout += 1;
-        if (Date.now() - start > exports.TIMEOUT_LIMIT) {
-            throw new Error('Asset upload timed out. Please try again.');
-        }
+        updateSpinnerText === null || updateSpinnerText === void 0 ? void 0 : updateSpinnerText(totalAssets, missingAssets.length);
     }
     return {
         assetCount: assets.length,

package/build/project/remoteVersionSource.d.ts

@@ -0,0 +1,6 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonReader } from '@expo/eas-json';
+export declare function ensureRemoteVersionPolicyAsync(projectDir: string, easJsonReader: EasJsonReader): Promise<void>;
+export declare function validateAppConfigForRemoteVersionPolicyAsync(exp: ExpoConfig): Promise<void>;
+export declare function getBuildVersionName(platform: Platform): string;

package/build/project/remoteVersionSource.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBuildVersionName = exports.validateAppConfigForRemoteVersionPolicyAsync = exports.ensureRemoteVersionPolicyAsync = void 0;
+const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const eas_json_1 = require("@expo/eas-json");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const log_1 = tslib_1.__importDefault(require("../log"));
+const prompts_1 = require("../prompts");
+async function ensureRemoteVersionPolicyAsync(projectDir, easJsonReader) {
+    const easJsonCliConfig = await easJsonReader.getCliConfigAsync();
+    if ((easJsonCliConfig === null || easJsonCliConfig === void 0 ? void 0 : easJsonCliConfig.appVersionSource) === eas_json_1.AppVersionSource.REMOTE) {
+        return;
+    }
+    log_1.default.log(`The app version source defines whether the app version is stored locally in your project source (e.g. in app.json, Info.plist, or build.gradle) or remotely on EAS servers and only applied to the project at build time. To use this command, you will need to enable the remote version policy by adding  ${chalk_1.default.bold('{"cli": { "appVersionSource": "remote" }}')} in eas.json.`);
+    // TODO: add link to docs
+    const confirm = await (0, prompts_1.confirmAsync)({
+        message: 'Do you want to set app version source to remote now?',
+    });
+    if (!confirm) {
+        throw new Error('Aborting...');
+    }
+    const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(projectDir);
+    const easJson = await fs_extra_1.default.readJSON(easJsonPath);
+    easJson.cli = { ...easJson === null || easJson === void 0 ? void 0 : easJson.cli, appVersionSource: eas_json_1.AppVersionSource.REMOTE };
+    await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+    log_1.default.withTick('Updated eas.json');
+}
+exports.ensureRemoteVersionPolicyAsync = ensureRemoteVersionPolicyAsync;
+async function validateAppConfigForRemoteVersionPolicyAsync(exp) {
+    var _a, _b, _c;
+    if (typeof exp.runtimeVersion === 'object' && ((_a = exp.runtimeVersion) === null || _a === void 0 ? void 0 : _a.policy) === 'nativeVersion') {
+        throw new Error(`${chalk_1.default.bold('nativeVersion')} policy for ${chalk_1.default.bold('runtimeVersion')} is currently not supported when version source is set to remote. Switch policy e.g. to ${chalk_1.default.bold('appVersion')} or define version explicitly.`);
+    }
+    if (((_b = exp.ios) === null || _b === void 0 ? void 0 : _b.buildNumber) !== undefined) {
+        throw new Error(`${chalk_1.default.bold('ios.buildNumber')} field in app config is not supported when version source is set to remote, remove it and re-run the command.`);
+    }
+    if (((_c = exp.android) === null || _c === void 0 ? void 0 : _c.versionCode) !== undefined) {
+        throw new Error(`${chalk_1.default.bold('android.versionCode')} field in app config is not supported when version source is set to remote, remove it and re-run the command.`);
+    }
+}
+exports.validateAppConfigForRemoteVersionPolicyAsync = validateAppConfigForRemoteVersionPolicyAsync;
+function getBuildVersionName(platform) {
+    if (platform === eas_build_job_1.Platform.ANDROID) {
+        return 'versionCode';
+    }
+    else {
+        return 'buildNumber';
+    }
+}
+exports.getBuildVersionName = getBuildVersionName;

package/build/submit/utils/files.d.ts

@@ -1,8 +1,2 @@
 export declare function isExistingFileAsync(filePath: string): Promise<boolean>;
 export declare function uploadAppArchiveAsync(path: string): 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/submit/utils/files.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixArchiveUrl = exports.uploadAppArchiveAsync = exports.isExistingFileAsync = void 0;
+exports.uploadAppArchiveAsync = exports.isExistingFileAsync = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const url_1 = require("url");
 const generated_1 = require("../../graphql/generated");
 const uploads_1 = require("../../uploads");
 const progress_1 = require("../../utils/progress");
@@ -19,23 +18,11 @@ async function isExistingFileAsync(filePath) {
 exports.isExistingFileAsync = isExistingFileAsync;
 async function uploadAppArchiveAsync(path) {
     const fileSize = (await fs_extra_1.default.stat(path)).size;
-    const { response } = await (0, uploads_1.uploadAsync)(generated_1.UploadSessionType.EasSubmitAppArchive, path, (0, progress_1.createProgressTracker)({
+    const { url } = await (0, uploads_1.uploadFileAtPathToS3Async)(generated_1.UploadSessionType.EasSubmitAppArchive, path, (0, progress_1.createProgressTracker)({
         total: fileSize,
         message: 'Uploading to EAS Submit',
         completedMessage: 'Uploaded to EAS Submit',
     }));
-    const url = response.headers.get('location');
-    return fixArchiveUrl(String(url));
+    return url;
 }
 exports.uploadAppArchiveAsync = uploadAppArchiveAsync;
-/**
- * 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/uploads.d.ts

@@ -2,8 +2,14 @@ import { Response } from 'node-fetch';
 import { UploadSessionType } from './graphql/generated';
 import { PresignedPost } from './graphql/mutations/UploadSessionMutation';
 import { ProgressHandler } from './utils/progress';
-export declare function uploadAsync(type: UploadSessionType, path: string, handleProgressEvent: ProgressHandler): Promise<{
-    response: Response;
+export declare function uploadFileAtPathToS3Async(type: UploadSessionType, path: string, handleProgressEvent: ProgressHandler): Promise<{
+    url: string;
     bucketKey: string;
 }>;
 export declare function uploadWithPresignedPostAsync(file: string, presignedPost: PresignedPost, handleProgressEvent?: ProgressHandler): 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
+ * This function replaces %2F with /.
+ */
+export declare function fixS3Url(archiveUrl: string): string;

package/build/uploads.js

@@ -1,19 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadWithPresignedPostAsync = exports.uploadAsync = void 0;
+exports.fixS3Url = exports.uploadWithPresignedPostAsync = 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 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) {
+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);
-    return { response, bucketKey: presignedPost.fields.key };
+    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.uploadAsync = uploadAsync;
+exports.uploadFileAtPathToS3Async = uploadFileAtPathToS3Async;
 async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressEvent) {
     const fileStat = await fs_extra_1.default.stat(file);
     const fileSize = fileStat.size;
@@ -57,3 +61,14 @@ async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressE
     }
 }
 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 fixS3Url(archiveUrl) {
+    const parsed = new url_1.URL(archiveUrl);
+    parsed.pathname = decodeURIComponent(parsed.pathname);
+    return parsed.toString();
+}
+exports.fixS3Url = fixS3Url;