eas-cli 16.6.2 → 16.7.1

package/build/project/projectUtils.js

@@ -74,8 +74,8 @@ function isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion) {
     return isExpoUpdatesInstalled(projectDir);
 }
 exports.isExpoUpdatesInstalledOrAvailable = isExpoUpdatesInstalledOrAvailable;
-function isUsingEASUpdate(exp, projectId) {
-    return exp.updates?.url === (0, api_1.getEASUpdateURL)(projectId);
+function isUsingEASUpdate(exp, projectId, manifestHostOverride) {
+    return exp.updates?.url === (0, api_1.getEASUpdateURL)(projectId, manifestHostOverride);
 }
 exports.isUsingEASUpdate = isUsingEASUpdate;
 async function getExpoUpdatesPackageVersionIfInstalledAsync(projectDir) {

package/build/project/publish.d.ts

@@ -212,4 +212,11 @@ export declare function getRuntimeToUpdateRolloutInfoGroupMappingAsync(graphqlCl
         platforms: UpdatePublishPlatform[];
     })[];
 }): Promise<Map<string, UpdateRolloutInfoGroup>>;
+export declare function getUpdateRolloutInfoGroupAsync(graphqlClient: ExpoGraphqlClient, { appId, branchName, rolloutPercentage, runtimeVersion, platforms, }: {
+    appId: string;
+    branchName: string;
+    rolloutPercentage: number;
+    runtimeVersion: string;
+    platforms: UpdatePublishPlatform[];
+}): Promise<UpdateRolloutInfoGroup>;
 export {};

package/build/project/publish.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeToUpdateRolloutInfoGroupMappingAsync = exports.updatePublishPlatformToAppPlatform = exports.platformDisplayNames = exports.findCompatibleBuildsAsync = exports.maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync = exports.getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects = exports.getRuntimeVersionInfoObjectsAsync = exports.defaultPublishPlatforms = exports.getUpdateMessageForCommandAsync = exports.getBranchNameForCommandAsync = exports.isUploadedAssetCountAboveWarningThreshold = exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.getOriginalPathFromAssetMap = exports.getAssetHashFromPath = exports.filterCollectedAssetsByRequestedPlatforms = exports.generateEasMetadataAsync = exports.loadMetadata = exports.resolveInputDirectoryAsync = exports.buildBundlesAsync = exports.buildUnsortedUpdateInfoGroupAsync = exports.convertAssetToUpdateInfoGroupFormatAsync = exports.getStorageKeyForAssetAsync = exports.getStorageKey = exports.getBase64URLEncoding = exports.guessContentTypeFromExtension = exports.MetadataJoi = void 0;
+exports.getUpdateRolloutInfoGroupAsync = exports.getRuntimeToUpdateRolloutInfoGroupMappingAsync = exports.updatePublishPlatformToAppPlatform = exports.platformDisplayNames = exports.findCompatibleBuildsAsync = exports.maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync = exports.getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects = exports.getRuntimeVersionInfoObjectsAsync = exports.defaultPublishPlatforms = exports.getUpdateMessageForCommandAsync = exports.getBranchNameForCommandAsync = exports.isUploadedAssetCountAboveWarningThreshold = exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.getOriginalPathFromAssetMap = exports.getAssetHashFromPath = exports.filterCollectedAssetsByRequestedPlatforms = exports.generateEasMetadataAsync = 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 config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
@@ -633,18 +633,28 @@ exports.updatePublishPlatformToAppPlatform = {
 async function getRuntimeToUpdateRolloutInfoGroupMappingAsync(graphqlClient, { appId, branchName, rolloutPercentage, runtimeToPlatformsAndFingerprintInfoMapping, }) {
     const runtimeToPlatformsMap = new Map(runtimeToPlatformsAndFingerprintInfoMapping.map(r => [r.runtimeVersion, r.platforms]));
     return await (0, mapMapAsync_1.default)(runtimeToPlatformsMap, async (platforms, runtimeVersion) => {
-        return Object.fromEntries(await Promise.all(platforms.map(async (platform) => {
-            const updateIdForPlatform = await BranchQuery_1.BranchQuery.getLatestUpdateIdOnBranchAsync(graphqlClient, {
-                appId,
-                branchName,
-                runtimeVersion,
-                platform: exports.updatePublishPlatformToAppPlatform[platform],
-            });
-            if (!updateIdForPlatform) {
-                throw new Error(`No updates on branch ${branchName} for platform ${platform} and runtimeVersion ${runtimeVersion} to roll out from.`);
-            }
-            return [platform, { rolloutPercentage, rolloutControlUpdateId: updateIdForPlatform }];
-        })));
+        return await getUpdateRolloutInfoGroupAsync(graphqlClient, {
+            appId,
+            branchName,
+            rolloutPercentage,
+            runtimeVersion,
+            platforms,
+        });
     });
 }
 exports.getRuntimeToUpdateRolloutInfoGroupMappingAsync = getRuntimeToUpdateRolloutInfoGroupMappingAsync;
+async function getUpdateRolloutInfoGroupAsync(graphqlClient, { appId, branchName, rolloutPercentage, runtimeVersion, platforms, }) {
+    return Object.fromEntries(await Promise.all(platforms.map(async (platform) => {
+        const updateIdForPlatform = await BranchQuery_1.BranchQuery.getLatestUpdateIdOnBranchAsync(graphqlClient, {
+            appId,
+            branchName,
+            runtimeVersion,
+            platform: exports.updatePublishPlatformToAppPlatform[platform],
+        });
+        if (!updateIdForPlatform) {
+            throw new Error(`No updates on branch ${branchName} for platform ${platform} and runtimeVersion ${runtimeVersion} to roll out from.`);
+        }
+        return [platform, { rolloutPercentage, rolloutControlUpdateId: updateIdForPlatform }];
+    })));
+}
+exports.getUpdateRolloutInfoGroupAsync = getUpdateRolloutInfoGroupAsync;

package/build/update/configure.d.ts

@@ -24,7 +24,7 @@ export declare function ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir: st
  *     - Sets `updates.url` if not set
  *   - Ensure latest changes are reflected in the native config, if any
  */
-export declare function ensureEASUpdateIsConfiguredAsync({ exp: expMaybeWithoutUpdates, projectId, projectDir, vcsClient, platform, env, forceNativeConfigSync, }: {
+export declare function ensureEASUpdateIsConfiguredAsync({ exp: expMaybeWithoutUpdates, projectId, projectDir, vcsClient, platform, env, forceNativeConfigSync, manifestHostOverride, }: {
     exp: ExpoConfig;
     projectId: string;
     projectDir: string;
@@ -32,4 +32,5 @@ export declare function ensureEASUpdateIsConfiguredAsync({ exp: expMaybeWithoutU
     platform: RequestedPlatform | null;
     env: Env | undefined;
     forceNativeConfigSync?: boolean;
+    manifestHostOverride: string | null;
 }): Promise<void>;

package/build/update/configure.js

@@ -78,10 +78,10 @@ function mergeExpoConfig(exp, modifyExp) {
  *   - Ensure runtimeVersion is defined for both or individual platforms
  *   - Output the changes made, or the changes required to make manually
  */
-async function ensureEASUpdatesIsConfiguredInExpoConfigAsync({ exp, projectId, projectDir, platform, workflows, }) {
+async function ensureEASUpdatesIsConfiguredInExpoConfigAsync({ exp, projectId, projectDir, platform, workflows, manifestHostOverride, }) {
     const modifyConfig = {};
-    if (exp.updates?.url !== (0, api_1.getEASUpdateURL)(projectId)) {
-        modifyConfig.updates = { url: (0, api_1.getEASUpdateURL)(projectId) };
+    if (exp.updates?.url !== (0, api_1.getEASUpdateURL)(projectId, manifestHostOverride)) {
+        modifyConfig.updates = { url: (0, api_1.getEASUpdateURL)(projectId, manifestHostOverride) };
     }
     let androidRuntimeVersion = exp.android?.runtimeVersion ?? exp.runtimeVersion;
     let iosRuntimeVersion = exp.ios?.runtimeVersion ?? exp.runtimeVersion;
@@ -245,7 +245,7 @@ exports.ensureEASUpdateIsConfiguredInEasJsonAsync = ensureEASUpdateIsConfiguredI
  *     - Sets `updates.url` if not set
  *   - Ensure latest changes are reflected in the native config, if any
  */
-async function ensureEASUpdateIsConfiguredAsync({ exp: expMaybeWithoutUpdates, projectId, projectDir, vcsClient, platform, env, forceNativeConfigSync, }) {
+async function ensureEASUpdateIsConfiguredAsync({ exp: expMaybeWithoutUpdates, projectId, projectDir, vcsClient, platform, env, forceNativeConfigSync, manifestHostOverride, }) {
     const hasExpoUpdates = (0, projectUtils_1.isExpoUpdatesInstalledOrAvailable)(projectDir, expMaybeWithoutUpdates.sdkVersion);
     const hasExpoUpdatesInDevDependencies = (0, projectUtils_1.isExpoUpdatesInstalledAsDevDependency)(projectDir);
     if (!hasExpoUpdates && !hasExpoUpdatesInDevDependencies) {
@@ -267,6 +267,7 @@ async function ensureEASUpdateIsConfiguredAsync({ exp: expMaybeWithoutUpdates, p
         projectId,
         platform,
         workflows,
+        manifestHostOverride,
     });
     if (forceNativeConfigSync || projectChanged || !hasExpoUpdates) {
         await ensureEASUpdateIsConfiguredNativelyAsync(vcsClient, {

package/build/update/republish.d.ts

@@ -11,7 +11,7 @@ export type UpdateToRepublish = {
  * @param updatesToPublish The update group to republish
  * @param targetBranch The branch to repubish the update group on
  */
-export declare function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, codeSigningInfo, json, }: {
+export declare function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, codeSigningInfo, json, rolloutPercentage, }: {
     graphqlClient: ExpoGraphqlClient;
     app: {
         exp: ExpoConfig;
@@ -25,4 +25,5 @@ export declare function republishAsync({ graphqlClient, app, updatesToPublish, t
     updateMessage: string;
     codeSigningInfo?: CodeSigningInfo;
     json?: boolean;
+    rolloutPercentage?: number;
 }): Promise<void>;

package/build/update/republish.js

@@ -10,6 +10,7 @@ const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
 const log_1 = tslib_1.__importStar(require("../log"));
 const ora_1 = require("../ora");
 const projectUtils_1 = require("../project/projectUtils");
+const publish_1 = require("../project/publish");
 const code_signing_1 = require("../utils/code-signing");
 const formatFields_1 = tslib_1.__importDefault(require("../utils/formatFields"));
 const json_1 = require("../utils/json");
@@ -17,7 +18,7 @@ const json_1 = require("../utils/json");
  * @param updatesToPublish The update group to republish
  * @param targetBranch The branch to repubish the update group on
  */
-async function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, codeSigningInfo, json, }) {
+async function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, codeSigningInfo, json, rolloutPercentage, }) {
     const { branchName: targetBranchName, branchId: targetBranchId } = targetBranch;
     // The update group properties are the same for all updates
     (0, assert_1.default)(updatesToPublish.length > 0, 'Updates to republish must be provided');
@@ -25,7 +26,9 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
     const isSameGroup = (update) => update.groupId === arbitraryUpdate.groupId &&
         update.branchId === arbitraryUpdate.branchId &&
         update.branchName === arbitraryUpdate.branchName &&
-        update.runtimeVersion === arbitraryUpdate.runtimeVersion;
+        update.runtimeVersion === arbitraryUpdate.runtimeVersion &&
+        update.manifestHostOverride === arbitraryUpdate.manifestHostOverride &&
+        update.assetHostOverride === arbitraryUpdate.assetHostOverride;
     (0, assert_1.default)(updatesToPublish.every(isSameGroup), 'All updates being republished must belong to the same update group');
     (0, assert_1.default)(updatesToPublish.every(u => u.isRollBackToEmbedded) ||
         updatesToPublish.every(u => !u.isRollBackToEmbedded), 'All updates must either be roll back to embedded updates or not');
@@ -76,6 +79,15 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
                         },
                     ];
                 })),
+                rolloutInfoGroup: rolloutPercentage
+                    ? await (0, publish_1.getUpdateRolloutInfoGroupAsync)(graphqlClient, {
+                        appId: app.projectId,
+                        branchName: targetBranchName,
+                        runtimeVersion,
+                        rolloutPercentage,
+                        platforms: updatesToPublish.map(update => update.platform),
+                    })
+                    : null,
             };
         updatesRepublished = await PublishMutation_1.PublishMutation.publishUpdateGroupAsync(graphqlClient, [
             {
@@ -84,7 +96,11 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
                 message: updateMessage,
                 ...objectToMergeIn,
                 gitCommitHash: updatesToPublish[0].gitCommitHash,
+                isGitWorkingTreeDirty: updatesToPublish[0].isGitWorkingTreeDirty,
+                environment: updatesToPublish[0].environment,
                 awaitingCodeSigningInfo: !!codeSigningInfo,
+                manifestHostOverride: updatesToPublish[0].manifestHostOverride,
+                assetHostOverride: updatesToPublish[0].assetHostOverride,
             },
         ]);
         if (codeSigningInfo) {
@@ -137,6 +153,22 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
         ...(updatesRepublishedByPlatform.ios
             ? [{ label: 'iOS update ID', value: updatesRepublishedByPlatform.ios.id }]
             : []),
+        ...(updatesRepublishedByPlatform.android?.rolloutControlUpdate
+            ? [
+                {
+                    label: 'Android Rollout',
+                    value: `${updatesRepublishedByPlatform.android?.rolloutPercentage}% (Base update ID: ${updatesRepublishedByPlatform.android?.rolloutControlUpdate.id})`,
+                },
+            ]
+            : []),
+        ...(updatesRepublishedByPlatform.ios?.rolloutControlUpdate
+            ? [
+                {
+                    label: 'iOS Rollout',
+                    value: `${updatesRepublishedByPlatform.ios?.rolloutPercentage}% (Base update ID: ${updatesRepublishedByPlatform.ios?.rolloutControlUpdate.id})`,
+                },
+            ]
+            : []),
         { label: 'Message', value: updateMessage },
         { label: 'EAS Dashboard', value: (0, log_1.link)(updateGroupUrl, { dim: false }) },
     ]));

package/build/update/utils.d.ts

@@ -53,4 +53,3 @@ export declare function getUpdateJsonInfosForUpdates(updates: UpdateFragment[]):
 export declare function getUpdateGroupDescriptions(updateGroups: UpdateFragment[][]): FormattedUpdateGroupDescription[];
 export declare function getUpdateGroupDescriptionsWithBranch(updateGroups: UpdateFragment[][]): FormattedUpdateGroupDescriptionWithBranch[];
 export declare function getBranchDescription(branch: UpdateBranchFragment): FormattedBranchDescription;
-export declare function checkEASUpdateURLIsSetAsync(exp: ExpoConfig, projectId: string): Promise<boolean>;

package/build/update/utils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkEASUpdateURLIsSetAsync = exports.getBranchDescription = exports.getUpdateGroupDescriptionsWithBranch = exports.getUpdateGroupDescriptions = exports.getUpdateJsonInfosForUpdates = exports.formatUpdateTitle = exports.ensureValidVersions = exports.formatUpdateMessage = exports.truncateString = exports.formatPlatformForUpdateGroup = exports.getPlatformsForGroup = exports.formatBranch = exports.formatUpdateGroup = exports.UPDATE_COLUMNS_WITH_BRANCH = exports.UPDATE_COLUMNS = void 0;
+exports.getBranchDescription = exports.getUpdateGroupDescriptionsWithBranch = exports.getUpdateGroupDescriptions = exports.getUpdateJsonInfosForUpdates = exports.formatUpdateTitle = exports.ensureValidVersions = exports.formatUpdateMessage = exports.truncateString = exports.formatPlatformForUpdateGroup = exports.getPlatformsForGroup = exports.formatBranch = exports.formatUpdateGroup = exports.UPDATE_COLUMNS_WITH_BRANCH = exports.UPDATE_COLUMNS = void 0;
 const tslib_1 = require("tslib");
 const timeago_js_1 = require("@expo/timeago.js");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const dateformat_1 = tslib_1.__importDefault(require("dateformat"));
-const api_1 = require("../api");
 const log_1 = require("../log");
 const platform_1 = require("../platform");
 const User_1 = require("../user/User");
@@ -173,9 +172,3 @@ function getBranchDescription(branch) {
     };
 }
 exports.getBranchDescription = getBranchDescription;
-async function checkEASUpdateURLIsSetAsync(exp, projectId) {
-    const configuredURL = exp.updates?.url;
-    const expectedURL = (0, api_1.getEASUpdateURL)(projectId);
-    return configuredURL === expectedURL;
-}
-exports.checkEASUpdateURLIsSetAsync = checkEASUpdateURLIsSetAsync;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.6.2",
+  "version": "16.7.1",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -3815,6 +3815,13 @@
           "required": false,
           "multiple": false
         },
+        "rollout-percentage": {
+          "name": "rollout-percentage",
+          "type": "option",
+          "description": "Percentage of users this update should be immediately available to. Users not in the rollout will be served the previous latest update on the branch, even if that update is itself being rolled out. The specified number must be an integer between 1 and 100. When not specified, this defaults to 100.",
+          "required": false,
+          "multiple": false
+        },
         "json": {
           "name": "json",
           "type": "boolean",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.6.2",
+  "version": "16.7.1",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
@@ -13,7 +13,7 @@
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
     "@expo/eas-build-job": "1.0.173",
-    "@expo/eas-json": "16.4.0",
+    "@expo/eas-json": "16.7.0",
     "@expo/env": "^1.0.0",
     "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.117",
@@ -240,5 +240,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "32d3020659740d6d74ce76d9c77bd94a656ce018"
+  "gitHead": "be73d3a337a3a8b10d3af523fbfc2123ca96d9a4"
 }