refactor(update): remove republish from update command (#1535)

* fix(update): add code signing support to republish and block different branches * refactor(update): move codesigning info into update fragment * update CHANGELOG.md * fix(update): add code signing support to republish and block different branches * refactor(update): mark group and republish flags as deprecated * refactor(update): drop republish and group flags * refactor(update): drop republish flag from command * refactor(update): remove last republish code from update command * refactor(update): either use --group or --branch in deprecation warning * refactor(update): drop old runtime version from update command * refactor(update): move asset variables closer to populated area * fix(update): fix republish typo in deprecation warning * fix(update): correct a merge conflict error related to publish query changes
expo · Dec 5, 2022 · 4e11707 · 4e11707
1 parent 33f4ae7
commit 4e11707
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 167 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+- Remove old republish code from the update command. ([#1535](https://github.com/expo/eas-cli/pull/1535) by [@byCedric](https://github.com/byCedric))
+
 ## [2.9.0](https://github.com/expo/eas-cli/releases/tag/v2.9.0) - 2022-12-05
 
 ### 🎉 New features
@@ -325,7 +327,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
 - Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
-- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
+- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
 
 ## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
 

diff --git a/packages/eas-cli/src/commands/update/index.ts b/packages/eas-cli/src/commands/update/index.ts
@@ -17,12 +17,10 @@ import fetch from '../../fetch';
 import {
   PublishUpdateGroupInput,
   StatuspageServiceName,
-  Update,
   UpdateInfoGroup,
   UpdatePublishMutation,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log, { learnMore, link } from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform, requestedPlatformDisplayNames } from '../../platform';
@@ -40,7 +38,6 @@ import {
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { ensureEASUpdatesIsConfiguredAsync } from '../../update/configure';
-import { selectUpdateGroupOnBranchAsync } from '../../update/queries';
 import { formatUpdateMessage, truncateString as truncateUpdateMessage } from '../../update/utils';
 import {
   checkManifestBodyAgainstUpdateInfoGroup,
@@ -60,23 +57,23 @@ type RawUpdateFlags = {
   auto: boolean;
   branch?: string;
   message?: string;
-  group?: string;
-  republish?: boolean;
   platform: string;
   'input-dir': string;
   'skip-bundler': boolean;
   'private-key-path'?: string;
   'non-interactive': boolean;
   json: boolean;
+  /** @deprecated see UpdateRepublish command */
+  group?: string;
+  /** @deprecated see UpdateRepublish command */
+  republish?: boolean;
 };
 
 type UpdateFlags = {
   auto: boolean;
   platform: ExpoCLIExportPlatformFlag;
   branchName?: string;
   updateMessage?: string;
-  republish: boolean;
-  groupId?: string;
   inputDir: string;
   skipBundler: boolean;
   privateKeyPath?: string;
@@ -112,11 +109,11 @@ export default class UpdatePublish extends EasCommand {
       required: false,
     }),
     republish: Flags.boolean({
-      description: 'Republish an update group',
+      description: 'Republish an update group (deprecated, see republish command)',
       exclusive: ['input-dir', 'skip-bundler'],
     }),
     group: Flags.string({
-      description: 'Update group to republish',
+      description: 'Update group to republish (deprecated, see republish command)',
       exclusive: ['input-dir', 'skip-bundler'],
     }),
     'input-dir': Flags.string({
@@ -163,8 +160,6 @@ export default class UpdatePublish extends EasCommand {
       platform: platformFlag,
       branchName,
       updateMessage,
-      republish,
-      groupId,
       inputDir,
       skipBundler,
       privateKeyPath,
@@ -218,9 +213,7 @@ export default class UpdatePublish extends EasCommand {
         try {
           const branch = await selectBranchOnAppAsync(graphqlClient, {
             projectId,
-            promptTitle: `Which branch would you like to ${
-              republish ? 'republish' : 'publish'
-            } on?`,
+            promptTitle: `Which branch would you like to publish on?`,
             displayTextForListItem: updateBranch =>
               `${updateBranch.name} ${chalk.grey(
                 `- current update: ${formatUpdateMessage(updateBranch.updates[0])}`
@@ -243,156 +236,72 @@ export default class UpdatePublish extends EasCommand {
       }
     }
 
-    let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
-    let oldMessage: string, oldRuntimeVersion: string;
-    let uploadedAssetCount = 0;
-    let assetLimitPerUpdateGroup = 0;
-
-    if (republish) {
-      // If we are republishing, we don't need to worry about building the bundle or uploading the assets.
-      // Instead we get the `updateInfoGroup` from the update we wish to republish.
-      let updatesToRepublish: Pick<
-        Update,
-        'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
-      >[];
-      if (groupId) {
-        const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, {
-          groupId,
-        });
-        updatesToRepublish = updatesByGroup;
-      } else {
-        if (nonInteractive) {
-          throw new Error('Must supply --group when in non-interactive mode');
-        }
-
-        updatesToRepublish = await selectUpdateGroupOnBranchAsync(graphqlClient, {
-          projectId,
-          branchName,
-          paginatedQueryOptions,
-        });
-      }
-      const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
-        // Only republish to the specified platforms
-        update => platformFlag === 'all' || update.platform === platformFlag
-      );
-      if (updatesToRepublishFilteredByPlatform.length === 0) {
-        throw new Error(
-          `There are no updates on branch "${branchName}" published for the platform(s) "${platformFlag}" with group ID "${
-            groupId ? groupId : updatesToRepublish[0].group
-          }". Did you mean to publish a new update instead?`
-        );
-      }
+    if (!updateMessage && autoFlag) {
+      updateMessage = (await getVcsClient().getLastCommitMessageAsync())?.trim();
+    }
 
-      let publicationPlatformMessage: string;
-      if (platformFlag === 'all') {
-        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
-          .map(update => update.platform)
-          .join(', ')}`;
-      } else {
-        publicationPlatformMessage = `The republished update will appear only on: ${platformFlag}`;
+    if (!updateMessage) {
+      if (nonInteractive) {
+        throw new Error('Must supply --message or use --auto when in non-interactive mode');
       }
-      Log.withTick(publicationPlatformMessage);
 
-      for (const update of updatesToRepublishFilteredByPlatform) {
-        const { manifestFragment } = update;
-        const platform = update.platform as PublishPlatform;
-
-        unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
+      const validationMessage = 'publish message may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
       }
-      realizedPlatforms = updatesToRepublishFilteredByPlatform.map(
-        update => update.platform as PublishPlatform
-      );
-
-      // These are the same for each member of an update group
-      groupId = updatesToRepublishFilteredByPlatform[0].group;
-      oldMessage = updatesToRepublishFilteredByPlatform[0].message ?? '';
-      oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
-
-      if (!updateMessage) {
-        if (nonInteractive) {
-          throw new Error('Must supply --message when in non-interactive mode');
-        }
+      ({ updateMessage } = await promptAsync({
+        type: 'text',
+        name: 'updateMessage',
+        message: `Provide an update message.`,
+        initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
+        validate: (value: any) => (value ? true : validationMessage),
+      }));
+    }
 
-        const validationMessage = 'publish message may not be empty.';
-        if (jsonFlag) {
-          throw new Error(validationMessage);
-        }
-        ({ updateMessage } = await promptAsync({
-          type: 'text',
-          name: 'updateMessage',
-          message: `Provide an update message.`,
-          initial: `Republish "${oldMessage!}" - group: ${groupId}`,
-          validate: (value: any) => (value ? true : validationMessage),
-        }));
-      }
-    } else {
-      if (!updateMessage && autoFlag) {
-        updateMessage = (await getVcsClient().getLastCommitMessageAsync())?.trim();
+    // build bundle and upload assets for a new publish
+    if (!skipBundler) {
+      const bundleSpinner = ora().start('Exporting...');
+      try {
+        await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag });
+        bundleSpinner.succeed('Exported bundle(s)');
+      } catch (e) {
+        bundleSpinner.fail('Export failed');
+        throw e;
       }
+    }
 
-      if (!updateMessage) {
-        if (nonInteractive) {
-          throw new Error('Must supply --message or use --auto when in non-interactive mode');
-        }
+    // After possibly bundling, assert that the input directory can be found.
+    const distRoot = await resolveInputDirectoryAsync(inputDir, { skipBundler });
 
-        const validationMessage = 'publish message may not be empty.';
-        if (jsonFlag) {
-          throw new Error(validationMessage);
-        }
-        ({ updateMessage } = await promptAsync({
-          type: 'text',
-          name: 'updateMessage',
-          message: `Provide an update message.`,
-          initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
-          validate: (value: any) => (value ? true : validationMessage),
-        }));
-      }
+    const assetSpinner = ora().start('Uploading...');
+    let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
+    let uploadedAssetCount = 0;
+    let assetLimitPerUpdateGroup = 0;
 
-      // build bundle and upload assets for a new publish
-      if (!skipBundler) {
-        const bundleSpinner = ora().start('Exporting...');
-        try {
-          await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag });
-          bundleSpinner.succeed('Exported bundle(s)');
-        } catch (e) {
-          bundleSpinner.fail('Export failed');
-          throw e;
+    try {
+      const collectedAssets = await collectAssetsAsync(distRoot);
+      const assets = filterExportedPlatformsByFlag(collectedAssets, platformFlag);
+      realizedPlatforms = Object.keys(assets) as PublishPlatform[];
+
+      const uploadResults = await uploadAssetsAsync(
+        graphqlClient,
+        assets,
+        projectId,
+        (totalAssets, missingAssets) => {
+          assetSpinner.text = `Uploading (${totalAssets - missingAssets}/${totalAssets})`;
         }
-      }
-
-      // After possibly bundling, assert that the input directory can be found.
-      const distRoot = await resolveInputDirectoryAsync(inputDir, { skipBundler });
-
-      const assetSpinner = ora().start('Uploading...');
-
-      try {
-        const collectedAssets = await collectAssetsAsync(distRoot);
-        const assets = filterExportedPlatformsByFlag(collectedAssets, platformFlag);
-        realizedPlatforms = Object.keys(assets) as PublishPlatform[];
-
-        const uploadResults = await uploadAssetsAsync(
-          graphqlClient,
-          assets,
-          projectId,
-          (totalAssets, missingAssets) => {
-            assetSpinner.text = `Uploading (${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`;
-        assetSpinner.succeed(uploadAssetSuccessMessage);
-      } catch (e) {
-        assetSpinner.fail('Failed to upload');
-        throw e;
-      }
+      uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
+      assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
+      unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
+      const uploadAssetSuccessMessage = uploadedAssetCount
+        ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'platform' : 'platforms'}`
+        : `Uploaded: No changes detected`;
+      assetSpinner.succeed(uploadAssetSuccessMessage);
+    } catch (e) {
+      assetSpinner.fail('Failed to upload');
+      throw e;
     }
 
     const truncatedMessage = truncateUpdateMessage(updateMessage!, 1024);
@@ -441,15 +350,10 @@ export default class UpdatePublish extends EasCommand {
           ])
         );
 
-        if (republish && !oldRuntimeVersion) {
-          throw new Error(
-            'Cannot find the runtime version of the update group that is being republished.'
-          );
-        }
         return {
           branchId,
           updateInfoGroup: localUpdateInfoGroup,
-          runtimeVersion: republish ? oldRuntimeVersion : runtimeVersion,
+          runtimeVersion,
           message: truncatedMessage,
           gitCommitHash,
           isGitWorkingTreeDirty,
@@ -593,18 +497,27 @@ export default class UpdatePublish extends EasCommand {
       );
     }
 
-    const groupId = flags.group;
-    const republish = flags.republish || !!groupId; // When --group is defined, we are republishing
-    if (nonInteractive && republish && !groupId) {
-      Errors.error(`--group is required when updating in non-interactive mode`, { exit: 1 });
+    if (flags.group || flags.republish) {
+      // Pick the first flag set that is defined, in this specific order
+      const args = [
+        ['--group', flags.group],
+        ['--branch', flags.branch],
+      ].filter(([_, value]) => value)[0];
+
+      Log.newLine();
+      Log.warn(
+        'The --group and --republish flags are deprecated, use the republish command instead:'
+      );
+      Log.warn(`  ${chalk.bold([`eas update:republish`, ...(args ?? [])].join(' '))}`);
+      Log.newLine();
+
+      Errors.error('--group and --republish flags are deprecated', { exit: 1 });
     }
 
     return {
       auto,
       branchName,
       updateMessage,
-      groupId,
-      republish,
       inputDir: flags['input-dir'],
       skipBundler: flags['skip-bundler'],
       platform: flags.platform as RequestedPlatform,

diff --git a/packages/eas-cli/src/commands/update/republish.ts b/packages/eas-cli/src/commands/update/republish.ts
@@ -288,10 +288,10 @@ async function askUpdatesFromBranchNameAsync(
   });
 
   return updateGroups.map(group => ({
+    ...group,
     groupId: group.id,
     branchId: group.branch.id,
     branchName: group.branch.name,
-    ...group,
   }));
 }