@forge/cli-shared 6.6.1-next.2 → 6.6.1-next.20

package/out/ui/text.js

@@ -84,8 +84,8 @@ exports.Text = {
         },
         licenseModesOverrideErrors: {
             prodEnvNotSupported: '--license-modes and --users-with-access options are not supported in production environments',
-            empty: '--license-modes option list is empty. Provide a space-separated list of license mode. Supported value is user_access. \nFor example: install --license-modes user_access --users-with-access aaid1',
-            invalid: 'Invalid --license-modes option value. Supported value is user_access',
+            empty: '--license-modes option list is empty. Provide a space-separated list of license mode. Supported values are user_access and agent. \nFor example: install --license-modes user_access --users-with-access aaid1',
+            invalid: 'Invalid --license-modes option value. Supported values are user_access and agent',
             userWithAccessRequired: '--users-with-access option is required when specifying --license-modes option'
         },
         userWithAccessOverrideErrors: {
@@ -94,7 +94,8 @@ exports.Text = {
             countSize: (maxSizeOfUsersWithAccess) => `User limit exceeded. The --users-with-access option allows a maximum of ${maxSizeOfUsersWithAccess} users.`,
             licenseModeRequired: '--license-modes option is required when specifying --users-with-access option'
         },
-        multipleMatchingInstallations: 'Multiple matching installations found for the provided context when only one was expected'
+        multipleMatchingInstallations: 'Multiple matching installations found for the provided context when only one was expected',
+        partialInstallation: (failedProductInstallations) => `Failed to install the app for the following products: ${failedProductInstallations.join(', ')}.`
     },
     warning: {
         plaintextCredentialsFound: (url) => `Your credentials were stored in plaintext by a previous version of the Forge CLI. For additional security, revoke your existing API token by visting this URL ${buildTerminalLink(url)}.`,
@@ -112,6 +113,7 @@ exports.Text = {
     installationContext: {
         overviewProduct: 'Select the product your app uses.\n',
         promptProduct: 'Select a product:',
+        promptOptionalProducts: 'Select optional products:',
         overviewSite: '\nEnter your site. For example, your-domain.atlassian.net\n',
         overviewWorkspace: '\nEnter your workspace. For example, bitbucket.org/your-workspace\n',
         promptSite: 'Enter the site URL:',
@@ -691,16 +693,23 @@ What do you like or don't like about Forge? Share your feedback below or press C
     install: {
         cmd: {
             description: 'manage app installations',
-            start: (envKey, envType) => `Installing your app on to ${exports.Text.env.displayEnvironment(envKey, envType)}...`,
-            end: (displayTick) => `${displayTick ? greenTick + ' ' : ''}Install complete!`
+            start: (envKey, envType, product) => {
+                const productText = product ? `in ${product} ` : '';
+                return `Installing your app ${productText}on to ${exports.Text.env.displayEnvironment(envKey, envType)}...`;
+            },
+            end: (displayTick, product) => `${displayTick ? greenTick + ' ' : ''}Install in ${product} complete!`
         },
-        booleanToScope: (isLatest) => (isLatest ? `Latest` : `Out-of-date`),
+        booleanToScope: (isLatest) => (isLatest ? `(Latest)` : `(Out-of-date)`),
+        alreadyInstalledInRequiredProduct: (product) => `\nYou have already installed this app into your required product, ${chalk_1.default.bold(product)}.`,
+        installingToRequiredProduct: (product) => `\nYour app will be installed into your required product, ${chalk_1.default.bold(product)}. Once this is done, you can install your app into any optional products.\n`,
+        installingToOptionalProduct: (product) => `\nThis app will be installed as an optional product on ${product}.\n`,
+        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`,
         optionConfirmScopes: 'skip confirmation of scopes for the app before installing or upgrading the app',
         optionUpgrade: 'upgrade an existing installation',
         optionLicense: 'specify the license value for the app (allowed values: active, inactive, and trial)',
-        optionLicenseModes: '[This feature is under development] specify the list of license mode value for the app (allowed values: user-access)',
+        optionLicenseModes: '[This feature is under development] specify the list of license mode value for the app (allowed values: user-access, agent)',
         optionUsersWithAccess: '[This feature is under development] specify the list of Atlassian Account IDs(aaid) for users who have access to the app',
         listScopes: (scopes) => `Your app will be installed with the following scopes:\n${scopes
             .map(({ name, requiresInteractiveConsent }) => `- ${name}${requiresInteractiveConsent ? ' (requires user consent)' : ''}`)
@@ -735,6 +744,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
                 'in the developer console and share it with the site admin: ' +
                 `https://developer.atlassian.com/console/myapps/${appId}/distribution`
         },
+        failedAll: (site, environment) => `Your app in ${(0, environment_1.environmentToOption)(environment)} was not installed to any products on ${chalk_1.default.bold(site)}.`,
         security: {
             banner: (site) => `\n${chalk_1.default.gray('=== ')}Security questions\n
 Forge apps installed on ${site} must comply with our corporate security guidelines.

package/out/ui/ui.d.ts

@@ -4,10 +4,10 @@ export interface Prompt {
     confirm(message: string): Promise<boolean>;
     promptForText(message: string, defaultValue?: string): Promise<string>;
     promptForSecret(message: string): Promise<string>;
-    promptForList(message: string, choices: string[], config?: {
-        format?: (choices: string) => string;
-    }): Promise<string>;
-    promptForTable(message: string, infoMessage: string, columns: string[], choices: object[]): Promise<number[]>;
+    promptForList<T extends string>(message: string, choices: T[], config?: {
+        format?: (choice: T) => string;
+    }): Promise<T>;
+    promptForTable(message: string, infoMessage: string, columns: string[], choices: object[], isBorderless?: boolean): Promise<number[]>;
     promptForSingleChoiceTable(message: string, infoMessage: string, columns: string[], choices: object[]): Promise<number>;
 }
 export declare type TableCell = string | boolean | null | undefined;
@@ -27,6 +27,7 @@ export interface UI extends Logger, Prompt {
     emptyLine(): void;
     displayProgress<Result>(progress: () => Promise<Result>, startText: string, successText: string | ((result: Result) => string | ProgressResult)): Promise<Result>;
     displayTemporaryMessage<Result>(progress: () => Promise<Result>, waitText: string): Promise<Result>;
+    clearSpinner(): void;
     table<Key extends string>(head: [Key, string][], data: Record<Key, TableCell>[] | undefined | null, options?: TableOptions<Key>): void;
 }
 //# sourceMappingURL=ui.d.ts.map

package/out/ui/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../src/ui/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,MAAM;IACrB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtH,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9G,0BAA0B,CACxB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,oBAAY,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAE5D,oBAAY,YAAY,CAAC,GAAG,SAAS,MAAM,IAAI;IAC7C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE;SAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM;KAAE,CAAC;IACvD,SAAS,CAAC,EAAE;SAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,OAAO;KAAE,CAAC;CACtC,CAAC;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,EAAE,MAAM;IACxC,SAAS,IAAI,IAAI,CAAC;IAElB,eAAe,CAAC,MAAM,EACpB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,cAAc,CAAC,GAClE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpG,KAAK,CAAC,GAAG,SAAS,MAAM,EACtB,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EACrB,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,IAAI,EACjD,OAAO,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,GAC1B,IAAI,CAAC;CACT"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../src/ui/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,MAAM;IACrB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,aAAa,CAAC,CAAC,SAAS,MAAM,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,CAAC,EAAE,EACZ,MAAM,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,MAAM,CAAA;KAAE,GAC1C,OAAO,CAAC,CAAC,CAAC,CAAC;IACd,cAAc,CACZ,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrB,0BAA0B,CACxB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,oBAAY,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAE5D,oBAAY,YAAY,CAAC,GAAG,SAAS,MAAM,IAAI;IAC7C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE;SAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM;KAAE,CAAC;IACvD,SAAS,CAAC,EAAE;SAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,OAAO;KAAE,CAAC;CACtC,CAAC;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,EAAE,MAAM;IACxC,SAAS,IAAI,IAAI,CAAC;IAElB,eAAe,CAAC,MAAM,EACpB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,cAAc,CAAC,GAClE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpG,YAAY,IAAI,IAAI,CAAC;IAErB,KAAK,CAAC,GAAG,SAAS,MAAM,EACtB,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EACrB,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,IAAI,EACjD,OAAO,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,GAC1B,IAAI,CAAC;CACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "6.6.1-next.2",
+  "version": "6.6.1-next.20",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -12,8 +12,8 @@
     "generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
   },
   "dependencies": {
-    "@forge/manifest": "8.7.0-next.1",
-    "@forge/util": "1.4.7",
+    "@forge/manifest": "8.7.0-next.9",
+    "@forge/util": "1.4.8-next.0",
     "@forge/i18n": "0.0.3",
     "@sentry/node": "7.106.0",
     "adm-zip": "^0.5.10",
@@ -23,7 +23,7 @@
     "cheerio": "^0.22.0",
     "cli-table3": "^0.6.3",
     "conf": "^10.2.0",
-    "cross-spawn": "^7.0.3",
+    "cross-spawn": "^7.0.5",
     "env-paths": "^2.2.1",
     "figures": "^3.2.0",
     "fp-ts": "^2.16.2",
@@ -68,4 +68,4 @@
     "jest-matcher-specific-error": "^1.0.0",
     "jest-fetch-mock": "^3.0.3"
   }
-}
+}