@forge/cli 11.1.0-next.24 → 11.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +172 -0
- package/npm-shrinkwrap.json +342 -331
- package/out/command-line/register-installation-commands.d.ts.map +1 -1
- package/out/command-line/register-installation-commands.js +3 -5
- package/out/command-line/uninstall-command-helpers.d.ts +1 -1
- package/out/command-line/uninstall-command-helpers.d.ts.map +1 -1
- package/out/command-line/uninstall-command-helpers.js +2 -2
- package/out/installations/installation-helper.d.ts.map +1 -1
- package/out/installations/installation-helper.js +2 -3
- package/out/installations/uninstall-app.d.ts +1 -1
- package/out/installations/uninstall-app.d.ts.map +1 -1
- package/out/installations/uninstall-app.js +8 -2
- package/package.json +15 -12
|
@@ -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,
|
|
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"}
|
|
@@ -47,15 +47,13 @@ const registerListInstallationsCommand = ({ cmd, ui, services: { installationsSe
|
|
|
47
47
|
['environment', 'Environment'],
|
|
48
48
|
['site', 'Site'],
|
|
49
49
|
['product', hasSecondaryInstallations ? 'Product(s)' : 'Product'],
|
|
50
|
-
['version', 'Version'],
|
|
51
50
|
['majorVersion', 'Major Version']
|
|
52
51
|
], installations.map(({ id, environmentKey, product, secondaryProducts, site, version: { isLatest, version } }) => ({
|
|
53
52
|
id,
|
|
54
53
|
environment: (0, cli_shared_1.environmentToOption)(environmentKey),
|
|
55
54
|
site,
|
|
56
55
|
product: (0, cli_shared_1.productsDisplayName)(product, secondaryProducts),
|
|
57
|
-
|
|
58
|
-
majorVersion: (0, semver_1.major)(version).toString()
|
|
56
|
+
majorVersion: `${(0, semver_1.major)(version).toString()} ${cli_shared_1.Text.install.booleanToScope(isLatest)}`
|
|
59
57
|
})), {
|
|
60
58
|
json,
|
|
61
59
|
emptyMessage: cli_shared_1.Text.installList.noInstallations,
|
|
@@ -87,7 +85,7 @@ const registerUninstallCommand = (deps) => {
|
|
|
87
85
|
ui.info(cli_shared_1.Text.uninstall.info);
|
|
88
86
|
ui.info(cli_shared_1.Text.ctrlC);
|
|
89
87
|
ui.emptyLine();
|
|
90
|
-
await (0, uninstall_command_helpers_1.performSingleUninstall)(installation.id, deps);
|
|
88
|
+
await (0, uninstall_command_helpers_1.performSingleUninstall)(installation.id, installation.context, deps);
|
|
91
89
|
}
|
|
92
90
|
else {
|
|
93
91
|
const filteredInstallations = installations.filter((install) => install.product !== 'identity' && install.product !== 'jira-servicedesk');
|
|
@@ -103,7 +101,7 @@ const registerUninstallCommand = (deps) => {
|
|
|
103
101
|
await (0, uninstall_command_helpers_1.performMultipleUninstalls)(firstUninstall, secondUninstall, deps);
|
|
104
102
|
}
|
|
105
103
|
else if (firstUninstall.length === 1) {
|
|
106
|
-
await (0, uninstall_command_helpers_1.performSingleUninstall)(firstUninstall[0].id, deps);
|
|
104
|
+
await (0, uninstall_command_helpers_1.performSingleUninstall)(firstUninstall[0].id, firstUninstall[0].context, deps);
|
|
107
105
|
}
|
|
108
106
|
}
|
|
109
107
|
});
|
|
@@ -13,6 +13,6 @@ export interface Option {
|
|
|
13
13
|
}
|
|
14
14
|
export declare const getMultiChoiceOptionsForUninstall: (filteredInstallations: Installation[]) => Option[];
|
|
15
15
|
export declare const getInstallationsFromSelection: (options: Option[], selectedSitesIndexes: number[], filteredInstallations: Installation[]) => [Installation[], Installation[]];
|
|
16
|
-
export declare const performSingleUninstall: (installId: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
|
|
16
|
+
export declare const performSingleUninstall: (installId: string, installationContext: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
|
|
17
17
|
export declare const performMultipleUninstalls: (appsToUninstallFirst: Installation[], appsToUninstallSecond: Installation[], { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
|
|
18
18
|
//# sourceMappingURL=uninstall-command-helpers.d.ts.map
|
|
@@ -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,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,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,
|
|
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,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,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"}
|
|
@@ -51,8 +51,8 @@ const getInstallationsFromSelection = (options, selectedSitesIndexes, filteredIn
|
|
|
51
51
|
return [firstUninstall, secondUninstall];
|
|
52
52
|
};
|
|
53
53
|
exports.getInstallationsFromSelection = getInstallationsFromSelection;
|
|
54
|
-
const performSingleUninstall = async (installId, { ui, commands: { uninstallAppCommand } }) => {
|
|
55
|
-
const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId), cli_shared_1.Text.uninstall.cmd.start, (result) => ({
|
|
54
|
+
const performSingleUninstall = async (installId, installationContext, { ui, commands: { uninstallAppCommand } }) => {
|
|
55
|
+
const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId, installationContext), cli_shared_1.Text.uninstall.cmd.start, (result) => ({
|
|
56
56
|
successful: !!result.successful,
|
|
57
57
|
message: cli_shared_1.Text.uninstall.cmd.success(false)
|
|
58
58
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-helper.d.ts","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAiD,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAEvG,wBAAgB,sBAAsB,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAWtE;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,YAAY,EAAE,EAC7B,uBAAuB,EAAE,MAAM,EAC/B,yBAAyB,EAAE,MAAM,GAChC,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"installation-helper.d.ts","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAiD,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAEvG,wBAAgB,sBAAsB,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAWtE;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,YAAY,EAAE,EAC7B,uBAAuB,EAAE,MAAM,EAC/B,yBAAyB,EAAE,MAAM,GAChC,OAAO,CAAC,YAAY,CAAC,CAkBvB"}
|
|
@@ -15,13 +15,12 @@ function validateInstallationId(installationId) {
|
|
|
15
15
|
}
|
|
16
16
|
exports.validateInstallationId = validateInstallationId;
|
|
17
17
|
async function selectSingleInstallation(ui, installations, installationTablePrompt, installationTableOverview) {
|
|
18
|
-
const installationIndex = await ui.promptForSingleChoiceTable(installationTablePrompt, installationTableOverview, ['Environment', 'Site', 'Product', '
|
|
18
|
+
const installationIndex = await ui.promptForSingleChoiceTable(installationTablePrompt, installationTableOverview, ['Environment', 'Site', 'Product', 'Major Version'], installations.map(({ id, environmentKey, product, site, version }) => ({
|
|
19
19
|
names: [
|
|
20
20
|
(0, cli_shared_1.environmentToOption)(environmentKey),
|
|
21
21
|
site,
|
|
22
22
|
(0, cli_shared_1.productDisplayName)(product),
|
|
23
|
-
cli_shared_1.Text.install.booleanToScope(version.isLatest)
|
|
24
|
-
(0, semver_1.major)(version.version).toString()
|
|
23
|
+
`${(0, semver_1.major)(version.version).toString()} ${cli_shared_1.Text.install.booleanToScope(version.isLatest)}`
|
|
25
24
|
],
|
|
26
25
|
value: id,
|
|
27
26
|
primary: site
|
|
@@ -20,7 +20,7 @@ export declare class UninstallAppCommand {
|
|
|
20
20
|
private readonly getAppConfig;
|
|
21
21
|
private readonly client;
|
|
22
22
|
constructor(getAppConfig: AppConfigProvider, client: UninstallAppClient);
|
|
23
|
-
execute(installationId: string): Promise<UninstallAppOutput>;
|
|
23
|
+
execute(installationId: string, installationContext: string): Promise<UninstallAppOutput>;
|
|
24
24
|
batchExecute(installationIds?: string[], installationInfos?: Installation[]): Promise<UninstallAppOutput[]>;
|
|
25
25
|
}
|
|
26
26
|
//# sourceMappingURL=uninstall-app.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall-app.d.ts","sourceRoot":"","sources":["../../src/installations/uninstall-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,2BAA4B,SAAQ,sBAAsB;IACzE,KAAK,EAAE,IAAI,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9E,YAAY,CAAC,KAAK,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,qBAAqB,CAAC,KAAK,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;CACrG;AAED,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,YAAY,EAAE,iBAAiB,EAC/B,MAAM,EAAE,kBAAkB;IAGhC,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"uninstall-app.d.ts","sourceRoot":"","sources":["../../src/installations/uninstall-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,2BAA4B,SAAQ,sBAAsB;IACzE,KAAK,EAAE,IAAI,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9E,YAAY,CAAC,KAAK,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,qBAAqB,CAAC,KAAK,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;CACrG;AAED,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,YAAY,EAAE,iBAAiB,EAC/B,MAAM,EAAE,kBAAkB;IAGhC,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkBzF,YAAY,CACvB,eAAe,GAAE,MAAM,EAAO,EAC9B,iBAAiB,CAAC,EAAE,YAAY,EAAE,GACjC,OAAO,CAAC,kBAAkB,EAAE,CAAC;CA6BjC"}
|
|
@@ -8,10 +8,16 @@ class UninstallAppCommand {
|
|
|
8
8
|
this.getAppConfig = getAppConfig;
|
|
9
9
|
this.client = client;
|
|
10
10
|
}
|
|
11
|
-
async execute(installationId) {
|
|
11
|
+
async execute(installationId, installationContext) {
|
|
12
12
|
const { id: appId } = await this.getAppConfig();
|
|
13
13
|
const { product, site, environmentKey } = await this.client.getInstallation(appId, installationId);
|
|
14
|
-
const success = await this.client.uninstallApp({
|
|
14
|
+
const success = await this.client.uninstallApp({
|
|
15
|
+
appId,
|
|
16
|
+
environmentKey,
|
|
17
|
+
installationId,
|
|
18
|
+
installationContext,
|
|
19
|
+
async: true
|
|
20
|
+
});
|
|
15
21
|
return {
|
|
16
22
|
product,
|
|
17
23
|
site,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "11.1.0
|
|
3
|
+
"version": "11.1.0",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -18,16 +18,16 @@
|
|
|
18
18
|
"postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@forge/bundler": "4.20.9
|
|
22
|
-
"@forge/cli-shared": "6.6.1
|
|
23
|
-
"@forge/egress": "1.4.0
|
|
24
|
-
"@forge/lint": "5.7.1
|
|
25
|
-
"@forge/manifest": "8.7.0
|
|
26
|
-
"@forge/runtime": "5.10.6
|
|
27
|
-
"@forge/tunnel": "5.9.3
|
|
28
|
-
"@forge/util": "1.4.8
|
|
21
|
+
"@forge/bundler": "4.20.9",
|
|
22
|
+
"@forge/cli-shared": "6.6.1",
|
|
23
|
+
"@forge/egress": "1.4.0",
|
|
24
|
+
"@forge/lint": "5.7.1",
|
|
25
|
+
"@forge/manifest": "8.7.0",
|
|
26
|
+
"@forge/runtime": "5.10.6",
|
|
27
|
+
"@forge/tunnel": "5.9.3",
|
|
28
|
+
"@forge/util": "1.4.8",
|
|
29
29
|
"@sentry/node": "7.106.0",
|
|
30
|
-
"@forge/i18n": "0.0.
|
|
30
|
+
"@forge/i18n": "0.0.4",
|
|
31
31
|
"ajv": "^8.12.0",
|
|
32
32
|
"archiver": "^6.0.2",
|
|
33
33
|
"case": "^1.6.3",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"cli-table3": "^0.6.3",
|
|
37
37
|
"command-exists": "^1.2.9",
|
|
38
38
|
"commander": "^11.1.0",
|
|
39
|
-
"cross-spawn": "^7.0.
|
|
39
|
+
"cross-spawn": "^7.0.5",
|
|
40
40
|
"dayjs": "^1.11.10",
|
|
41
41
|
"didyoumean": "^1.2.2",
|
|
42
42
|
"diff": "^7.0.0",
|
|
@@ -87,5 +87,8 @@
|
|
|
87
87
|
},
|
|
88
88
|
"engines": {
|
|
89
89
|
"node": ">=12.13.1"
|
|
90
|
+
},
|
|
91
|
+
"publishConfig": {
|
|
92
|
+
"registry": "https://packages.atlassian.com/api/npm/npm-public/"
|
|
90
93
|
}
|
|
91
|
-
}
|
|
94
|
+
}
|