Merge pull request #642 from twilio/FLEXY-3666

FLEXY-3666 Update information for upgrade plugin command

Author: ktalebian

packages/plugin-flex/src/__tests__/commands/flex/plugins/upgrade-plugin.test.ts

@@ -320,6 +320,32 @@ describe('Commands/FlexPluginsStart', () => {
       expect(cmd.removeLegacyPlugin).toHaveBeenCalledTimes(1);
     });
 
+    it('should call upgrade notification', async () => {
+      const cmd = await createTest(FlexPluginsUpgradePlugin)('--yes');
+      mockForDoRun(cmd);
+      // @ts-ignore
+      const upgradeNotification = jest.spyOn(cmd.prints, 'upgradeNotification');
+      jest.spyOn(cmd, 'pkgVersion', 'get').mockReturnValue(4);
+
+      await cmd.doRun();
+
+      expect(upgradeNotification).toHaveBeenCalledTimes(1);
+      expect(upgradeNotification).toHaveBeenCalledWith(true, '4.0.0');
+    });
+
+    it('should call upgrade notification without yes flag', async () => {
+      const cmd = await createTest(FlexPluginsUpgradePlugin)();
+      mockForDoRun(cmd);
+      // @ts-ignore
+      const upgradeNotification = jest.spyOn(cmd.prints, 'upgradeNotification');
+      jest.spyOn(cmd, 'pkgVersion', 'get').mockReturnValue(4);
+
+      await cmd.doRun();
+
+      expect(upgradeNotification).toHaveBeenCalledTimes(1);
+      expect(upgradeNotification).toHaveBeenCalledWith(undefined, '4.0.0');
+    });
+
     it('should not call cleanupNodeModules if already latest version', async () => {
       const cmd = await createTest(FlexPluginsUpgradePlugin)();
       mockForDoRun(cmd);

packages/plugin-flex/src/commands/flex/plugins/upgrade-plugin.ts

@@ -124,7 +124,8 @@ export default class FlexPluginsUpgradePlugin extends FlexPlugin {
       return;
     }
 
-    await this.prints.upgradeNotification(this._flags.yes);
+    const pkgJson = await this.getLatestVersionOfDep(flexPluginScript, this._flags.beta);
+    await this.prints.upgradeNotification(this._flags.yes, pkgJson.version as string);
 
     const currentPkgVersion = this.pkgVersion;
     switch (currentPkgVersion) {
@@ -142,7 +143,6 @@ export default class FlexPluginsUpgradePlugin extends FlexPlugin {
         break;
     }
 
-    const pkgJson = await this.getLatestVersionOfDep(flexPluginScript, this._flags.beta);
     const latestVersion = pkgJson ? semver.coerce(pkgJson.version as string)?.major : 0;
     if (currentPkgVersion !== latestVersion) {
       await this.cleanupNodeModules();

packages/plugin-flex/src/prints/upgradePlugin.ts

@@ -8,8 +8,9 @@ const cracoUpgradeGuideLink = 'https://twilio.com';
  * Upgrade notification
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const upgradeNotification = (logger: Logger) => async (skip: boolean) => {
-  boxen.warning('You are about to upgrade your plugin to use the latest version of Flex Plugin CLI.');
+const upgradeNotification = (logger: Logger) => async (skip: boolean, version?: string) => {
+  const latestVersion = version ? `version ${version}` : 'the latest version';
+  boxen.warning(`You are about to upgrade your plugin to use ${latestVersion} of the Flex Plugin CLI.`);
   if (!skip) {
     const answer = await confirm('Please backup your plugin either locally or on GitHub. Do you want to continue?');
     if (!answer) {