@forge/cli 11.3.0-next.16-experimental-8477be1 → 11.3.0-next.22
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 +57 -38
- package/npm-shrinkwrap.json +47 -47
- package/out/autocomplete/autocomplete-config.json +3 -0
- package/out/command-line/controller/install-controller.d.ts +5 -3
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +43 -25
- package/out/command-line/register-installation-commands.d.ts.map +1 -1
- package/out/command-line/register-installation-commands.js +1 -1
- package/out/command-line/register-tunnel-commands.d.ts.map +1 -1
- package/out/command-line/register-tunnel-commands.js +1 -0
- package/out/deploy/packager/runtime-bundler.d.ts +1 -0
- package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
- package/out/deploy/packager/runtime-bundler.js +9 -0
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +12 -4
- package/out/service/installation-service.d.ts +1 -0
- package/out/service/installation-service.d.ts.map +1 -1
- package/package.json +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,48 +1,67 @@
|
|
|
1
1
|
# @forge/cli
|
|
2
2
|
|
|
3
|
-
## 11.3.0-next.
|
|
3
|
+
## 11.3.0-next.22
|
|
4
4
|
|
|
5
|
-
###
|
|
5
|
+
### Patch Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
8
|
-
-
|
|
7
|
+
- 3a510c5: Improve XPA uninstall wording
|
|
8
|
+
- Updated dependencies [3a510c5]
|
|
9
|
+
- @forge/cli-shared@6.8.0-next.20
|
|
10
|
+
- @forge/bundler@4.22.0-next.21
|
|
11
|
+
- @forge/lint@5.7.3-next.21
|
|
12
|
+
- @forge/tunnel@5.10.1-next.22
|
|
13
|
+
|
|
14
|
+
## 11.3.0-next.21
|
|
9
15
|
|
|
10
16
|
### Patch Changes
|
|
11
17
|
|
|
12
|
-
-
|
|
13
|
-
-
|
|
14
|
-
-
|
|
15
|
-
-
|
|
16
|
-
-
|
|
17
|
-
-
|
|
18
|
-
|
|
19
|
-
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
-
|
|
24
|
-
-
|
|
25
|
-
- Updated dependencies [
|
|
26
|
-
-
|
|
27
|
-
-
|
|
28
|
-
-
|
|
29
|
-
-
|
|
30
|
-
|
|
31
|
-
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
-
|
|
36
|
-
- Updated dependencies [
|
|
37
|
-
-
|
|
38
|
-
-
|
|
39
|
-
-
|
|
40
|
-
- @forge/
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
18
|
+
- 61f499c: Fix XPA upgrade wording
|
|
19
|
+
- Updated dependencies [61f499c]
|
|
20
|
+
- @forge/cli-shared@6.8.0-next.19
|
|
21
|
+
- @forge/bundler@4.22.0-next.20
|
|
22
|
+
- @forge/lint@5.7.3-next.20
|
|
23
|
+
- @forge/tunnel@5.10.1-next.21
|
|
24
|
+
|
|
25
|
+
## 11.3.0-next.20
|
|
26
|
+
|
|
27
|
+
### Patch Changes
|
|
28
|
+
|
|
29
|
+
- f9c2880: Add support for --no-verify during tunnel
|
|
30
|
+
- 017e68f: fix displaying scopes for forge upgrade
|
|
31
|
+
- Updated dependencies [f9c2880]
|
|
32
|
+
- @forge/cli-shared@6.8.0-next.18
|
|
33
|
+
- @forge/tunnel@5.10.1-next.20
|
|
34
|
+
- @forge/bundler@4.22.0-next.19
|
|
35
|
+
- @forge/lint@5.7.3-next.19
|
|
36
|
+
|
|
37
|
+
## 11.3.0-next.19
|
|
38
|
+
|
|
39
|
+
### Patch Changes
|
|
40
|
+
|
|
41
|
+
- 7d8339b: verify installation exists before upgrading
|
|
42
|
+
- Updated dependencies [7d8339b]
|
|
43
|
+
- @forge/cli-shared@6.8.0-next.17
|
|
44
|
+
- @forge/bundler@4.22.0-next.18
|
|
45
|
+
- @forge/lint@5.7.3-next.18
|
|
46
|
+
- @forge/tunnel@5.10.1-next.19
|
|
47
|
+
|
|
48
|
+
## 11.3.0-next.18
|
|
49
|
+
|
|
50
|
+
### Patch Changes
|
|
51
|
+
|
|
52
|
+
- 473052d: Ensure i18n resources are included in resolver bundles
|
|
53
|
+
- Updated dependencies [2204d8d]
|
|
54
|
+
- @forge/cli-shared@6.8.0-next.16
|
|
55
|
+
- @forge/bundler@4.22.0-next.17
|
|
56
|
+
- @forge/lint@5.7.3-next.17
|
|
57
|
+
- @forge/tunnel@5.10.1-next.18
|
|
58
|
+
|
|
59
|
+
## 11.3.0-next.17
|
|
60
|
+
|
|
61
|
+
### Patch Changes
|
|
62
|
+
|
|
63
|
+
- Updated dependencies [bd12e28]
|
|
64
|
+
- @forge/tunnel@5.10.1-next.17
|
|
46
65
|
|
|
47
66
|
## 11.3.0-next.16
|
|
48
67
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "11.3.0-next.
|
|
3
|
+
"version": "11.3.0-next.22",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@forge/cli",
|
|
9
|
-
"version": "11.3.0-next.
|
|
9
|
+
"version": "11.3.0-next.22",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@forge/bundler": "4.22.0-next.
|
|
14
|
-
"@forge/cli-shared": "6.8.0-next.
|
|
13
|
+
"@forge/bundler": "4.22.0-next.21",
|
|
14
|
+
"@forge/cli-shared": "6.8.0-next.20",
|
|
15
15
|
"@forge/egress": "1.4.0",
|
|
16
|
-
"@forge/i18n": "0.0.5-next.0
|
|
17
|
-
"@forge/lint": "5.7.3-next.
|
|
18
|
-
"@forge/manifest": "8.9.0-next.8
|
|
16
|
+
"@forge/i18n": "0.0.5-next.0",
|
|
17
|
+
"@forge/lint": "5.7.3-next.21",
|
|
18
|
+
"@forge/manifest": "8.9.0-next.8",
|
|
19
19
|
"@forge/runtime": "5.10.7",
|
|
20
|
-
"@forge/tunnel": "5.10.1-next.
|
|
20
|
+
"@forge/tunnel": "5.10.1-next.22",
|
|
21
21
|
"@forge/util": "1.4.8",
|
|
22
22
|
"@sentry/node": "7.106.0",
|
|
23
23
|
"ajv": "^8.12.0",
|
|
@@ -834,9 +834,9 @@
|
|
|
834
834
|
"license": "SEE LICENSE IN LICENSE.txt"
|
|
835
835
|
},
|
|
836
836
|
"node_modules/@forge/bundler": {
|
|
837
|
-
"version": "4.22.0-next.
|
|
838
|
-
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.22.0-next.
|
|
839
|
-
"integrity": "sha512-
|
|
837
|
+
"version": "4.22.0-next.21",
|
|
838
|
+
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.22.0-next.21.tgz",
|
|
839
|
+
"integrity": "sha512-o2dmktS+rSnHiVuFYQDrR5jeyOS/uJJrevBjhQ0mXwc18IayAL1CoQZZpLcxXYWqUOEX1ncXjbpeuIr8wy/Caw==",
|
|
840
840
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
841
841
|
"dependencies": {
|
|
842
842
|
"@babel/core": "^7.24.0",
|
|
@@ -846,12 +846,12 @@
|
|
|
846
846
|
"@babel/plugin-transform-optional-chaining": "^7.23.4",
|
|
847
847
|
"@babel/plugin-transform-react-jsx": "^7.23.4",
|
|
848
848
|
"@babel/preset-typescript": "^7.23.3",
|
|
849
|
-
"@forge/api": "5.2.0-next.0
|
|
849
|
+
"@forge/api": "5.2.0-next.0",
|
|
850
850
|
"@forge/babel-plugin-transform-ui": "1.1.21",
|
|
851
|
-
"@forge/cli-shared": "6.8.0-next.
|
|
852
|
-
"@forge/i18n": "0.0.5-next.0
|
|
853
|
-
"@forge/lint": "5.7.3-next.
|
|
854
|
-
"@forge/manifest": "8.9.0-next.8
|
|
851
|
+
"@forge/cli-shared": "6.8.0-next.20",
|
|
852
|
+
"@forge/i18n": "0.0.5-next.0",
|
|
853
|
+
"@forge/lint": "5.7.3-next.21",
|
|
854
|
+
"@forge/manifest": "8.9.0-next.8",
|
|
855
855
|
"@forge/util": "1.4.8",
|
|
856
856
|
"assert": "^2.1.0",
|
|
857
857
|
"babel-loader": "^8.3.0",
|
|
@@ -893,14 +893,14 @@
|
|
|
893
893
|
}
|
|
894
894
|
},
|
|
895
895
|
"node_modules/@forge/bundler/node_modules/@forge/api": {
|
|
896
|
-
"version": "5.2.0-next.0
|
|
897
|
-
"resolved": "https://registry.npmjs.org/@forge/api/-/api-5.2.0-next.0
|
|
898
|
-
"integrity": "sha512-
|
|
896
|
+
"version": "5.2.0-next.0",
|
|
897
|
+
"resolved": "https://registry.npmjs.org/@forge/api/-/api-5.2.0-next.0.tgz",
|
|
898
|
+
"integrity": "sha512-emwVoxSCdOq+l4lTZK+3YOZnkMagiN/pZttpl3mA8y/DiU0tGLL49u5LipU1xdc/8c/jyGlyu8lrpMvkYmky/g==",
|
|
899
899
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
900
900
|
"dependencies": {
|
|
901
901
|
"@forge/auth": "0.0.7",
|
|
902
902
|
"@forge/egress": "1.4.0",
|
|
903
|
-
"@forge/i18n": "0.0.5-next.0
|
|
903
|
+
"@forge/i18n": "0.0.5-next.0",
|
|
904
904
|
"@forge/storage": "1.8.0",
|
|
905
905
|
"@forge/util": "1.4.8",
|
|
906
906
|
"headers-utils": "^3.0.2"
|
|
@@ -922,13 +922,13 @@
|
|
|
922
922
|
"license": "SEE LICENSE IN LICENSE.txt"
|
|
923
923
|
},
|
|
924
924
|
"node_modules/@forge/cli-shared": {
|
|
925
|
-
"version": "6.8.0-next.
|
|
926
|
-
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-6.8.0-next.
|
|
927
|
-
"integrity": "sha512-
|
|
925
|
+
"version": "6.8.0-next.20",
|
|
926
|
+
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-6.8.0-next.20.tgz",
|
|
927
|
+
"integrity": "sha512-iZY7UR6poPy6/xq1yXxhHmsI2STJwFP1ItQq9qXvL5HElpvS/nuWaTrRCOOQ6Y1TlRoD7WDvwa/VMRULiZPKwg==",
|
|
928
928
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
929
929
|
"dependencies": {
|
|
930
|
-
"@forge/i18n": "0.0.5-next.0
|
|
931
|
-
"@forge/manifest": "8.9.0-next.8
|
|
930
|
+
"@forge/i18n": "0.0.5-next.0",
|
|
931
|
+
"@forge/manifest": "8.9.0-next.8",
|
|
932
932
|
"@forge/util": "1.4.8",
|
|
933
933
|
"@sentry/node": "7.106.0",
|
|
934
934
|
"adm-zip": "^0.5.10",
|
|
@@ -961,9 +961,9 @@
|
|
|
961
961
|
}
|
|
962
962
|
},
|
|
963
963
|
"node_modules/@forge/csp": {
|
|
964
|
-
"version": "3.7.0-next.0
|
|
965
|
-
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-3.7.0-next.0
|
|
966
|
-
"integrity": "sha512-
|
|
964
|
+
"version": "3.7.0-next.0",
|
|
965
|
+
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-3.7.0-next.0.tgz",
|
|
966
|
+
"integrity": "sha512-C4P3HUsEY0V9wRbucaobikHP6OZlDf9lunyLjcsQqsUDUUOxyxo8sSRjSJ76S6TyciI//ivNjy7P/TkZG+gg9w==",
|
|
967
967
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
968
968
|
"dependencies": {
|
|
969
969
|
"cheerio": "^0.22.0",
|
|
@@ -980,24 +980,24 @@
|
|
|
980
980
|
}
|
|
981
981
|
},
|
|
982
982
|
"node_modules/@forge/i18n": {
|
|
983
|
-
"version": "0.0.5-next.0
|
|
984
|
-
"resolved": "https://registry.npmjs.org/@forge/i18n/-/i18n-0.0.5-next.0
|
|
985
|
-
"integrity": "sha512-
|
|
983
|
+
"version": "0.0.5-next.0",
|
|
984
|
+
"resolved": "https://registry.npmjs.org/@forge/i18n/-/i18n-0.0.5-next.0.tgz",
|
|
985
|
+
"integrity": "sha512-mGTGQpnviwEUJsMgegDiyhli3SAo5nsy6azQf/gKCDFUC/VQvG+OzA4dVhfRn7vBMXZ+W/vb9XYT71+evBTSHw==",
|
|
986
986
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
987
987
|
"dependencies": {
|
|
988
988
|
"lodash": "^4.17.21"
|
|
989
989
|
}
|
|
990
990
|
},
|
|
991
991
|
"node_modules/@forge/lint": {
|
|
992
|
-
"version": "5.7.3-next.
|
|
993
|
-
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.7.3-next.
|
|
994
|
-
"integrity": "sha512-
|
|
992
|
+
"version": "5.7.3-next.21",
|
|
993
|
+
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.7.3-next.21.tgz",
|
|
994
|
+
"integrity": "sha512-EoKuOjCtbbpXcX/3Wf1Is6N8Cl52GI0XR71AZkh7bcdPwBVwrOAtXPggCv08KW1q8byr0LbRYh9TelhNO7hvVQ==",
|
|
995
995
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
996
996
|
"dependencies": {
|
|
997
|
-
"@forge/cli-shared": "6.8.0-next.
|
|
998
|
-
"@forge/csp": "3.7.0-next.0
|
|
997
|
+
"@forge/cli-shared": "6.8.0-next.20",
|
|
998
|
+
"@forge/csp": "3.7.0-next.0",
|
|
999
999
|
"@forge/egress": "1.4.0",
|
|
1000
|
-
"@forge/manifest": "8.9.0-next.8
|
|
1000
|
+
"@forge/manifest": "8.9.0-next.8",
|
|
1001
1001
|
"@typescript-eslint/typescript-estree": "^5.62.0",
|
|
1002
1002
|
"array.prototype.flatmap": "^1.3.2",
|
|
1003
1003
|
"atlassian-openapi": "^1.0.18",
|
|
@@ -1006,12 +1006,12 @@
|
|
|
1006
1006
|
}
|
|
1007
1007
|
},
|
|
1008
1008
|
"node_modules/@forge/manifest": {
|
|
1009
|
-
"version": "8.9.0-next.8
|
|
1010
|
-
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-8.9.0-next.8
|
|
1011
|
-
"integrity": "sha512-
|
|
1009
|
+
"version": "8.9.0-next.8",
|
|
1010
|
+
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-8.9.0-next.8.tgz",
|
|
1011
|
+
"integrity": "sha512-TvrsvB/ZAAySdO/eBdvRhOF5Bt98fcOOgDbPN5+RwYVZ497sF0t8ut9bA6A4V4CKS1+WnNUdHvOj75HvgbXM9w==",
|
|
1012
1012
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
1013
1013
|
"dependencies": {
|
|
1014
|
-
"@forge/i18n": "0.0.5-next.0
|
|
1014
|
+
"@forge/i18n": "0.0.5-next.0",
|
|
1015
1015
|
"@sentry/node": "7.106.0",
|
|
1016
1016
|
"ajv": "^8.12.0",
|
|
1017
1017
|
"ajv-formats": "2.1.1",
|
|
@@ -1039,14 +1039,14 @@
|
|
|
1039
1039
|
}
|
|
1040
1040
|
},
|
|
1041
1041
|
"node_modules/@forge/tunnel": {
|
|
1042
|
-
"version": "5.10.1-next.
|
|
1043
|
-
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.10.1-next.
|
|
1044
|
-
"integrity": "sha512-
|
|
1042
|
+
"version": "5.10.1-next.22",
|
|
1043
|
+
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.10.1-next.22.tgz",
|
|
1044
|
+
"integrity": "sha512-vlxRxV5rFCtC3pVLNwp7kkoY+ybrhwgHJMWCC7P5clC+FJq4ngUkSNkw7cUIEXzuamDSBBWdIFksq9mX1vgyLA==",
|
|
1045
1045
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
1046
1046
|
"dependencies": {
|
|
1047
|
-
"@forge/bundler": "4.22.0-next.
|
|
1048
|
-
"@forge/cli-shared": "6.8.0-next.
|
|
1049
|
-
"@forge/csp": "3.7.0-next.0
|
|
1047
|
+
"@forge/bundler": "4.22.0-next.21",
|
|
1048
|
+
"@forge/cli-shared": "6.8.0-next.20",
|
|
1049
|
+
"@forge/csp": "3.7.0-next.0",
|
|
1050
1050
|
"@forge/runtime": "5.10.7",
|
|
1051
1051
|
"chokidar": "^3.6.0",
|
|
1052
1052
|
"cloudflared": "^0.7.0",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { AppConfigProvider, ConfigFile, UI, SupportedProductsService } from '@forge/cli-shared';
|
|
2
|
+
import { AppConfigProvider, ConfigFile, UI, SupportedProduct, SupportedProductsService } from '@forge/cli-shared';
|
|
3
3
|
import { URL } from 'url';
|
|
4
4
|
import { InstallAppSiteCommand } from '../../installations/install-app-site';
|
|
5
5
|
import { InstallationService } from '../../service/installation-service';
|
|
@@ -7,7 +7,7 @@ import { InstallView } from '../view/install-view';
|
|
|
7
7
|
interface InstallViewProps {
|
|
8
8
|
environment: string;
|
|
9
9
|
site?: URL;
|
|
10
|
-
products?:
|
|
10
|
+
products?: SupportedProduct[];
|
|
11
11
|
upgrade: boolean;
|
|
12
12
|
nonInteractive?: boolean;
|
|
13
13
|
confirmScopes: boolean;
|
|
@@ -31,12 +31,14 @@ export declare class InstallController {
|
|
|
31
31
|
private installOrUpgrade;
|
|
32
32
|
private promptForProducts;
|
|
33
33
|
private promptForSite;
|
|
34
|
-
private
|
|
34
|
+
private getAppInstallations;
|
|
35
|
+
private getInstallationToUpgrade;
|
|
35
36
|
private getUniqueInstallationProductsFromScopes;
|
|
36
37
|
private isValidLicense;
|
|
37
38
|
private validateLicenseOption;
|
|
38
39
|
private checkForUIKit1Modules;
|
|
39
40
|
run({ environment, site, products, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }: InstallViewProps): Promise<void>;
|
|
41
|
+
private extractManifestData;
|
|
40
42
|
private getXPAProductsAndSite;
|
|
41
43
|
private checkForMultiProductScopes;
|
|
42
44
|
private convertListScope;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,iBAAiB,EAEjB,UAAU,EAEV,EAAE,
|
|
1
|
+
{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,iBAAiB,EAEjB,UAAU,EAEV,EAAE,EAUF,gBAAgB,EAChB,wBAAwB,EAIzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAgB,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAYD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAUD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBANxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW,EACxB,wBAAwB,EAAE,wBAAwB;YAGvD,cAAc;YAmBd,gBAAgB;YA8ChB,iBAAiB;YA0BjB,aAAa;YA2Bb,mBAAmB;YAcnB,wBAAwB;IAkCtC,OAAO,CAAC,uCAAuC;IAa/C,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,qBAAqB;IAgB7B,OAAO,CAAC,qBAAqB,CAM3B;IAEW,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,aAAa,EACb,OAAO,EACP,YAAY,EACZ,eAAe,EACf,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmInC,OAAO,CAAC,mBAAmB,CAOzB;IAEF,OAAO,CAAC,qBAAqB,CAoC3B;IAEF,OAAO,CAAC,0BAA0B,CA8BhC;YAEY,gBAAgB;IAU9B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IA8B5B,OAAO,CAAC,uBAAuB;YAoBjB,8CAA8C;IAY5D,OAAO,CAAC,+BAA+B,CAWrC;CACH"}
|
|
@@ -83,7 +83,8 @@ class InstallController {
|
|
|
83
83
|
];
|
|
84
84
|
}
|
|
85
85
|
async promptForSite(products) {
|
|
86
|
-
const
|
|
86
|
+
const displayName = (0, cli_shared_1.productDisplayName)(products[0]);
|
|
87
|
+
const isWorkspaceBased = products.length > 0 && this.supportedProductsService.isWorkspaceProduct(displayName);
|
|
87
88
|
const overviewText = isWorkspaceBased
|
|
88
89
|
? cli_shared_1.Text.installationContext.overviewWorkspace
|
|
89
90
|
: cli_shared_1.Text.installationContext.overviewSite;
|
|
@@ -96,21 +97,36 @@ class InstallController {
|
|
|
96
97
|
if (!trySite) {
|
|
97
98
|
throw new cli_shared_1.ValidationError(invalidText);
|
|
98
99
|
}
|
|
99
|
-
return this.supportedProductsService.validateSite(trySite,
|
|
100
|
+
return this.supportedProductsService.validateSite(trySite, displayName);
|
|
100
101
|
}
|
|
101
|
-
async
|
|
102
|
+
async getAppInstallations(siteOption, productOption, environmentOption) {
|
|
102
103
|
const { installations } = await this.installationService.listNonTechnicalAppInstallations({
|
|
103
104
|
site: siteOption,
|
|
104
105
|
product: productOption,
|
|
105
106
|
environment: environmentOption
|
|
106
107
|
});
|
|
107
|
-
|
|
108
|
+
return installations;
|
|
109
|
+
}
|
|
110
|
+
async getInstallationToUpgrade(siteOption, productOption, environmentOption) {
|
|
111
|
+
const matchingInstallations = await this.getAppInstallations(siteOption, productOption, environmentOption);
|
|
112
|
+
let selectedInstallationToUpgrade;
|
|
113
|
+
if (siteOption && productOption?.length) {
|
|
114
|
+
if (!matchingInstallations.length) {
|
|
115
|
+
throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidInstallationContext);
|
|
116
|
+
}
|
|
117
|
+
selectedInstallationToUpgrade = matchingInstallations[0];
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
selectedInstallationToUpgrade = await this.installView.promptForUpgrade(matchingInstallations);
|
|
121
|
+
}
|
|
122
|
+
const { site, product, environmentKey, environmentType, version } = selectedInstallationToUpgrade;
|
|
108
123
|
const productName = (0, cli_shared_1.productDisplayName)(product);
|
|
109
124
|
return {
|
|
110
125
|
site: this.supportedProductsService.validateSite(site, productName),
|
|
111
|
-
product: productName,
|
|
126
|
+
product: this.supportedProductsService.validateSupportedProduct(productName),
|
|
112
127
|
environment: environmentKey,
|
|
113
|
-
environmentType
|
|
128
|
+
environmentType,
|
|
129
|
+
scopes: version.scopes
|
|
114
130
|
};
|
|
115
131
|
}
|
|
116
132
|
getUniqueInstallationProductsFromScopes(scopes) {
|
|
@@ -146,6 +162,8 @@ class InstallController {
|
|
|
146
162
|
return upperCaseLicense;
|
|
147
163
|
}
|
|
148
164
|
checkForUIKit1Modules = (modules) => {
|
|
165
|
+
if (!modules)
|
|
166
|
+
return;
|
|
149
167
|
const uiKit1Modules = (0, cli_shared_1.findUIKit1Modules)(modules);
|
|
150
168
|
if (uiKit1Modules.length > 0) {
|
|
151
169
|
this.installView.displayUIKit1DeprecationMessage(uiKit1Modules);
|
|
@@ -158,19 +176,19 @@ class InstallController {
|
|
|
158
176
|
const overrides = await this.validateEcosystemAppInstallationOverridesInput(licenseModes, usersWithAccess, environment);
|
|
159
177
|
const environmentPermissions = await this.installationService.getAppEnvironmentPermissions(id, environment);
|
|
160
178
|
const requiredProducts = environmentPermissions?.requiredProducts;
|
|
161
|
-
|
|
162
|
-
|
|
179
|
+
let scopesFromLastInstallation = new Set();
|
|
180
|
+
if (upgrade) {
|
|
181
|
+
const upgradeResult = await this.getInstallationToUpgrade(site, products?.[0], environment);
|
|
163
182
|
environment = upgradeResult.environment;
|
|
164
183
|
site = upgradeResult.site;
|
|
165
184
|
products = [upgradeResult.product];
|
|
185
|
+
scopesFromLastInstallation = new Set(upgradeResult.scopes);
|
|
186
|
+
this.ui.info(this.supportedProductsService.isWorkspaceProduct(products[0]) ? text.bannerWorkspace : text.bannerSite);
|
|
166
187
|
}
|
|
167
|
-
if (!requiredProducts?.length) {
|
|
188
|
+
else if (!requiredProducts?.length) {
|
|
168
189
|
products = products?.length ? products : await this.promptForProducts();
|
|
169
190
|
site = site ? site : await this.promptForSite(products);
|
|
170
|
-
|
|
171
|
-
? text.bannerWorkspace
|
|
172
|
-
: text.bannerSite;
|
|
173
|
-
this.ui.info(bannerText);
|
|
191
|
+
this.ui.info(this.supportedProductsService.isWorkspaceProduct(products[0]) ? text.bannerWorkspace : text.bannerSite);
|
|
174
192
|
}
|
|
175
193
|
else {
|
|
176
194
|
const result = await this.getXPAProductsAndSite(requiredProducts.map(cli_shared_1.productDisplayName), products, site);
|
|
@@ -185,21 +203,16 @@ class InstallController {
|
|
|
185
203
|
this.ui.error(new NoDeploymentError(environment), { pad: false });
|
|
186
204
|
return;
|
|
187
205
|
}
|
|
188
|
-
|
|
189
|
-
environmentPermissions.scopes = [];
|
|
190
|
-
}
|
|
206
|
+
environmentPermissions.scopes = environmentPermissions.scopes ?? [];
|
|
191
207
|
const { scopes: environmentScopes, environmentType } = environmentPermissions;
|
|
192
208
|
const [{ permissions, modules }, manifestEgressEntries] = await Promise.all([
|
|
193
209
|
this.configFile.readConfig(),
|
|
194
210
|
this.configFile.getEgressPermissions()
|
|
195
211
|
]);
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
const
|
|
200
|
-
const manifestScopes = new Set(permissions?.scopes ?? []);
|
|
201
|
-
const listScopesString = upgrade ? environmentPermissions.addedScopes : environmentPermissions.scopes;
|
|
202
|
-
const listScopes = await this.convertListScope(listScopesString);
|
|
212
|
+
this.checkForUIKit1Modules(modules);
|
|
213
|
+
const { manifestEgressAddresses, manifestScopes } = this.extractManifestData(manifestEgressEntries, permissions);
|
|
214
|
+
const differenceInScopes = environmentScopes.filter((x) => !scopesFromLastInstallation.has(x));
|
|
215
|
+
const listScopes = await this.convertListScope(differenceInScopes);
|
|
203
216
|
const scopesConfirmationResult = await this.installView.promptForPermissionsConfirmation(environmentPermissions, listScopes, [...manifestScopes], manifestEgressAddresses, environment, confirmScopes, !!nonInteractive, text);
|
|
204
217
|
if (!scopesConfirmationResult)
|
|
205
218
|
return;
|
|
@@ -227,13 +240,18 @@ class InstallController {
|
|
|
227
240
|
if (successfulProducts.length) {
|
|
228
241
|
this.ui.info(text.success.banner(environment, environmentType, (0, cli_shared_1.productDisplayName)(successfulProducts.join(', ')), site.host));
|
|
229
242
|
}
|
|
230
|
-
else {
|
|
243
|
+
else if (!upgrade) {
|
|
231
244
|
this.ui.info(cli_shared_1.Text.install.failedAll(site, environment));
|
|
232
245
|
}
|
|
233
246
|
if (failedProducts.length) {
|
|
234
247
|
throw new cli_shared_1.PartialInstallationError(cli_shared_1.Text.error.partialInstallation(failedProducts));
|
|
235
248
|
}
|
|
236
249
|
}
|
|
250
|
+
extractManifestData = (manifestEgressEntries, permissions) => {
|
|
251
|
+
const manifestEgressAddresses = (0, cli_shared_1.flatMap)(manifestEgressEntries, ({ domains }) => domains ?? []);
|
|
252
|
+
const manifestScopes = new Set(permissions?.scopes ?? []);
|
|
253
|
+
return { manifestEgressAddresses, manifestScopes };
|
|
254
|
+
};
|
|
237
255
|
getXPAProductsAndSite = async (requiredProducts, products, site) => {
|
|
238
256
|
const { installations } = (await this.installationService.listAppInstallations()) ?? [];
|
|
239
257
|
site = site ? site : await this.promptForSite([]);
|
|
@@ -245,7 +263,7 @@ class InstallController {
|
|
|
245
263
|
}
|
|
246
264
|
else {
|
|
247
265
|
this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(requiredProducts[0]));
|
|
248
|
-
products = requiredProducts;
|
|
266
|
+
products = requiredProducts.map((product) => (0, cli_shared_1.productDisplayName)(product));
|
|
249
267
|
}
|
|
250
268
|
}
|
|
251
269
|
else {
|
|
@@ -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;
|
|
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;AAkFF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
|
|
@@ -93,7 +93,7 @@ const registerUninstallCommand = (deps) => {
|
|
|
93
93
|
const selectedSitesIndexes = await ui.promptForTable(cli_shared_1.Text.uninstall.interactive.desc, cli_shared_1.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Context'], options);
|
|
94
94
|
const [firstUninstall, secondUninstall, hadAutoSelected] = (0, uninstall_command_helpers_1.getInstallationsFromSelection)(options, selectedSitesIndexes, filteredInstallations);
|
|
95
95
|
if (hadAutoSelected) {
|
|
96
|
-
const confirmation = await ui.confirm(cli_shared_1.Text.uninstall.interactive.confirmOptionalContexts
|
|
96
|
+
const confirmation = await ui.confirm(cli_shared_1.Text.uninstall.interactive.confirmOptionalContexts);
|
|
97
97
|
if (!confirmation) {
|
|
98
98
|
return;
|
|
99
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,
|
|
1
|
+
{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAa/F,CAAC"}
|
|
@@ -11,6 +11,7 @@ const registerCommands = ({ cmd, ui, controllers: { tunnelController } }) => {
|
|
|
11
11
|
.option('-d, --debug', cli_shared_1.Text.tunnel.optionDebugger)
|
|
12
12
|
.option('-f,--debugFunctionHandlers <debugFunctionHandlers...>', cli_shared_1.Text.tunnel.functionHandlers)
|
|
13
13
|
.option('-p,--debugStartingPort [debugStartingPort]', cli_shared_1.Text.tunnel.debuggerPort, cli_shared_1.defaultDebugStartingPort.toString())
|
|
14
|
+
.option('-n, --no-verify', 'disable pre-tunnel checks')
|
|
14
15
|
.action(async (options) => {
|
|
15
16
|
await tunnelController.run(options, ui);
|
|
16
17
|
});
|
|
@@ -16,6 +16,7 @@ export declare class RuntimeBundler {
|
|
|
16
16
|
protected packageCode(archiver: Archiver, entryPoints: EntryPoint[], i18nResourceBundle: I18nResourceBundle): Promise<string[]>;
|
|
17
17
|
protected packageDependencies(archiver: Archiver): Promise<void>;
|
|
18
18
|
protected packageAll(archiver: Archiver, handlers: Handler[], packageConfig: App['package'], i18nResourceBundle: I18nResourceBundle): Promise<string[]>;
|
|
19
|
+
protected packageI18nResources(archiver: Archiver, i18nResourceBundle: I18nResourceBundle): void;
|
|
19
20
|
bundle(handlers: Handler[], i18nResourceBundle: I18nResourceBundle, packageConfig?: App['package']): Promise<RuntimeBundleResult>;
|
|
20
21
|
}
|
|
21
22
|
export declare class SandboxRuntimeBundler extends RuntimeBundler {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,UAAU,EAAkB,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,gBAAgB,EAEhB,YAAY,
|
|
1
|
+
{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,UAAU,EAAkB,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,gBAAgB,EAEhB,YAAY,EAEZ,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EACd,gBAAgB,EAAE,gBAAgB,EACpC,YAAY,EAAE,YAAY;cAG7B,WAAW,CACzB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,UAAU,EAAE,EACzB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;cA4BJ,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cActD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;IAUpB,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAMnF,MAAM,CACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC7B,OAAO,CAAC,mBAAmB,CAAC;CAgBhC;AAED,qBAAa,qBAAsB,SAAQ,cAAc;IAC1C,MAAM,CACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC7B,OAAO,CAAC,mBAAmB,CAAC;CAMhC;AAED,qBAAa,kBAAmB,SAAQ,cAAc;cACpC,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;CASrB"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
6
|
const bundler_1 = require("@forge/bundler");
|
|
7
7
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
8
|
+
const i18n_1 = require("@forge/i18n");
|
|
8
9
|
class RuntimeBundler {
|
|
9
10
|
archiverFactory;
|
|
10
11
|
logger;
|
|
@@ -57,9 +58,17 @@ class RuntimeBundler {
|
|
|
57
58
|
await this.packageDependencies(archiver);
|
|
58
59
|
return moduleList;
|
|
59
60
|
}
|
|
61
|
+
packageI18nResources(archiver, i18nResourceBundle) {
|
|
62
|
+
(0, cli_shared_1.listFilesInI18nResourceBundle)(i18nResourceBundle).forEach(([fileName, filePath]) => {
|
|
63
|
+
archiver.addFileFrom(path_1.default.join(i18n_1.I18N_BUNDLE_FOLDER_NAME, fileName), filePath);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
60
66
|
async bundle(handlers, i18nResourceBundle, packageConfig) {
|
|
61
67
|
const archiver = this.archiverFactory();
|
|
62
68
|
const moduleList = await this.packageAll(archiver, handlers, packageConfig, i18nResourceBundle);
|
|
69
|
+
if (moduleList.length === 0) {
|
|
70
|
+
this.packageI18nResources(archiver, i18nResourceBundle);
|
|
71
|
+
}
|
|
63
72
|
const archivePath = await archiver.finalise();
|
|
64
73
|
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
|
|
65
74
|
return { runtimeArchivePath: archivePath, moduleList };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -364,6 +364,12 @@ class InstallationsGraphqlClient {
|
|
|
364
364
|
const secondaryProducts = (installation.secondaryInstallationContexts ?? [])
|
|
365
365
|
.map((context) => (0, cli_shared_1.parseInstallationContext)(context))
|
|
366
366
|
.map((context) => context.resourceOwner);
|
|
367
|
+
const permissions = installation.appEnvironmentVersion?.permissions || [];
|
|
368
|
+
const appEnvironmentVersion = {
|
|
369
|
+
isLatest: installation.appEnvironmentVersion?.isLatest ?? false,
|
|
370
|
+
version: installation.appEnvironmentVersion?.version ?? '1.0.0',
|
|
371
|
+
scopes: permissions.flatMap((permission) => permission.scopes.map((scope) => scope.key))
|
|
372
|
+
};
|
|
367
373
|
return {
|
|
368
374
|
id: installation.id,
|
|
369
375
|
...(secondaryProducts.length > 0 ? { secondaryProducts } : {}),
|
|
@@ -375,10 +381,7 @@ class InstallationsGraphqlClient {
|
|
|
375
381
|
? { secondaryContexts: installation.secondaryInstallationContexts }
|
|
376
382
|
: {}),
|
|
377
383
|
site,
|
|
378
|
-
version:
|
|
379
|
-
isLatest: false,
|
|
380
|
-
version: '1.0.0'
|
|
381
|
-
}
|
|
384
|
+
version: appEnvironmentVersion
|
|
382
385
|
};
|
|
383
386
|
});
|
|
384
387
|
}
|
|
@@ -398,6 +401,11 @@ class InstallationsGraphqlClient {
|
|
|
398
401
|
appEnvironmentVersion {
|
|
399
402
|
isLatest
|
|
400
403
|
version
|
|
404
|
+
permissions {
|
|
405
|
+
scopes {
|
|
406
|
+
key
|
|
407
|
+
}
|
|
408
|
+
}
|
|
401
409
|
}
|
|
402
410
|
}
|
|
403
411
|
pageInfo {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EAGrB,KAAK,EAGL,gBAAgB,EAEhB,SAAS,EACV,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "11.3.0-next.
|
|
3
|
+
"version": "11.3.0-next.22",
|
|
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.22.0-next.
|
|
22
|
-
"@forge/cli-shared": "6.8.0-next.
|
|
21
|
+
"@forge/bundler": "4.22.0-next.21",
|
|
22
|
+
"@forge/cli-shared": "6.8.0-next.20",
|
|
23
23
|
"@forge/egress": "1.4.0",
|
|
24
|
-
"@forge/lint": "5.7.3-next.
|
|
25
|
-
"@forge/manifest": "8.9.0-next.8
|
|
24
|
+
"@forge/lint": "5.7.3-next.21",
|
|
25
|
+
"@forge/manifest": "8.9.0-next.8",
|
|
26
26
|
"@forge/runtime": "5.10.7",
|
|
27
|
-
"@forge/tunnel": "5.10.1-next.
|
|
27
|
+
"@forge/tunnel": "5.10.1-next.22",
|
|
28
28
|
"@forge/util": "1.4.8",
|
|
29
29
|
"@sentry/node": "7.106.0",
|
|
30
|
-
"@forge/i18n": "0.0.5-next.0
|
|
30
|
+
"@forge/i18n": "0.0.5-next.0",
|
|
31
31
|
"ajv": "^8.12.0",
|
|
32
32
|
"archiver": "^6.0.2",
|
|
33
33
|
"case": "^1.6.3",
|