address PR feedback

CHANGELOG.md

@@ -8,20 +8,15 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Support uploading different platform combinations in `eas update`. ([#1461](https://github.com/expo/eas-cli/pull/1461) by [@EvanBacon](https://github.com/EvanBacon))
 - Add Git commit to EAS Update record. ([#1499](https://github.com/expo/eas-cli/pull/1499) by [@fiberjw](https://github.com/fiberjw))
 - Use local CLI for `expo export` in SDK +46. ([#1474](https://github.com/expo/eas-cli/pull/1474) by [@EvanBacon](https://github.com/EvanBacon))
 - Validate icon PNGs before running Android build. ([#1477](https://github.com/expo/eas-cli/pull/1477) by [@dsokal](https://github.com/dsokal))
 
 ### 🐛 Bug fixes
 
-- Fixed the values of the distribution enum on the build profile schema receiving the incorrect descriptions. ([#1504](https://github.com/expo/eas-cli/pull/1504) by [@macksal](https://github.com/macksal))
-- Remove hard dependency on expo package being installed to init a project. ([#1517](https://github.com/expo/eas-cli/pull/1517) by [@brentvatne](https://github.com/brentvatne))
-
 ### 🧹 Chores
 
 - Remove friction from the initial EAS update setup. ([#1479](https://github.com/expo/eas-cli/pull/1479) by [@byCedric](https://github.com/byCedric))
-- Improve choice formatting when selecting a build to submit in the `eas submit` command. ([#1502](https://github.com/expo/eas-cli/pull/1502) by [@szdziedzic](https://github.com/szdziedzic))
 
 ## [2.6.0](https://github.com/expo/eas-cli/releases/tag/v2.6.0) - 2022-10-27
 

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "2.7.0"
+  "version": "2.6.0"
 }

packages/eas-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "2.7.0",
+  "version": "2.6.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -14,7 +14,7 @@
     "@expo/config-plugins": "5.0.1",
     "@expo/config-types": "46.0.2",
     "@expo/eas-build-job": "0.2.96",
-    "@expo/eas-json": "2.7.0",
+    "@expo/eas-json": "2.6.0",
     "@expo/json-file": "8.2.36",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",

packages/eas-cli/src/build/android/prepareJob.ts

@@ -7,6 +7,7 @@ import { AndroidCredentials } from '../../credentials/android/AndroidCredentials
 import { getUsername } from '../../project/projectUtils';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
+import { resolveChannel } from '../utils/updates';
 
 interface JobData {
   projectArchive: ArchiveSource;
@@ -68,7 +69,7 @@ export async function prepareJobAsync(
       ...buildCredentials,
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
-    updates: { channel: ctx.buildProfile.channel },
+    updates: { channel: resolveChannel(ctx) },
     developmentClient: buildProfile.developmentClient,
     gradleCommand: buildProfile.gradleCommand,
     applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,

packages/eas-cli/src/build/ios/prepareJob.ts

@@ -6,6 +6,7 @@ import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { getUsername } from '../../project/projectUtils';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
+import { resolveChannel } from '../utils/updates';
 
 interface JobData {
   projectArchive: ArchiveSource;
@@ -58,7 +59,7 @@ export async function prepareJobAsync(
       buildCredentials,
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
-    updates: { channel: ctx.buildProfile.channel },
+    updates: { channel: resolveChannel(ctx) },
     developmentClient: ctx.buildProfile.developmentClient,
     simulator: ctx.buildProfile.simulator,
     scheme: jobData.buildScheme,

packages/eas-cli/src/build/local.ts

@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.118';
+const PLUGIN_PACKAGE_VERSION = '0.0.115';
 
 export interface LocalBuildOptions {
   enable: boolean;

packages/eas-cli/src/build/metadata.ts

@@ -5,7 +5,11 @@ import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
 import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
+import {
+  getUsername,
+  isEASUpdateConfigured,
+  isExpoUpdatesInstalled,
+} from '../project/projectUtils';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -19,6 +23,7 @@ import { getVcsClient } from '../vcs';
 import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { resolveChannel } from './utils/updates';
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
@@ -111,16 +116,17 @@ async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
   if (!isExpoUpdatesInstalled(ctx.projectDir)) {
     return null;
   }
-  if (ctx.buildProfile.channel) {
-    return { channel: ctx.buildProfile.channel };
+  const maybeChannel = resolveChannel(ctx);
+  if (maybeChannel) {
+    return { channel: maybeChannel };
+  }
+  const nativeChannel = await getNativeChannelAsync(ctx);
+  if (isEASUpdateConfigured(ctx.projectDir, ctx.exp) && nativeChannel) {
+    return { channel: nativeChannel };
   }
   if (ctx.buildProfile.releaseChannel) {
     return { releaseChannel: ctx.buildProfile.releaseChannel };
   }
-  const channel = await getNativeChannelAsync(ctx);
-  if (channel) {
-    return { channel };
-  }
   const releaseChannel = await getNativeReleaseChannelAsync(ctx);
   return { releaseChannel };
 }

packages/eas-cli/src/build/utils/__tests__/updates-test.ts

@@ -0,0 +1,72 @@
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import { instance, mock, when } from 'ts-mockito';
+
+import { isEASUpdateConfigured } from '../../../project/projectUtils';
+import { BuildContext } from '../../context';
+import { resolveChannel } from '../updates';
+
+jest.mock('../../../project/projectUtils', () => ({
+  isEASUpdateConfigured: jest.fn(),
+}));
+
+describe(resolveChannel, () => {
+  it('returns "channel" from build profile if specified', () => {
+    jest.mocked(isEASUpdateConfigured).mockReturnValue(true);
+
+    const buildProfileMock = mock<BuildProfile<Platform>>();
+    when(buildProfileMock.channel).thenReturn('blahblah');
+    const buildProfile = instance(buildProfileMock);
+
+    const ctxMock = mock<BuildContext<Platform>>();
+    when(ctxMock.exp).thenReturn({
+      name: 'todo',
+      slug: 'todo',
+      updates: { url: 'http://sokal.dev/todo' },
+    });
+    when(ctxMock.buildProfileName).thenReturn('production');
+    when(ctxMock.buildProfile).thenReturn(buildProfile);
+    const ctx = instance(ctxMock);
+
+    expect(resolveChannel(ctx)).toBe('blahblah');
+  });
+
+  it('returns undefined if "channel" is not specified in build profile and EAS Update is not configured', () => {
+    jest.mocked(isEASUpdateConfigured).mockReturnValue(false);
+
+    const buildProfileMock = mock<BuildProfile<Platform>>();
+    when(buildProfileMock.channel).thenReturn(undefined);
+    const buildProfile = instance(buildProfileMock);
+
+    const ctxMock = mock<BuildContext<Platform>>();
+    when(ctxMock.exp).thenReturn({
+      name: 'todo',
+      slug: 'todo',
+    });
+    when(ctxMock.buildProfileName).thenReturn('production');
+    when(ctxMock.buildProfile).thenReturn(buildProfile);
+    const ctx = instance(ctxMock);
+
+    expect(resolveChannel(ctx)).toBe(undefined);
+  });
+
+  it('returns the build profile name if "channel" is not specified in build profile and EAS Update is configured', () => {
+    jest.mocked(isEASUpdateConfigured).mockReturnValue(true);
+
+    const buildProfileMock = mock<BuildProfile<Platform>>();
+    when(buildProfileMock.channel).thenReturn(undefined);
+    const buildProfile = instance(buildProfileMock);
+
+    const ctxMock = mock<BuildContext<Platform>>();
+    when(ctxMock.exp).thenReturn({
+      name: 'todo',
+      slug: 'todo',
+      updates: { url: 'http://sokal.dev/todo' },
+    });
+    when(ctxMock.buildProfileName).thenReturn('production');
+    when(ctxMock.buildProfile).thenReturn(buildProfile);
+    const ctx = instance(ctxMock);
+
+    expect(resolveChannel(ctx)).toBe('production');
+  });
+});

packages/eas-cli/src/build/utils/updates.ts

@@ -0,0 +1,12 @@
+import { Platform } from '@expo/eas-build-job';
+
+import { isEASUpdateConfigured } from '../../project/projectUtils';
+import { BuildContext } from '../context';
+
+export function resolveChannel(ctx: BuildContext<Platform>): string | undefined {
+  let fallback: string | undefined = undefined;
+  if (isEASUpdateConfigured(ctx.projectDir, ctx.exp)) {
+    fallback = ctx.buildProfileName;
+  }
+  return ctx.buildProfile.channel ?? fallback;
+}

packages/eas-cli/src/commandUtils/context/contextUtils/__tests__/getProjectIdAsync-test.ts

@@ -158,13 +158,9 @@ describe(getProjectIdAsync, () => {
     expect(projectId).toEqual('2345');
 
     expect(modifyConfigAsync).toHaveBeenCalledTimes(1);
-    expect(modifyConfigAsync).toHaveBeenCalledWith(
-      '/app',
-      {
-        extra: { eas: { projectId: '2345' } },
-      },
-      { skipSDKVersionRequirement: true }
-    );
+    expect(modifyConfigAsync).toHaveBeenCalledWith('/app', {
+      extra: { eas: { projectId: '2345' } },
+    });
   });
 
   it('throws if writing the ID back to the config fails', async () => {

packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts

@@ -25,13 +25,9 @@ export async function saveProjectIdToAppConfigAsync(
   options: { env?: Env } = {}
 ): Promise<void> {
   const exp = getExpoConfig(projectDir, options);
-  const result = await modifyConfigAsync(
-    projectDir,
-    {
-      extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
-    },
-    { skipSDKVersionRequirement: true }
-  );
+  const result = await modifyConfigAsync(projectDir, {
+    extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
+  });
 
   switch (result.type) {
     case 'success':

packages/eas-cli/src/commands/update/index.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig, Platform as PublishPlatform } from '@expo/config';
+import { ExpoConfig } from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { Errors, Flags } from '@oclif/core';
@@ -28,13 +28,11 @@ import { ora } from '../../ora';
 import { RequestedPlatform, requestedPlatformDisplayNames } from '../../platform';
 import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import {
-  ExpoCLIExportPlatformFlag,
+  PublishPlatform,
   buildBundlesAsync,
   buildUnsortedUpdateInfoGroupAsync,
   collectAssetsAsync,
-  filterExportedPlatformsByFlag,
   isUploadedAssetCountAboveWarningThreshold,
-  resolveInputDirectoryAsync,
   uploadAssetsAsync,
 } from '../../project/publish';
 import { resolveWorkflowAsync } from '../../project/workflow';
@@ -48,13 +46,12 @@ import {
   getManifestBodyAsync,
   signManifestBody,
 } from '../../utils/code-signing';
-import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
 import { getVcsClient } from '../../vcs';
 
-export const defaultPublishPlatforms: Partial<PublishPlatform>[] = ['android', 'ios'];
+export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
 
 type RawUpdateFlags = {
   auto: boolean;
@@ -72,7 +69,7 @@ type RawUpdateFlags = {
 
 type UpdateFlags = {
   auto: boolean;
-  platform: ExpoCLIExportPlatformFlag;
+  platform: RequestedPlatform;
   branchName?: string;
   updateMessage?: string;
   republish: boolean;
@@ -84,21 +81,6 @@ type UpdateFlags = {
   nonInteractive: boolean;
 };
 
-function getRequestedPlatform(platform: ExpoCLIExportPlatformFlag): RequestedPlatform | null {
-  switch (platform) {
-    case 'android':
-      return RequestedPlatform.Android;
-    case 'ios':
-      return RequestedPlatform.Ios;
-    case 'web':
-      return null;
-    case 'all':
-      return RequestedPlatform.All;
-    default:
-      throw new Error(`Unsupported platform: ${platform}`);
-  }
-}
-
 export default class UpdatePublish extends EasCommand {
   static override description = 'publish an update group';
 
@@ -130,11 +112,7 @@ export default class UpdatePublish extends EasCommand {
     }),
     platform: Flags.enum({
       char: 'p',
-      options: [
-        // TODO: Add web when it's fully supported
-        ...defaultPublishPlatforms,
-        'all',
-      ],
+      options: [...defaultPublishPlatforms, 'all'],
       default: 'all',
       required: false,
     }),
@@ -199,15 +177,14 @@ export default class UpdatePublish extends EasCommand {
 
     await ensureEASUpdatesIsConfiguredAsync(graphqlClient, {
       exp: expPossiblyWithoutEasUpdateConfigured,
-      platform: getRequestedPlatform(platformFlag),
+      platform: platformFlag,
       projectDir,
       projectId,
     });
 
     const { exp } = await getDynamicProjectConfigAsync();
     const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
-
-    let realizedPlatforms: PublishPlatform[] = [];
+    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
 
     if (!branchName) {
       if (autoFlag) {
@@ -285,7 +262,7 @@ export default class UpdatePublish extends EasCommand {
 
       let publicationPlatformMessage: string;
       if (platformFlag === 'all') {
-        if (updatesToRepublishFilteredByPlatform.length < defaultPublishPlatforms.length) {
+        if (updatesToRepublishFilteredByPlatform.length !== defaultPublishPlatforms.length) {
           Log.warn(`You are republishing an update that wasn't published for all platforms.`);
         }
         publicationPlatformMessage = `The republished update will appear on the same platforms it was originally published on: ${updatesToRepublishFilteredByPlatform
@@ -302,9 +279,6 @@ export default class UpdatePublish extends EasCommand {
 
         unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
       }
-      realizedPlatforms = updatesToRepublishFilteredByPlatform.map(
-        update => update.platform as PublishPlatform
-      );
 
       // These are the same for each member of an update group
       groupId = updatesToRepublishFilteredByPlatform[0].group;
@@ -353,44 +327,39 @@ export default class UpdatePublish extends EasCommand {
 
       // build bundle and upload assets for a new publish
       if (!skipBundler) {
-        const bundleSpinner = ora().start('Exporting...');
+        const bundleSpinner = ora().start('Building bundle...');
         try {
-          await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag });
-          bundleSpinner.succeed('Exported bundle(s)');
+          await buildBundlesAsync({ projectDir, inputDir, exp });
+          bundleSpinner.succeed('Built bundle!');
         } catch (e) {
-          bundleSpinner.fail('Export failed');
+          bundleSpinner.fail('Failed to build bundle!');
           throw e;
         }
       }
 
-      // After possibly bundling, assert that the input directory can be found.
-      const distRoot = await resolveInputDirectoryAsync(inputDir, { skipBundler });
-
-      const assetSpinner = ora().start('Uploading...');
-
+      const assetSpinner = ora().start('Uploading assets...');
       try {
-        const collectedAssets = await collectAssetsAsync(distRoot);
-        const assets = filterExportedPlatformsByFlag(collectedAssets, platformFlag);
-        realizedPlatforms = Object.keys(assets) as PublishPlatform[];
-
+        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
+        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
         const uploadResults = await uploadAssetsAsync(
           graphqlClient,
           assets,
           projectId,
           (totalAssets, missingAssets) => {
-            assetSpinner.text = `Uploading (${totalAssets - missingAssets}/${totalAssets})`;
+            assetSpinner.text = `Uploading assets. Finished (${
+              totalAssets - missingAssets
+            }/${totalAssets})`;
           }
         );
-
         uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
         assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
         unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
         const uploadAssetSuccessMessage = uploadedAssetCount
-          ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'platform' : 'platforms'}`
-          : `Uploaded: No changes detected`;
+          ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'asset' : 'assets'}!`
+          : `Uploading assets skipped -- no new assets found!`;
         assetSpinner.succeed(uploadAssetSuccessMessage);
       } catch (e) {
-        assetSpinner.fail('Failed to upload');
+        assetSpinner.fail('Failed to upload assets');
         throw e;
       }
     }
@@ -400,16 +369,11 @@ export default class UpdatePublish extends EasCommand {
       Log.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
     }
 
-    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
-
-    const runtimeToPlatformMapping: { runtimeVersion: string; platforms: string[] }[] = [];
-    for (const runtime of runtimeVersions) {
-      const platforms = runtimeVersions
-        .filter(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)
-        .map(({ platform }) => platform);
-      if (!runtimeToPlatformMapping.find(item => item.runtimeVersion === runtime.runtimeVersion)) {
-        runtimeToPlatformMapping.push({ runtimeVersion: runtime.runtimeVersion, platforms });
-      }
+    const runtimeToPlatformMapping: Record<string, string[]> = {};
+    for (const runtime of new Set(Object.values(runtimeVersions))) {
+      runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
+        .filter(pair => pair[1] === runtime)
+        .map(pair => pair[0]);
     }
 
     const { branchId } = await ensureBranchExistsAsync(graphqlClient, {
@@ -426,8 +390,8 @@ export default class UpdatePublish extends EasCommand {
     const gitCommitHash = await getVcsClient().getCommitHashAsync();
 
     // Sort the updates into different groups based on their platform specific runtime versions
-    const updateGroups: PublishUpdateGroupInput[] = runtimeToPlatformMapping.map(
-      ({ runtimeVersion, platforms }) => {
+    const updateGroups: PublishUpdateGroupInput[] = Object.entries(runtimeToPlatformMapping).map(
+      ([runtime, platforms]) => {
         const localUpdateInfoGroup = Object.fromEntries(
           platforms.map(platform => [
             platform,
@@ -443,7 +407,7 @@ export default class UpdatePublish extends EasCommand {
         return {
           branchId,
           updateInfoGroup: localUpdateInfoGroup,
-          runtimeVersion: republish ? oldRuntimeVersion : runtimeVersion,
+          runtimeVersion: republish ? oldRuntimeVersion : runtime,
           message: truncatedMessage,
           gitCommitHash,
           awaitingCodeSigningInfo: !!codeSigningInfo,
@@ -514,15 +478,12 @@ export default class UpdatePublish extends EasCommand {
       }
 
       Log.addNewLineIfNone();
-
-      for (const runtime of uniqBy(runtimeVersions, version => version.runtimeVersion)) {
+      for (const runtime of new Set(Object.values(runtimeVersions))) {
         const newUpdatesForRuntimeVersion = newUpdates.filter(
-          update => update.runtimeVersion === runtime.runtimeVersion
+          update => update.runtimeVersion === runtime
         );
         if (newUpdatesForRuntimeVersion.length === 0) {
-          throw new Error(
-            `Publish response is missing updates with runtime ${runtime.runtimeVersion}.`
-          );
+          throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
         }
         const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
         const newAndroidUpdate = newUpdatesForRuntimeVersion.find(
@@ -539,7 +500,7 @@ export default class UpdatePublish extends EasCommand {
         Log.log(
           formatFields([
             { label: 'Branch', value: branchName },
-            { label: 'Runtime version', value: runtime.runtimeVersion },
+            { label: 'Runtime version', value: runtime },
             { label: 'Platform', value: platforms.join(', ') },
             { label: 'Update group ID', value: updateGroupId },
             ...(newAndroidUpdate
@@ -601,20 +562,31 @@ export default class UpdatePublish extends EasCommand {
   }
 }
 
-/** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
+function transformRuntimeVersions(exp: ExpoConfig, platforms: Platform[]): Record<string, string> {
+  return Object.fromEntries(
+    platforms.map(platform => [
+      platform,
+      nullthrows(
+        Updates.getRuntimeVersion(exp, platform),
+        `Unable to determine runtime version for ${
+          requestedPlatformDisplayNames[platform]
+        }. ${learnMore('https://docs.expo.dev/eas-update/runtime-versions/')}`
+      ),
+    ])
+  );
+}
+
 async function getRuntimeVersionObjectAsync(
   exp: ExpoConfig,
-  platforms: PublishPlatform[],
+  platform: RequestedPlatform,
   projectDir: string
-): Promise<{ platform: string; runtimeVersion: string }[]> {
+): Promise<Record<string, string>> {
+  const platforms = (platform === 'all' ? ['android', 'ios'] : [platform]) as Platform[];
+
   for (const platform of platforms) {
-    if (platform === 'web') {
-      continue;
-    }
     const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
     if (isPolicy) {
-      const isManaged =
-        (await resolveWorkflowAsync(projectDir, platform as Platform)) === Workflow.MANAGED;
+      const isManaged = (await resolveWorkflowAsync(projectDir, platform)) === Workflow.MANAGED;
       if (!isManaged) {
         throw new Error(
           'Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.'
@@ -623,18 +595,5 @@ async function getRuntimeVersionObjectAsync(
     }
   }
 
-  return [...new Set(platforms)].map(platform => {
-    if (platform === 'web') {
-      return { platform: 'web', runtimeVersion: 'UNVERSIONED' };
-    }
-    return {
-      platform,
-      runtimeVersion: nullthrows(
-        Updates.getRuntimeVersion(exp, platform),
-        `Unable to determine runtime version for ${
-          requestedPlatformDisplayNames[platform]
-        }. ${learnMore('https://docs.expo.dev/eas-update/runtime-versions/')}`
-      ),
-    };
-  });
+  return transformRuntimeVersions(exp, platforms);
 }

packages/eas-cli/src/graphql/generated.ts

@@ -5006,7 +5006,7 @@ export type CreateAndroidBuildMutationVariables = Exact<{
 }>;
 
 
-export type CreateAndroidBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createAndroidBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
+export type CreateAndroidBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createAndroidBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
 
 export type CreateIosBuildMutationVariables = Exact<{
   appId: Scalars['ID'];
@@ -5016,7 +5016,7 @@ export type CreateIosBuildMutationVariables = Exact<{
 }>;
 
 
-export type CreateIosBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createIosBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
+export type CreateIosBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createIosBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
 
 export type CreateEnvironmentSecretForAccountMutationVariables = Exact<{
   input: CreateEnvironmentSecretInput;
@@ -5171,14 +5171,14 @@ export type BuildsByIdQueryVariables = Exact<{
 }>;
 
 
-export type BuildsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
+export type BuildsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
 
 export type BuildsWithSubmissionsByIdQueryVariables = Exact<{
   buildId: Scalars['ID'];
 }>;
 
 
-export type BuildsWithSubmissionsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
+export type BuildsWithSubmissionsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
 
 export type ViewBuildsOnAppQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -5188,7 +5188,7 @@ export type ViewBuildsOnAppQueryVariables = Exact<{
 }>;
 
 
-export type ViewBuildsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, builds: Array<{ __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }> } } };
+export type ViewBuildsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, builds: Array<{ __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }> } } };
 
 export type ViewUpdateChannelOnAppQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -5305,9 +5305,9 @@ export type AccountFragment = { __typename?: 'Account', id: string, name: string
 
 export type AppFragment = { __typename?: 'App', id: string, fullName: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role?: Role | null, actor: { __typename?: 'Robot', id: string } | { __typename?: 'User', id: string } }> } };
 
-export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
+export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
 
-export type BuildWithSubmissionsFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
+export type BuildWithSubmissionsFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
 
 export type EnvironmentSecretFragment = { __typename?: 'EnvironmentSecret', id: string, name: string, type: EnvironmentSecretType, createdAt: any };
 

packages/eas-cli/src/graphql/types/Build.ts

@@ -45,7 +45,6 @@ export const BuildFragmentNode = gql`
     appBuildVersion
     runtimeVersion
     gitCommitHash
-    gitCommitMessage
     initialQueuePosition
     queuePosition
     estimatedWaitTimeLeftSeconds

packages/eas-cli/src/project/__tests__/projectUtils-test.ts

@@ -0,0 +1,76 @@
+import { getPackageJson } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';
+
+import * as projectUtils from '../projectUtils';
+
+jest.mock('@expo/config', () => ({
+  getPackageJson: jest.fn(),
+}));
+
+describe(projectUtils.isEASUpdateConfigured, () => {
+  describe('expo-updates is not installed', () => {
+    it('returns false if updates.url is not set', () => {
+      jest.mocked(getPackageJson).mockReturnValue({});
+
+      const exp: ExpoConfig = {
+        name: 'blah',
+        slug: 'blah',
+      };
+      expect(projectUtils.isEASUpdateConfigured('/path/to/project', exp)).toBe(false);
+    });
+
+    it('returns false if updates.url is set', () => {
+      jest.mocked(getPackageJson).mockReturnValue({});
+
+      const exp: ExpoConfig = {
+        name: 'blah',
+        slug: 'blah',
+        updates: { url: 'http://sokal.dev/todo' },
+      };
+      expect(projectUtils.isEASUpdateConfigured('/path/to/project', exp)).toBe(false);
+    });
+
+    it('returns true if updates.url is set (for SDK < 44)', () => {
+      jest.mocked(getPackageJson).mockReturnValue({});
+
+      const exp: ExpoConfig = {
+        name: 'blah',
+        slug: 'blah',
+        sdkVersion: '43.0.0',
+        updates: { url: 'http://sokal.dev/todo' },
+      };
+      expect(projectUtils.isEASUpdateConfigured('/path/to/project', exp)).toBe(true);
+    });
+  });
+
+  describe('expo-updates is installed', () => {
+    it('returns false if updates.url is not set', () => {
+      jest.mocked(getPackageJson).mockReturnValue({
+        dependencies: {
+          'expo-updates': '1.2.3',
+        },
+      });
+
+      const exp: ExpoConfig = {
+        name: 'blah',
+        slug: 'blah',
+      };
+      expect(projectUtils.isEASUpdateConfigured('/path/to/project', exp)).toBe(false);
+    });
+
+    it('returns true if updates.url is set', () => {
+      jest.mocked(getPackageJson).mockReturnValue({
+        dependencies: {
+          'expo-updates': '1.2.3',
+        },
+      });
+
+      const exp: ExpoConfig = {
+        name: 'blah',
+        slug: 'blah',
+        updates: { url: 'http://sokal.dev/todo' },
+      };
+      expect(projectUtils.isEASUpdateConfigured('/path/to/project', exp)).toBe(true);
+    });
+  });
+});

packages/eas-cli/src/project/__tests__/publish-test.ts

@@ -14,7 +14,6 @@ import {
   buildUnsortedUpdateInfoGroupAsync,
   collectAssetsAsync,
   convertAssetToUpdateInfoGroupFormatAsync,
-  filterExportedPlatformsByFlag,
   filterOutAssetsThatAlreadyExistAsync,
   getBase64URLEncoding,
   getStorageKey,
@@ -92,28 +91,6 @@ describe('MetadataJoi', () => {
   });
 });
 
-describe(filterExportedPlatformsByFlag, () => {
-  it(`returns all`, () => {
-    expect(filterExportedPlatformsByFlag({ web: true, ios: true, android: true }, 'all')).toEqual({
-      web: true,
-      ios: true,
-      android: true,
-    });
-  });
-  it(`selects a platform`, () => {
-    expect(filterExportedPlatformsByFlag({ web: true, ios: true, android: true }, 'ios')).toEqual({
-      ios: true,
-    });
-  });
-  it(`asserts selected platform missing`, () => {
-    expect(() =>
-      filterExportedPlatformsByFlag({ web: true }, 'ios')
-    ).toThrowErrorMatchingInlineSnapshot(
-      `"--platform="ios" not found in metadata.json. Available platform(s): web"`
-    );
-  });
-});
-
 describe(guessContentTypeFromExtension, () => {
   it('returns the correct content type for jpg', () => {
     expect(guessContentTypeFromExtension('jpg')).toBe('image/jpeg');
@@ -259,41 +236,30 @@ describe(resolveInputDirectoryAsync, () => {
   it('returns the correct distRoot path', async () => {
     const customDirectoryName = path.resolve(uuidv4());
     await fs.mkdir(customDirectoryName, { recursive: true });
-    expect(await resolveInputDirectoryAsync(customDirectoryName, { skipBundler: false })).toBe(
-      customDirectoryName
-    );
+    expect(await resolveInputDirectoryAsync(customDirectoryName)).toBe(customDirectoryName);
   });
   it('throws an error if the path does not exist', async () => {
     const nonExistentPath = path.resolve(uuidv4());
-    await expect(
-      resolveInputDirectoryAsync(nonExistentPath, { skipBundler: false })
-    ).rejects.toThrow(`--input-dir="${nonExistentPath}" not found.`);
-  });
-  it('throws a more specific error if the path does not exist and the dev opted out of bundling', async () => {
-    const nonExistentPath = path.resolve(uuidv4());
-    await expect(
-      resolveInputDirectoryAsync(nonExistentPath, { skipBundler: true })
-    ).rejects.toThrow(
-      `--input-dir="${nonExistentPath}" not found. --skip-bundler requires the project to be exported manually before uploading. Ex: npx expo export && eas update --skip-bundler`
-    );
+    await expect(resolveInputDirectoryAsync(nonExistentPath)).rejects
+      .toThrow(`The input directory "${nonExistentPath}" does not exist.
+    You can allow us to build it for you by not setting the --skip-bundler flag.
+    If you chose to build it yourself you'll need to run a command to build the JS
+    bundle first.
+    You can use '--input-dir' to specify a different input directory.`);
   });
 });
 
 describe(collectAssetsAsync, () => {
   it('builds an update info group', async () => {
     const fakeHash = 'md5-hash-of-jpg';
-    const bundles = {
-      android: 'android-bundle-code',
-      ios: 'ios-bundle-code',
-      web: 'web-bundle-code',
-    };
-    const inputDir = path.resolve(uuidv4());
+    const bundles = { android: 'android-bundle-code', ios: 'ios-bundle-code' };
+    const inputDir = uuidv4();
 
     const userDefinedAssets = [
       {
         fileExtension: '.jpg',
         contentType: 'image/jpeg',
-        path: `${inputDir}/assets/${fakeHash}`,
+        path: path.resolve(`${inputDir}/assets/${fakeHash}`),
       },
     ];
 
@@ -319,20 +285,16 @@ describe(collectAssetsAsync, () => {
             assets: [{ path: `assets/${fakeHash}`, ext: 'jpg' }],
             bundle: 'bundles/ios.js',
           },
-          web: {
-            assets: [{ path: `assets/${fakeHash}`, ext: 'jpg' }],
-            bundle: 'bundles/web.js',
-          },
         },
       })
     );
 
-    expect(await collectAssetsAsync(inputDir)).toEqual({
+    expect(await collectAssetsAsync({ inputDir, platforms: defaultPublishPlatforms })).toEqual({
       android: {
         launchAsset: {
           fileExtension: '.bundle',
           contentType: 'application/javascript',
-          path: `${inputDir}/bundles/android.js`,
+          path: path.resolve(`${inputDir}/bundles/android.js`),
         },
         assets: userDefinedAssets,
       },
@@ -340,15 +302,18 @@ describe(collectAssetsAsync, () => {
         launchAsset: {
           fileExtension: '.bundle',
           contentType: 'application/javascript',
-          path: `${inputDir}/bundles/ios.js`,
+          path: path.resolve(`${inputDir}/bundles/ios.js`),
         },
         assets: userDefinedAssets,
       },
-      web: {
+    });
+
+    expect(await collectAssetsAsync({ inputDir, platforms: ['ios'] })).toEqual({
+      ios: {
         launchAsset: {
           fileExtension: '.bundle',
           contentType: 'application/javascript',
-          path: `${inputDir}/bundles/web.js`,
+          path: path.resolve(`${inputDir}/bundles/ios.js`),
         },
         assets: userDefinedAssets,
       },

packages/eas-cli/src/project/projectUtils.ts

@@ -64,18 +64,19 @@ export function isExpoUpdatesInstalled(projectDir: string): boolean {
   return !!(packageJson.dependencies && 'expo-updates' in packageJson.dependencies);
 }
 
-export function isExpoUpdatesInstalledOrAvailable(
-  projectDir: string,
-  sdkVersion?: string
-): boolean {
+export function isExpoUpdatesInstalledOrAvailable(projectDir: string, exp: ExpoConfig): boolean {
   // before sdk 44, expo-updates was included in with the expo module
-  if (sdkVersion && semver.lt(sdkVersion, '44.0.0')) {
+  if (exp.sdkVersion && semver.lt(exp.sdkVersion, '44.0.0')) {
     return true;
   }
 
   return isExpoUpdatesInstalled(projectDir);
 }
 
+export function isEASUpdateConfigured(projectDir: string, exp: ExpoConfig): boolean {
+  return isExpoUpdatesInstalledOrAvailable(projectDir, exp) && exp.updates?.url !== undefined;
+}
+
 export async function validateAppVersionRuntimePolicySupportAsync(
   projectDir: string,
   exp: ExpoConfig

packages/eas-cli/src/project/publish.ts

@@ -12,19 +12,17 @@ import { AssetMetadataStatus, PartialManifestAsset } from '../graphql/generated'
 import { PublishMutation } from '../graphql/mutations/PublishMutation';
 import { PresignedPost } from '../graphql/mutations/UploadSessionMutation';
 import { PublishQuery } from '../graphql/queries/PublishQuery';
-import Log from '../log';
 import { uploadWithPresignedPostWithRetryAsync } from '../uploads';
 import { expoCommandAsync, shouldUseVersionedExpoCLI } from '../utils/expoCli';
 import chunk from '../utils/expodash/chunk';
 import uniqBy from '../utils/expodash/uniqBy';
 
-export type ExpoCLIExportPlatformFlag = Platform | 'all';
-
+export type PublishPlatform = Extract<'android' | 'ios', Platform>;
 type Metadata = {
   version: number;
   bundler: 'metro';
   fileMetadata: {
-    [key in Platform]: { assets: { path: string; ext: string }[]; bundle: string };
+    [key in 'android' | 'ios']: { assets: { path: string; ext: string }[]; bundle: string };
   };
 };
 export type RawAsset = {
@@ -33,7 +31,7 @@ export type RawAsset = {
   path: string;
 };
 type CollectedAssets = {
-  [platform in Platform]?: {
+  [platform in PublishPlatform]?: {
     launchAsset: RawAsset;
     assets: RawAsset[];
   };
@@ -49,7 +47,7 @@ type ManifestFragment = {
   extra?: ManifestExtra;
 };
 type UpdateInfoGroup = {
-  [key in Platform]: ManifestFragment;
+  [key in PublishPlatform]: ManifestFragment;
 };
 
 const fileMetadataJoi = Joi.object({
@@ -57,14 +55,13 @@ const fileMetadataJoi = Joi.object({
     .required()
     .items(Joi.object({ path: Joi.string().required(), ext: Joi.string().required() })),
   bundle: Joi.string().required(),
-}).optional();
+}).required();
 export const MetadataJoi = Joi.object({
   version: Joi.number().required(),
   bundler: Joi.string().required(),
   fileMetadata: Joi.object({
     android: fileMetadataJoi,
     ios: fileMetadataJoi,
-    web: fileMetadataJoi,
   }).required(),
 }).required();
 
@@ -132,7 +129,7 @@ export async function buildUnsortedUpdateInfoGroupAsync(
   assets: CollectedAssets,
   exp: ExpoConfig
 ): Promise<UpdateInfoGroup> {
-  let platform: Platform;
+  let platform: PublishPlatform;
   const updateInfoGroup: Partial<UpdateInfoGroup> = {};
   for (platform in assets) {
     updateInfoGroup[platform] = {
@@ -152,12 +149,10 @@ export async function buildBundlesAsync({
   projectDir,
   inputDir,
   exp,
-  platformFlag,
 }: {
   projectDir: string;
   inputDir: string;
   exp: Pick<ExpoConfig, 'sdkVersion'>;
-  platformFlag: ExpoCLIExportPlatformFlag;
 }): Promise<void> {
   const packageJSON = JsonFile.read(path.resolve(projectDir, 'package.json'));
   if (!packageJSON) {
@@ -165,14 +160,7 @@ export async function buildBundlesAsync({
   }
 
   if (shouldUseVersionedExpoCLI(projectDir, exp)) {
-    await expoCommandAsync(projectDir, [
-      'export',
-      '--output-dir',
-      inputDir,
-      '--dump-sourcemap',
-      '--platform',
-      platformFlag,
-    ]);
+    await expoCommandAsync(projectDir, ['export', '--output-dir', inputDir, '--dump-sourcemap']);
   } else {
     // Legacy global Expo CLI
     await expoCommandAsync(projectDir, [
@@ -182,23 +170,18 @@ export async function buildBundlesAsync({
       '--experimental-bundle',
       '--non-interactive',
       '--dump-sourcemap',
-      '--platform',
-      platformFlag,
     ]);
   }
 }
 
-export async function resolveInputDirectoryAsync(
-  inputDir: string,
-  { skipBundler }: { skipBundler?: boolean }
-): Promise<string> {
-  const distRoot = path.resolve(inputDir);
+export async function resolveInputDirectoryAsync(customInputDirectory: string): Promise<string> {
+  const distRoot = path.resolve(customInputDirectory);
   if (!(await fs.pathExists(distRoot))) {
-    let error = `--input-dir="${inputDir}" not found.`;
-    if (skipBundler) {
-      error += ` --skip-bundler requires the project to be exported manually before uploading. Ex: npx expo export && eas update --skip-bundler`;
-    }
-    throw new Error(error);
+    throw new Error(`The input directory "${customInputDirectory}" does not exist.
+    You can allow us to build it for you by not setting the --skip-bundler flag.
+    If you chose to build it yourself you'll need to run a command to build the JS
+    bundle first.
+    You can use '--input-dir' to specify a different input directory.`);
   }
   return distRoot;
 }
@@ -217,62 +200,43 @@ export function loadMetadata(distRoot: string): Metadata {
   if (metadata.bundler !== 'metro') {
     throw new Error('Only bundles created with Metro are currently supported');
   }
-  const platforms = Object.keys(metadata.fileMetadata);
-  if (platforms.length === 0) {
-    Log.warn('No updates were exported for any platform');
-  }
-  Log.debug(`Loaded ${platforms.length} platform(s): ${platforms.join(', ')}`);
   return metadata;
 }
 
-export function filterExportedPlatformsByFlag<T extends Partial<Record<Platform, any>>>(
-  record: T,
-  platformFlag: ExpoCLIExportPlatformFlag
-): T {
-  if (platformFlag === 'all') {
-    return record;
-  }
+export async function collectAssetsAsync({
+  inputDir,
+  platforms,
+}: {
+  inputDir: string;
+  platforms: PublishPlatform[];
+}): Promise<CollectedAssets> {
+  const distRoot = await resolveInputDirectoryAsync(inputDir);
+  const metadata = loadMetadata(distRoot);
 
-  const platform = platformFlag as Platform;
-
-  if (!record[platform]) {
-    throw new Error(
-      `--platform="${platform}" not found in metadata.json. Available platform(s): ${Object.keys(
-        record
-      ).join(', ')}`
-    );
-  }
-
-  return { [platform]: record[platform] } as T;
-}
-
-/** Given a directory, load the metadata.json and collect the assets for each platform. */
-export async function collectAssetsAsync(dir: string): Promise<CollectedAssets> {
-  const metadata = loadMetadata(dir);
-
-  const collectedAssets: CollectedAssets = {};
-
-  for (const platform of Object.keys(metadata.fileMetadata) as Platform[]) {
-    collectedAssets[platform] = {
+  const assetsFinal: CollectedAssets = {};
+  for (const platform of platforms) {
+    assetsFinal[platform] = {
       launchAsset: {
         fileExtension: '.bundle',
         contentType: 'application/javascript',
-        path: path.resolve(dir, metadata.fileMetadata[platform].bundle),
+        path: path.resolve(distRoot, metadata.fileMetadata[platform].bundle),
       },
-      assets: metadata.fileMetadata[platform].assets.map(asset => ({
-        fileExtension: asset.ext ? ensureLeadingPeriod(asset.ext) : undefined,
-        contentType: guessContentTypeFromExtension(asset.ext),
-        path: path.join(dir, asset.path),
-      })),
+      assets: metadata.fileMetadata[platform].assets.map(asset => {
+        let fileExtension;
+        if (asset.ext) {
+          // ensure the file extension has a '.' prefix
+          fileExtension = asset.ext.startsWith('.') ? asset.ext : `.${asset.ext}`;
+        }
+        return {
+          fileExtension,
+          contentType: guessContentTypeFromExtension(asset.ext),
+          path: path.join(distRoot, asset.path),
+        };
+      }),
     };
   }
 
-  return collectedAssets;
-}
-
-// ensure the file extension has a '.' prefix
-function ensureLeadingPeriod(extension: string): string {
-  return extension.startsWith('.') ? extension : `.${extension}`;
+  return assetsFinal;
 }
 
 export async function filterOutAssetsThatAlreadyExistAsync(

packages/eas-cli/src/submit/ArchiveSource.ts

@@ -5,13 +5,12 @@ import { URL } from 'url';
 import * as uuid from 'uuid';
 
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { BuildFragment } from '../graphql/generated';
+import { AppPlatform, BuildFragment } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log, { learnMore } from '../log';
 import { appPlatformDisplayNames } from '../platform';
 import { confirmAsync, promptAsync } from '../prompts';
-import { fromNow } from '../utils/date';
 import { getRecentBuildsForSubmissionAsync } from './utils/builds';
 import { isExistingFileAsync, uploadAppArchiveAsync } from './utils/files';
 
@@ -303,31 +302,44 @@ async function handleBuildListSourceAsync(
 }
 
 function formatBuildChoice(build: BuildFragment, expiryDate: Date): prompts.Choice {
-  const { id, updatedAt, runtimeVersion, buildProfile, gitCommitHash, gitCommitMessage, channel } =
-    build;
+  const {
+    id,
+    platform,
+    updatedAt,
+    appVersion,
+    sdkVersion,
+    runtimeVersion,
+    buildProfile,
+    appBuildVersion,
+    releaseChannel,
+    initiatingActor,
+  } = build;
 
   const formatValue = (field?: string | null): string =>
     field ? chalk.bold(field) : chalk.dim('Unknown');
 
   const buildDate = new Date(updatedAt);
+  const maybeRuntimeVersion = runtimeVersion ? `Runtime: ${formatValue(runtimeVersion)}` : null;
+  const maybeSdkVersion = sdkVersion ? `SDK: ${formatValue(sdkVersion)}` : null;
+  const appBuildVersionString = `${
+    platform === AppPlatform.Android ? 'Version code' : 'Build number'
+  }: ${formatValue(appBuildVersion)}`;
 
-  const formattedCommitData =
-    gitCommitHash && gitCommitMessage
-      ? `${chalk.dim(gitCommitHash.slice(0, 7))} "${chalk.bold(gitCommitMessage)}"`
-      : 'Unknown';
-
-  const title = `ID: ${chalk.dim(id)} (${chalk.dim(`${fromNow(buildDate)} ago`)})`;
-
-  const description = [
-    `\tProfile: ${formatValue(buildProfile)}`,
-    `\tChannel: ${formatValue(channel)}`,
-    `\tRuntime version: ${formatValue(runtimeVersion)}`,
-    `\tCommit: ${formattedCommitData}`,
+  const title = [
+    `ID: ${chalk.dim(id)}, Finished at: ${chalk.bold(buildDate.toLocaleString())}`,
+    [
+      `\tApp version: ${formatValue(appVersion)}, ${appBuildVersionString}`,
+      maybeRuntimeVersion,
+      maybeSdkVersion,
+    ]
+      .filter(it => it != null)
+      .join(', '),
+    `\tProfile: ${formatValue(buildProfile)}, Release channel: ${formatValue(releaseChannel)}`,
+    `\tAuthored by: ${formatValue(initiatingActor?.displayName)}`,
   ].join('\n');
 
   return {
     title,
-    description,
     value: build,
     disabled: buildDate < expiryDate,
   };

packages/eas-cli/src/submit/android/__tests__/AndroidSubmitCommand-test.ts

@@ -17,7 +17,7 @@ import {
   SubmissionAndroidTrack,
 } from '../../../graphql/generated';
 import { SubmissionMutation } from '../../../graphql/mutations/SubmissionMutation';
-import { createTestProject } from '../../../project/__tests__/project-utils';
+import { createTestProject } from '../../../project/__tests__/utils';
 import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
 import { createSubmissionContextAsync } from '../../context';
 import { getRecentBuildsForSubmissionAsync } from '../../utils/builds';

packages/eas-cli/src/submit/android/__tests__/ServiceAccountSource-test.ts

@@ -12,7 +12,7 @@ import {
   testProjectId,
 } from '../../../credentials/__tests__/fixtures-constants';
 import { SetUpGoogleServiceAccountKey } from '../../../credentials/android/actions/SetUpGoogleServiceAccountKey';
-import { createTestProject } from '../../../project/__tests__/project-utils';
+import { createTestProject } from '../../../project/__tests__/utils';
 import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
 import { promptAsync } from '../../../prompts';
 import { createSubmissionContextAsync } from '../../context';

packages/eas-cli/src/submit/ios/__tests__/AscApiKeySource-test.ts

@@ -12,7 +12,7 @@ import {
 } from '../../../credentials/__tests__/fixtures-constants';
 import { getCredentialsFromUserAsync } from '../../../credentials/utils/promptForCredentials';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
-import { createTestProject } from '../../../project/__tests__/project-utils';
+import { createTestProject } from '../../../project/__tests__/utils';
 import { promptAsync } from '../../../prompts';
 import { SubmissionContext, createSubmissionContextAsync } from '../../context';
 import {

packages/eas-cli/src/submit/ios/__tests__/CredentialsServiceSource-test.ts

@@ -12,7 +12,7 @@ import {
 import { testCommonIosAppCredentialsFragment } from '../../../credentials/__tests__/fixtures-ios';
 import { SetUpSubmissionCredentials } from '../../../credentials/ios/actions/SetUpSubmissionCredentials';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
-import { createTestProject } from '../../../project/__tests__/project-utils';
+import { createTestProject } from '../../../project/__tests__/utils';
 import { getBundleIdentifierAsync } from '../../../project/ios/bundleIdentifier';
 import { promptAsync } from '../../../prompts';
 import { createSubmissionContextAsync } from '../../context';

packages/eas-cli/src/submit/ios/__tests__/IosSubmitCommand-test.ts

@@ -10,7 +10,7 @@ import {
   testProjectId,
 } from '../../../credentials/__tests__/fixtures-constants';
 import { SubmissionMutation } from '../../../graphql/mutations/SubmissionMutation';
-import { createTestProject } from '../../../project/__tests__/project-utils';
+import { createTestProject } from '../../../project/__tests__/utils';
 import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
 import { createSubmissionContextAsync } from '../../context';
 import IosSubmitCommand from '../IosSubmitCommand';

packages/eas-cli/src/update/configure.ts

@@ -272,24 +272,15 @@ export async function ensureEASUpdatesIsConfiguredAsync(
     exp: ExpoConfig;
     projectId: string;
     projectDir: string;
-    platform: RequestedPlatform | null;
+    platform: RequestedPlatform;
   }
 ): Promise<void> {
-  const hasExpoUpdates = isExpoUpdatesInstalledOrAvailable(
-    projectDir,
-    expWithoutUpdates.sdkVersion
-  );
+  const hasExpoUpdates = isExpoUpdatesInstalledOrAvailable(projectDir, expWithoutUpdates);
   if (!hasExpoUpdates) {
     await installExpoUpdatesAsync(projectDir, { silent: !Log.isDebug });
     Log.withTick('Installed expo updates');
   }
 
-  // Bail out if using a platform that doesn't require runtime versions
-  // or native setup, i.e. web.
-  if (!platform) {
-    return;
-  }
-
   const workflows = await resolveWorkflowPerPlatformAsync(projectDir);
   const { projectChanged, exp: expWithUpdates } =
     await ensureEASUpdatesIsConfiguredInExpoConfigAsync({

packages/eas-json/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "2.7.0",
+  "version": "2.6.0",
   "author": "Expo <[email protected]>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {

packages/eas-json/schema/eas.schema.json

@@ -113,7 +113,7 @@
           "markdownDescription": "The channel is a name we can give to multiple builds to identify them easily. [Learn more](https://docs.expo.dev/eas-update/how-eas-update-works/)\n\n**This field only applies to the EAS Update service**, if your project still uses Classic Updates then use the [releaseChannel](https://docs.expo.dev/build-reference/eas-json/#releasechannel) field instead."
         },
         "distribution": {
-          "enum": ["internal", "store"],
+          "enum": ["store", "internal"],
           "description": "The method of distributing your app. Learn more: https://docs.expo.dev/build/internal-distribution/",
           "markdownDescription": "The method of distributing your app.\n\n- `internal` - with this option you'll be able to share your build URLs with anyone, and they will be able to install the builds to their devices straight from the Expo website. When using `internal`, make sure the build produces an APK or IPA file. Otherwise, the shareable URL will be useless. [Learn more](https://docs.expo.dev/build/internal-distribution/)\n- `store` - produces builds for store uploads, your build URLs won't be shareable.",
           "markdownEnumDescriptions": [