npm package diff
Package: @forge/cli
Versions: 11.3.0-next.14-experimental-f55f6f2 - 11.3.0-next.16-experimental-8477be1
Modified: package/out/command-line/register-installation-commands.js
Index: package/out/command-line/register-installation-commands.js
===================================================================
--- package/out/command-line/register-installation-commands.js
+++ package/out/command-line/register-installation-commands.js
@@ -90,9 +90,15 @@
else {
const filteredInstallations = installations.filter((install) => install.product !== 'identity' && install.product !== 'jira-servicedesk');
const options = (0, uninstall_command_helpers_1.getMultiChoiceOptionsForUninstall)(filteredInstallations);
const selectedSitesIndexes = await ui.promptForTable(cli_shared_1.Text.uninstall.interactive.desc, cli_shared_1.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Context'], options);
- const [firstUninstall, secondUninstall] = (0, uninstall_command_helpers_1.getInstallationsFromSelection)(options, selectedSitesIndexes, filteredInstallations);
+ const [firstUninstall, secondUninstall, hadAutoSelected] = (0, uninstall_command_helpers_1.getInstallationsFromSelection)(options, selectedSitesIndexes, filteredInstallations);
+ if (hadAutoSelected) {
+ const confirmation = await ui.confirm(cli_shared_1.Text.uninstall.interactive.confirmOptionalContexts(environment, (0, cli_shared_1.guessEnvironmentType)(environment)));
+ if (!confirmation) {
+ return;
+ }
+ }
const selectedSites = new Set(firstUninstall.map(({ site }) => site).concat(secondUninstall.map(({ site }) => site)));
const remainingApps = options
.filter((_, index) => !selectedSitesIndexes.includes(index))
.map(({ extra }) => filteredInstallations[extra.installationIdx]);Modified: package/out/command-line/uninstall-command-helpers.js
Index: package/out/command-line/uninstall-command-helpers.js
===================================================================
--- package/out/command-line/uninstall-command-helpers.js
+++ package/out/command-line/uninstall-command-helpers.js
@@ -18,8 +18,9 @@
value: id,
extra: {
installationIdx: idx,
product: product,
+ autoSelectId: !!secondaryProducts?.length ? id : undefined,
required: !!secondaryProducts?.length
}
});
if (secondaryProducts) {
@@ -47,9 +48,24 @@
const secondUninstall = options
.filter((_, idx) => selectedSitesIndexes.includes(idx))
.filter(({ extra }) => extra?.required)
.map(({ extra }) => filteredInstallations[extra.installationIdx]);
- return [firstUninstall, secondUninstall];
+ const installationIds = new Set([...firstUninstall, ...secondUninstall].map(({ id }) => id));
+ const groups = options.reduce((acc, option, idx) => {
+ if (!installationIds.has(option.value)) {
+ return acc;
+ }
+ const group = acc.get(option.value) || new Set();
+ group.add(idx);
+ acc.set(option.value, group);
+ return acc;
+ }, new Map());
+ const selectedSitesIndexSet = new Set(selectedSitesIndexes);
+ const wholeGroupSelected = Array.from(installationIds).some((id) => {
+ const group = groups.get(id);
+ return group && group.size > 1 && Array.from(group).every((idx) => selectedSitesIndexSet.has(idx));
+ });
+ return [firstUninstall, secondUninstall, wholeGroupSelected];
};
exports.getInstallationsFromSelection = getInstallationsFromSelection;
const performSingleUninstall = async (installId, installationContext, { ui, commands: { uninstallAppCommand } }) => {
const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId, installationContext), cli_shared_1.Text.uninstall.cmd.start, (result) => ({Modified: package/npm-shrinkwrap.json
Large diffs are not rendered by default.
Modified: package/package.json
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/cli",
- "version": "11.3.0-next.14-experimental-f55f6f2",
+ "version": "11.3.0-next.16-experimental-8477be1",
"description": "A command line interface for managing Atlassian-hosted apps",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"bin": {
@@ -17,18 +17,18 @@
"postbuild": "chmod +x out/bin/*.js && ts-node scripts/configureAutocomplete.ts",
"postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
},
"dependencies": {
- "@forge/bundler": "4.21.1-next.14-experimental-f55f6f2",
- "@forge/cli-shared": "6.8.0-next.13-experimental-f55f6f2",
+ "@forge/bundler": "4.22.0-next.16-experimental-8477be1",
+ "@forge/cli-shared": "6.8.0-next.15-experimental-8477be1",
"@forge/egress": "1.4.0",
- "@forge/lint": "5.7.3-next.14-experimental-f55f6f2",
- "@forge/manifest": "8.9.0-next.7-experimental-f55f6f2",
+ "@forge/lint": "5.7.3-next.16-experimental-8477be1",
+ "@forge/manifest": "8.9.0-next.8-experimental-8477be1",
"@forge/runtime": "5.10.7",
- "@forge/tunnel": "5.10.1-next.14-experimental-f55f6f2",
+ "@forge/tunnel": "5.10.1-next.16-experimental-8477be1",
"@forge/util": "1.4.8",
"@sentry/node": "7.106.0",
- "@forge/i18n": "0.0.5-next.0-experimental-f55f6f2",
+ "@forge/i18n": "0.0.5-next.0-experimental-8477be1",
"ajv": "^8.12.0",
"archiver": "^6.0.2",
"case": "^1.6.3",
"chalk": "^4.1.2",Modified: package/out/bin/cli.d.ts.map
Index: package/out/bin/cli.d.ts.map
===================================================================
--- package/out/bin/cli.d.ts.map
+++ package/out/bin/cli.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/bin/cli.ts"],"names":[],"mappings":";AAUA,OAAO,iBAAiB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/bin/cli.ts"],"names":[],"mappings":";AAWA,OAAO,iBAAiB,CAAC"}
\ No newline at end of fileModified: package/out/command-line/register-installation-commands.d.ts.map
Index: package/out/command-line/register-installation-commands.d.ts.map
===================================================================
--- package/out/command-line/register-installation-commands.d.ts.map
+++ package/out/command-line/register-installation-commands.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqDtD,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAiC7G,CAAC;AA2EF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
\ No newline at end of file
+{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqDtD,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAiC7G,CAAC;AAoFF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
\ No newline at end of fileModified: package/out/command-line/uninstall-command-helpers.d.ts.map
Index: package/out/command-line/uninstall-command-helpers.d.ts.map
===================================================================
--- package/out/command-line/uninstall-command-helpers.d.ts.map
+++ package/out/command-line/uninstall-command-helpers.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"uninstall-command-helpers.d.ts","sourceRoot":"","sources":["../../src/command-line/uninstall-command-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAClH;AAMD,eAAO,MAAM,iCAAiC,0BAA2B,YAAY,EAAE,KAAG,MAAM,EA8B/F,CAAC;AAEF,eAAO,MAAM,6BAA6B,YAC/B,MAAM,EAAE,wBACK,MAAM,EAAE,yBACP,YAAY,EAAE,KACpC,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,CAiBjC,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,MAAM,uBACI,MAAM,6CACgB,YAAY,kBAuBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,yBACd,YAAY,EAAE,yBACb,YAAY,EAAE,6CACM,YAAY,kBAsDxD,CAAC"}
\ No newline at end of file
+{"version":3,"file":"uninstall-command-helpers.d.ts","sourceRoot":"","sources":["../../src/command-line/uninstall-command-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QACL,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAMD,eAAO,MAAM,iCAAiC,0BAA2B,YAAY,EAAE,KAAG,MAAM,EA+B/F,CAAC;AAWF,eAAO,MAAM,6BAA6B,YAC/B,MAAM,EAAE,wBACK,MAAM,EAAE,yBACP,YAAY,EAAE,KACpC,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,EAAE,OAAO,CAmC1C,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,MAAM,uBACI,MAAM,6CACgB,YAAY,kBAuBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,yBACd,YAAY,EAAE,yBACb,YAAY,EAAE,6CACM,YAAY,kBAsDxD,CAAC"}
\ No newline at end of fileModified: package/CHANGELOG.md
Large diffs are not rendered by default.
Modified: package/out/command-line/uninstall-command-helpers.d.ts
Index: package/out/command-line/uninstall-command-helpers.d.ts
===================================================================
--- package/out/command-line/uninstall-command-helpers.d.ts
+++ package/out/command-line/uninstall-command-helpers.d.ts
@@ -8,11 +8,12 @@
optional?: boolean;
contextAri?: string;
installationIdx: number;
product: string;
+ autoSelectId?: string;
};
}
export declare const getMultiChoiceOptionsForUninstall: (filteredInstallations: Installation[]) => Option[];
-export declare const getInstallationsFromSelection: (options: Option[], selectedSitesIndexes: number[], filteredInstallations: Installation[]) => [Installation[], Installation[]];
+export declare const getInstallationsFromSelection: (options: Option[], selectedSitesIndexes: number[], filteredInstallations: Installation[]) => [Installation[], Installation[], boolean];
export declare const performSingleUninstall: (installId: string, installationContext: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
export declare const performMultipleUninstalls: (appsToUninstallFirst: Installation[], appsToUninstallSecond: Installation[], { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
//# sourceMappingURL=uninstall-command-helpers.d.ts.map
\ No newline at end of file