@forge/cli-shared 6.11.0-next.9 → 6.11.0

package/out/ui/text.js

@@ -502,6 +502,8 @@ What do you like or don't like about Forge? Share your feedback below or press C
             option: {
                 version1: '1st version to compare',
                 version2: '2nd version to compare',
+                environment1: '1st environment to compare',
+                environment2: '2nd environment to compare',
                 outFile: 'specify a file to output the results'
             },
             desc: `returns the details of two versions of the app for comparison. Details include:\n${itemList([
@@ -519,9 +521,13 @@ What do you like or don't like about Forge? Share your feedback below or press C
             start: 'Comparing app versions...',
             end: 'Comparing app versions...',
             details: {
-                banner: (envKey, envType, version1, version2) => {
-                    const envDisplay = exports.Text.env.displayEnvironment(envKey, envType);
-                    return `${log_symbols_1.default.info} Comparison between app versions [${chalk_1.default.bold(version1)} and ${chalk_1.default.bold(version2)}] in [${envDisplay}] is shown below:`;
+                banner: (input) => {
+                    const env1Display = exports.Text.env.displayEnvironment(input.env1Key, input.env1Type);
+                    const env2Display = input.env2Key && input.env2Type ? exports.Text.env.displayEnvironment(input.env2Key, input.env2Type) : '';
+                    if (env2Display) {
+                        return `${log_symbols_1.default.info} Comparison between app versions [${chalk_1.default.bold(input.version1)} in ${env1Display}] and [${chalk_1.default.bold(input.version2)} in ${env2Display}] is shown below:`;
+                    }
+                    return `${log_symbols_1.default.info} Comparison between app versions [${chalk_1.default.bold(input.version1)} and ${chalk_1.default.bold(input.version2)}] in [${env1Display}] is shown below:`;
                 }
             }
         },
@@ -704,17 +710,17 @@ What do you like or don't like about Forge? Share your feedback below or press C
     },
     build: {
         cmd: {
-            desc: 'build your app',
+            desc: '[Preview] build your app',
             startNotice: `Building your app. \n${ctrlC}\n`,
             start: 'Building your app...',
-            success: (buildTag) => `Build successful with build tag: ${buildTag}`
+            success: (buildTag) => `[Preview] Build successful with build tag: ${buildTag}`
         },
         buildTag: {
-            description: 'specify a custom build tag for build',
+            description: '[Preview] specify a custom build tag for build',
             error: {
                 invalidBuildTag: (maxLength) => `Invalid build tag; tag must be ${maxLength} characters or less.`,
                 emptyBuildTag: 'Invalid build tag; tag cannot be empty.',
-                invalidBuildTagFormat: 'Invalid build tag; tag can only contain only letters, numbers, dashes, and underscores.'
+                invalidBuildTagFormat: 'Invalid build tag; tags are case-insensitive and must start with a letter or number and can only contain alphanumeric characters, underscores, hyphens, and periods.'
             }
         },
         taskLint: {
@@ -726,18 +732,11 @@ What do you like or don't like about Forge? Share your feedback below or press C
         },
         list: {
             cmd: {
-                desc: 'list all build information'
+                desc: '[Preview] list builds for your app'
             },
-            limit: 'Specify a limit of builds to show',
-            listingBuilds: 'Showing all the current builds for your app:',
+            limit: (defaultLimit) => `Specify the number of builds to show (default is ${defaultLimit})`,
+            listingBuilds: '[Preview] Showing builds for your app:',
             noBuildsFound: 'No builds found.',
-            expires: (hours) => {
-                if (hours <= 24)
-                    return chalk_1.default.red('in 24 hours');
-                if (hours <= 48)
-                    return chalk_1.default.yellow('in 48 hours');
-                return `in ${Math.floor(hours / 24)} days`;
-            },
             error: {
                 invalidLimit: 'Invalid limit; limit can only contain positive integers.'
             }
@@ -749,10 +748,19 @@ What do you like or don't like about Forge? Share your feedback below or press C
     deploy: {
         cmd: {
             desc: 'deploy your app to an environment',
-            start1: (envKey, envType) => `Deploying your app to the ${exports.Text.env.displayEnvironment(envKey, envType)} environment.\n${ctrlC}\n`,
-            start2: (appName, envKey, envType) => `Deploying ${appName} to ${exports.Text.env.displayEnvironment(envKey, envType)}...`,
+            start1: (envKey, envType, buildTag) => {
+                const buildTagText = buildTag ? ` using build with tag ${buildTag}` : '';
+                return `Deploying your app${buildTagText} to the ${exports.Text.env.displayEnvironment(envKey, envType)} environment.\n${ctrlC}\n`;
+            },
+            start2: (appName, envKey, envType, buildTag) => {
+                const buildTagText = buildTag ? ` using build with tag ${buildTag}` : '';
+                return `Deploying ${appName}${buildTagText} to ${exports.Text.env.displayEnvironment(envKey, envType)}...`;
+            },
             success: 'Deployed\n',
-            successDetails: (appName, envKey, envType) => `Deployed ${appName} to the ${exports.Text.env.displayEnvironment(envKey, envType)} environment.`,
+            successDetails: (appName, envKey, envType, buildTag) => {
+                const buildTagText = buildTag ? ` using build with tag ${buildTag}` : '';
+                return `Deployed ${appName}${buildTagText} to the ${exports.Text.env.displayEnvironment(envKey, envType)} environment.`;
+            },
             distributePageLink: (appId) => `To install on a site that you're an admin of, run ${forge('install')}.\n` +
                 'To install on any other site, generate an installation link in the developer console and share it with the site admin: ' +
                 `https://developer.atlassian.com/console/myapps/${appId}/manage/distribution`
@@ -767,6 +775,9 @@ What do you like or don't like about Forge? Share your feedback below or press C
         hasNoAppInstallationsForEnv: {
             hasNoAppInstallationsForEnvError: log_color_1.LogColor.error(`Error: The deployment failed due to errors while trying to determine if the app has any installations for the deployed environment.`)
         },
+        environmentKey: {
+            missingEnvironmentKeyError: log_color_1.LogColor.error('Environment must be specified when deploying your app.')
+        },
         majorVersion: {
             description: 'specify a major version to update (Preview)',
             warning: (majorVersion) => `${chalk_1.default.bold('Warning:')} You\'re about to deploy changes to major version ${majorVersion} of your app. All sites using version ${majorVersion} will automatically apply these changes.\n`,
@@ -774,7 +785,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
             invalidMajorVersionError: 'Invalid major version number'
         },
         buildTag: {
-            description: 'specify a build tag to deploy (from forge build)'
+            description: '[Preview] specify a build tag to deploy (from forge build)'
         },
         connectKeyChange: {
             continueChange: `Do you wish to continue with changing the Connect key?`,
@@ -843,7 +854,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
         installConfirmation: (product, site) => `Installing your app onto ${product} on ${site}.\n${ctrlC}\n`,
         bannerSite: `\nInstalling your app onto an Atlassian site.\n${ctrlC}\n`,
         bannerWorkspace: `\nInstalling your app onto the selected workspace.\n${ctrlC}\n`,
-        devAppInstallWarning: `${chalk_1.default.bold('WARNING:')} You are about to deploy a development app to a production site. If you do not intend to test your app, we strongly recommend that you deploy your app to production and install the production version instead.`,
+        devAppInstallWarning: `${chalk_1.default.bold('WARNING:')} You are about to install a development app to a production site. If you do not intend to test your app, we strongly recommend that you deploy your app to production and install the production version instead.`,
         devAppInstallConfirm: `Are you sure you want to proceed?`,
         optionConfirmScopes: 'skip confirmation of scopes for the app before installing or upgrading the app',
         optionUpgrade: 'upgrade an existing installation',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "6.11.0-next.9",
+  "version": "6.11.0",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -12,9 +12,9 @@
     "generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
   },
   "dependencies": {
-    "@forge/manifest": "9.3.0-next.5",
-    "@forge/util": "1.4.8",
-    "@forge/i18n": "0.0.5",
+    "@forge/manifest": "9.3.0",
+    "@forge/util": "1.4.9",
+    "@forge/i18n": "0.0.6",
     "@sentry/node": "7.106.0",
     "adm-zip": "^0.5.10",
     "array.prototype.flatmap": "^1.3.2",