eas-cli 0.55.1 → 0.58.0

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

@@ -11,12 +11,13 @@ const retry_1 = require("../../utils/retry");
 const task_1 = require("../task");
 class AppVersionTask extends task_1.AppleTask {
     constructor(options = {}) {
-        var _a, _b;
+        var _a, _b, _c;
         super();
         this.name = () => (this.options.editLive ? 'live app version' : 'editable app version');
         this.options = {
             platform: (_a = options.platform) !== null && _a !== void 0 ? _a : apple_utils_1.Platform.IOS,
             editLive: (_b = options.editLive) !== null && _b !== void 0 ? _b : false,
+            version: (_c = options.version) !== null && _c !== void 0 ? _c : null,
         };
     }
     async prepareAsync({ context }) {
@@ -26,24 +27,39 @@ class AppVersionTask extends task_1.AppleTask {
         context.versionIsFirst = versionIsFirst;
         context.versionIsLive = versionIsLive;
         context.versionLocales = await version.getLocalizationsAsync();
+        context.versionPhasedRelease = await version.getPhasedReleaseAsync();
     }
     async downloadAsync({ config, context }) {
+        var _a;
         (0, assert_1.default)(context.version, `App version not initialized, can't download version`);
         config.setVersion(context.version.attributes);
-        config.setVersionRelease(context.version.attributes);
+        config.setVersionReleaseType(context.version.attributes);
+        config.setVersionReleasePhased((_a = context.versionPhasedRelease) === null || _a === void 0 ? void 0 : _a.attributes);
         for (const locale of context.versionLocales) {
             config.setVersionLocale(locale.attributes);
         }
     }
     async uploadAsync({ config, context }) {
-        (0, assert_1.default)(context.version, `App version not initialized, can't update version`);
         const version = config.getVersion();
-        const release = config.getVersionRelease();
+        if (!context.version && (version === null || version === void 0 ? void 0 : version.versionString)) {
+            context.version = await (0, log_2.logAsync)(() => {
+                return context.app.createVersionAsync({
+                    versionString: version.versionString,
+                    platform: this.options.platform,
+                });
+            }, {
+                pending: `Creating new version ${chalk_1.default.bold(version.versionString)}...`,
+                success: `Created new version ${chalk_1.default.bold(version.versionString)}`,
+                failure: `Failed creating new version ${chalk_1.default.bold(version.versionString)}`,
+            });
+        }
+        (0, assert_1.default)(context.version, `App version not initialized, can't update version`);
+        const { versionString } = context.version.attributes;
+        const release = config.getVersionReleaseType();
         if (!version && !release) {
             log_1.default.log((0, chalk_1.default) `{dim - Skipped version and release update, not configured}`);
         }
         else {
-            const { versionString } = context.version.attributes;
             const description = [version && 'version', release && 'release']
                 .filter(Boolean)
                 .join(' and ');
@@ -53,6 +69,24 @@ class AppVersionTask extends task_1.AppleTask {
                 failure: `Failed updating ${description} info for ${chalk_1.default.bold(versionString)}`,
             });
         }
+        const phasedRelease = config.getVersionReleasePhased();
+        if (!phasedRelease && shouldDeletePhasedRelease(context.versionPhasedRelease)) {
+            // if phased release was enabled, but now disabled, we need to remove it
+            await (0, log_2.logAsync)(() => context.versionPhasedRelease.deleteAsync(), {
+                pending: `Disabling phased release for ${chalk_1.default.bold(versionString)}...`,
+                success: `Disabled phased release for ${chalk_1.default.bold(versionString)}`,
+                failure: `Failed disabling phased release for ${chalk_1.default.bold(versionString)}`,
+            });
+            context.versionPhasedRelease = null;
+        }
+        else if (phasedRelease && !context.versionPhasedRelease) {
+            // if phased release was not yet set, but now enabled, we need to create it
+            context.versionPhasedRelease = await (0, log_2.logAsync)(() => context.version.createPhasedReleaseAsync({ state: phasedRelease.phasedReleaseState }), {
+                pending: `Enabling phased release for ${chalk_1.default.bold(versionString)}...`,
+                success: `Enabled phased release for ${chalk_1.default.bold(versionString)}`,
+                failure: `Failed enabling phased release for ${chalk_1.default.bold(versionString)}`,
+            });
+        }
         const locales = config.getLocales();
         if (locales.length <= 0) {
             log_1.default.log((0, chalk_1.default) `{dim - Skipped localized version update, no locales configured}`);
@@ -80,13 +114,23 @@ class AppVersionTask extends task_1.AppleTask {
 }
 exports.AppVersionTask = AppVersionTask;
 /**
- * Resolve the AppStoreVersion instance, either from live or editable version.
+ * Resolve the AppStoreVersion instance, either from the store config, live, or editable version.
  * This also checks if this is the first version, which disallow release notes.
  */
-async function resolveVersionAsync(app, { editLive, platform }) {
+async function resolveVersionAsync(app, { editLive, platform, version: versionString }) {
     let version = null;
     let versionIsLive = false;
-    if (editLive) {
+    if (versionString) {
+        version = await findEditAppStoreVersionAsync(app, { platform, version: versionString });
+        if (!version) {
+            version = await createOrUpdateEditAppStoreVersionAsync(app, {
+                platform,
+                version: versionString,
+            });
+        }
+        versionIsLive = (version === null || version === void 0 ? void 0 : version.attributes.appStoreState) === apple_utils_1.AppStoreState.READY_FOR_SALE;
+    }
+    if (!version && editLive) {
         version = await app.getLiveAppStoreVersionAsync({ platform });
         versionIsLive = !!version;
     }
@@ -102,3 +146,60 @@ async function resolveVersionAsync(app, { editLive, platform }) {
         versionIsFirst: versions.length === 1,
     };
 }
+/**
+ * Determine if we can, and should, delete the phased release instance.
+ * This returns true if the instance exist, and has one of the states below:
+ *   - PhasedReleaseState.INACTIVE
+ *   - PhasedReleaseState.ACTIVE
+ *   - PhasedReleaseState.PAUSED
+ */
+function shouldDeletePhasedRelease(phasedRelease) {
+    if (!phasedRelease ||
+        phasedRelease.attributes.phasedReleaseState === apple_utils_1.PhasedReleaseState.COMPLETE) {
+        return false;
+    }
+    return true;
+}
+/*
+ * Search for editable app store versions that matches the `versionString` option.
+ * When nothing is found, it will return `null`, and a new version should be created.
+ */
+async function findEditAppStoreVersionAsync(app, options) {
+    if (options.version) {
+        const versions = await app.getAppStoreVersionsAsync({
+            query: {
+                limit: 200,
+                filter: {
+                    platform: options.platform,
+                    appStoreState: [
+                        apple_utils_1.AppStoreState.PREPARE_FOR_SUBMISSION,
+                        apple_utils_1.AppStoreState.DEVELOPER_REJECTED,
+                        apple_utils_1.AppStoreState.REJECTED,
+                        apple_utils_1.AppStoreState.METADATA_REJECTED,
+                        apple_utils_1.AppStoreState.WAITING_FOR_REVIEW,
+                        apple_utils_1.AppStoreState.INVALID_BINARY,
+                    ].join(','),
+                },
+            },
+        });
+        const version = versions.find(model => model.attributes.versionString === options.version);
+        if (version) {
+            return version;
+        }
+    }
+    return null;
+}
+/**
+ * Check if we can reuse an existing editable app version that has not been published yet.
+ * If not, it creates a new version based on the version string.
+ */
+async function createOrUpdateEditAppStoreVersionAsync(app, options) {
+    const version = await app.getEditAppStoreVersionAsync({ platform: options.platform });
+    if (version) {
+        return await version.updateAsync({ versionString: options.version });
+    }
+    return await app.createVersionAsync({
+        versionString: options.version,
+        platform: options.platform,
+    });
+}

package/build/metadata/apple/tasks/index.d.ts

@@ -1,6 +1,11 @@
 import { MetadataContext } from '../../context';
 import { AppleTask } from '../task';
+import { AppVersionOptions } from './app-version';
+declare type AppleTaskOptions = {
+    version?: AppVersionOptions['version'];
+};
 /**
  * List of all eligible tasks to sync local store configuration to the App store.
  */
-export declare function createAppleTasks(_ctx: MetadataContext): AppleTask[];
+export declare function createAppleTasks(_ctx: MetadataContext, { version }?: AppleTaskOptions): AppleTask[];
+export {};

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

@@ -8,7 +8,12 @@ const app_version_1 = require("./app-version");
 /**
  * List of all eligible tasks to sync local store configuration to the App store.
  */
-function createAppleTasks(_ctx) {
-    return [new app_version_1.AppVersionTask(), new app_info_1.AppInfoTask(), new age_rating_1.AgeRatingTask(), new app_review_detail_1.AppReviewDetailTask()];
+function createAppleTasks(_ctx, { version } = {}) {
+    return [
+        new app_version_1.AppVersionTask({ version }),
+        new app_info_1.AppInfoTask(),
+        new age_rating_1.AgeRatingTask(),
+        new app_review_detail_1.AppReviewDetailTask(),
+    ];
 }
 exports.createAppleTasks = createAppleTasks;

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

@@ -2,6 +2,7 @@
 import type { AgeRatingDeclarationProps } from '@expo/apple-utils';
 export declare type AppleLocale = string;
 export interface AppleMetadata {
+    version?: string;
     copyright?: string;
     info?: Record<AppleLocale, AppleInfo>;
     categories?: AppleCategory;
@@ -14,13 +15,8 @@ export declare type AppleAdvisory = Partial<AgeRatingDeclarationProps>;
 /** Apps can define up to two categories, or categories with up to two subcategories */
 export declare type AppleCategory = (string | string[])[];
 export interface AppleRelease {
-    isPhasedReleaseEnabled?: boolean;
-    shouldResetRatings?: boolean;
-    autoReleaseDate?: number | string;
-    automaticRelease?: boolean;
-    usesThirdPartyContent?: boolean;
-    /** Alternative to setting `ITSAppUsesNonExemptEncryption` in the binary's `Info.plist`. */
-    usesNonExemptEncryption?: boolean;
+    automaticRelease?: boolean | string;
+    phasedRelease?: boolean;
 }
 export interface AppleInfo {
     title: string;

package/build/metadata/upload.js

@@ -17,6 +17,7 @@ const telemetry_1 = require("./utils/telemetry");
  * Note, only App Store is supported at this time.
  */
 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}"`);
@@ -41,7 +42,11 @@ async function uploadMetadataAsync(metadataCtx) {
     log_1.default.log('Uploading App Store configuration...');
     const errors = [];
     const config = (0, config_1.createAppleReader)(fileData);
-    const tasks = (0, tasks_1.createAppleTasks)(metadataCtx);
+    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.
+        version: (_a = config.getVersion()) === null || _a === void 0 ? void 0 : _a.versionString,
+    });
     const taskCtx = { app };
     for (const task of tasks) {
         try {

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;
@@ -77,6 +76,8 @@ declare type AssetUploadResult = {
     assetCount: number;
     uniqueAssetCount: number;
     uniqueUploadedAssetCount: number;
+    assetLimitPerUpdateGroup: number;
 };
-export declare function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAssets, updateSpinnerText?: (updatedText: string) => void): Promise<AssetUploadResult>;
+export declare function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAssets, projectId: string, updateSpinnerText?: (totalAssets: number, missingAssets: number) => void): Promise<AssetUploadResult>;
+export declare function isUploadedAssetCountAboveWarningThreshold(uploadedAssetCount: number, assetLimitPerUpdateGroup: number): boolean;
 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.isUploadedAssetCountAboveWarningThreshold = 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;
@@ -184,7 +184,7 @@ async function filterOutAssetsThatAlreadyExistAsync(uniqueAssetsWithStorageKey)
     return missingAssets;
 }
 exports.filterOutAssetsThatAlreadyExistAsync = filterOutAssetsThatAlreadyExistAsync;
-async function uploadAssetsAsync(assetsForUpdateInfoGroup, updateSpinnerText) {
+async function uploadAssetsAsync(assetsForUpdateInfoGroup, projectId, updateSpinnerText) {
     let assets = [];
     let platform;
     for (platform in assetsForUpdateInfoGroup) {
@@ -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,34 +201,40 @@ 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 () => {
-            const presignedPost = JSON.parse(specifications[i]);
-            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();
+    const [assetLimitPerUpdateGroup] = await Promise.all([
+        PublishQuery_1.PublishQuery.getAssetLimitPerUpdateGroupAsync(projectId),
+        missingAssets.map((missingAsset, i) => {
+            assetUploadPromiseLimit(async () => {
+                const presignedPost = JSON.parse(specifications[i]);
+                await (0, uploads_1.uploadWithPresignedPostAsync)(missingAsset.path, presignedPost);
+            });
+        }),
+    ]);
     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,
         uniqueAssetCount: uniqueAssets.length,
         uniqueUploadedAssetCount,
+        assetLimitPerUpdateGroup,
     };
 }
 exports.uploadAssetsAsync = uploadAssetsAsync;
+function isUploadedAssetCountAboveWarningThreshold(uploadedAssetCount, assetLimitPerUpdateGroup) {
+    const warningThreshold = Math.floor(assetLimitPerUpdateGroup * 0.75);
+    return uploadedAssetCount > warningThreshold;
+}
+exports.isUploadedAssetCountAboveWarningThreshold = isUploadedAssetCountAboveWarningThreshold;

package/build/project/remoteVersionSource.d.ts

@@ -0,0 +1,8 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { EasJson, EasJsonReader } from '@expo/eas-json';
+import { ProfileData } from '../utils/profiles';
+export declare function ensureVersionSourceIsRemoteAsync(projectDir: string, easJsonReader: EasJsonReader): Promise<void>;
+export declare function validateBuildProfileVersionSettings(profileInfo: ProfileData<'build'>, cliConfig: EasJson['cli']): void;
+export declare function validateAppConfigForRemoteVersionSource(exp: ExpoConfig, platform: Platform): void;
+export declare function getBuildVersionName(platform: Platform): string;