@forge/cli 11.0.1-next.14 → 11.1.0-next.24

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.
Files changed (23) hide show
  1. package/CHANGELOG.md +111 -0
  2. package/npm-shrinkwrap.json +40 -40
  3. package/out/command-line/command.d.ts +3 -3
  4. package/out/command-line/command.d.ts.map +1 -1
  5. package/out/command-line/command.js +6 -6
  6. package/out/command-line/controller/install-controller.d.ts +2 -0
  7. package/out/command-line/controller/install-controller.d.ts.map +1 -1
  8. package/out/command-line/controller/install-controller.js +90 -54
  9. package/out/command-line/dependency-injection.d.ts.map +1 -1
  10. package/out/command-line/dependency-injection.js +2 -1
  11. package/out/command-line/index.d.ts +1 -1
  12. package/out/command-line/index.d.ts.map +1 -1
  13. package/out/command-line/index.js +4 -4
  14. package/out/command-line/register-installation-commands.d.ts +1 -1
  15. package/out/command-line/register-installation-commands.d.ts.map +1 -1
  16. package/out/command-line/register-installation-commands.js +8 -10
  17. package/out/command-line/register-webtrigger-commands.d.ts +1 -1
  18. package/out/command-line/register-webtrigger-commands.d.ts.map +1 -1
  19. package/out/command-line/register-webtrigger-commands.js +2 -3
  20. package/out/service/version-service.d.ts +3 -0
  21. package/out/service/version-service.d.ts.map +1 -1
  22. package/out/service/version-service.js +31 -1
  23. package/package.json +7 -7
package/CHANGELOG.md CHANGED
@@ -1,5 +1,116 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 11.1.0-next.24
4
+
5
+ ### Minor Changes
6
+
7
+ - b82d338: Added the default dynamic type to legacy webtriggers when viewing version details
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [fa34240]
12
+ - @forge/cli-shared@6.6.1-next.16
13
+ - @forge/bundler@4.20.9-next.21
14
+ - @forge/lint@5.7.1-next.18
15
+ - @forge/tunnel@5.9.3-next.21
16
+
17
+ ## 11.0.1-next.23
18
+
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies [6f0fe42]
22
+ - @forge/manifest@8.7.0-next.8
23
+ - @forge/bundler@4.20.9-next.20
24
+ - @forge/cli-shared@6.6.1-next.15
25
+ - @forge/lint@5.7.1-next.17
26
+ - @forge/tunnel@5.9.3-next.20
27
+
28
+ ## 11.0.1-next.22
29
+
30
+ ### Patch Changes
31
+
32
+ - f2c2405: improve UI for XPA
33
+ - Updated dependencies [f2c2405]
34
+ - @forge/cli-shared@6.6.1-next.14
35
+ - @forge/egress@1.4.0-next.2
36
+ - @forge/bundler@4.20.9-next.19
37
+ - @forge/lint@5.7.1-next.16
38
+ - @forge/tunnel@5.9.3-next.19
39
+
40
+ ## 11.0.1-next.21
41
+
42
+ ### Patch Changes
43
+
44
+ - Updated dependencies [6a41721]
45
+ - @forge/manifest@8.7.0-next.7
46
+ - @forge/bundler@4.20.9-next.18
47
+ - @forge/cli-shared@6.6.1-next.13
48
+ - @forge/lint@5.7.1-next.15
49
+ - @forge/tunnel@5.9.3-next.18
50
+
51
+ ## 11.0.1-next.20
52
+
53
+ ### Patch Changes
54
+
55
+ - 321db2e: enable serial install execution
56
+ - Updated dependencies [321db2e]
57
+ - @forge/cli-shared@6.6.1-next.12
58
+ - @forge/bundler@4.20.9-next.17
59
+ - @forge/lint@5.7.1-next.14
60
+ - @forge/tunnel@5.9.3-next.17
61
+
62
+ ## 11.0.1-next.19
63
+
64
+ ### Patch Changes
65
+
66
+ - @forge/bundler@4.20.9-next.16
67
+ - @forge/tunnel@5.9.3-next.16
68
+
69
+ ## 11.0.1-next.18
70
+
71
+ ### Patch Changes
72
+
73
+ - Updated dependencies [89c96bf]
74
+ - @forge/egress@1.4.0-next.1
75
+ - @forge/lint@5.7.1-next.13
76
+ - @forge/bundler@4.20.9-next.15
77
+ - @forge/tunnel@5.9.3-next.15
78
+
79
+ ## 11.0.1-next.17
80
+
81
+ ### Patch Changes
82
+
83
+ - 2319dc4: Improve multi-select product table UI
84
+ - Updated dependencies [2319dc4]
85
+ - Updated dependencies [ddc0256]
86
+ - @forge/cli-shared@6.6.1-next.11
87
+ - @forge/manifest@8.7.0-next.6
88
+ - @forge/bundler@4.20.9-next.14
89
+ - @forge/lint@5.7.1-next.12
90
+ - @forge/tunnel@5.9.3-next.14
91
+
92
+ ## 11.0.1-next.16
93
+
94
+ ### Patch Changes
95
+
96
+ - Updated dependencies [dec434a]
97
+ - @forge/manifest@8.7.0-next.5
98
+ - @forge/bundler@4.20.9-next.13
99
+ - @forge/cli-shared@6.6.1-next.10
100
+ - @forge/lint@5.7.1-next.11
101
+ - @forge/tunnel@5.9.3-next.13
102
+
103
+ ## 11.0.1-next.15
104
+
105
+ ### Patch Changes
106
+
107
+ - d1b6fd5: Refactoring of SupportedProductsService.
108
+ - Updated dependencies [d1b6fd5]
109
+ - @forge/cli-shared@6.6.1-next.9
110
+ - @forge/bundler@4.20.9-next.12
111
+ - @forge/lint@5.7.1-next.10
112
+ - @forge/tunnel@5.9.3-next.12
113
+
3
114
  ## 11.0.1-next.14
4
115
 
5
116
  ### Patch Changes
package/npm-shrinkwrap.json CHANGED
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "11.0.1-next.14",
3
+ "version": "11.1.0-next.24",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "11.0.1-next.14",
9
+ "version": "11.1.0-next.24",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
13
- "@forge/bundler": "4.20.9-next.11",
14
- "@forge/cli-shared": "6.6.1-next.8",
15
- "@forge/egress": "1.4.0-next.0",
13
+ "@forge/bundler": "4.20.9-next.21",
14
+ "@forge/cli-shared": "6.6.1-next.16",
15
+ "@forge/egress": "1.4.0-next.2",
16
16
  "@forge/i18n": "0.0.3",
17
- "@forge/lint": "5.7.1-next.9",
18
- "@forge/manifest": "8.7.0-next.4",
17
+ "@forge/lint": "5.7.1-next.18",
18
+ "@forge/manifest": "8.7.0-next.8",
19
19
  "@forge/runtime": "5.10.6-next.0",
20
- "@forge/tunnel": "5.9.3-next.11",
20
+ "@forge/tunnel": "5.9.3-next.21",
21
21
  "@forge/util": "1.4.8-next.0",
22
22
  "@sentry/node": "7.106.0",
23
23
  "ajv": "^8.12.0",
@@ -833,9 +833,9 @@
833
833
  "license": "SEE LICENSE IN LICENSE.txt"
834
834
  },
835
835
  "node_modules/@forge/bundler": {
836
- "version": "4.20.9-next.11",
837
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.20.9-next.11.tgz",
838
- "integrity": "sha512-qe1gLfHsKIncAvJoAU/RaSR/SQcYvBcgtA6tZhFDrofeSp76UwEE4TrCUOMJzLfXMEjv6i6WY17euJUOmmCSiQ==",
836
+ "version": "4.20.9-next.21",
837
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.20.9-next.21.tgz",
838
+ "integrity": "sha512-RntZ2dcrBB8D9yRL4YUXwH0Kr93vjIHd72+lwNXZgFrD7IHHOpRUpg92hsj7FkUzep/xfBTf67b+ghquGqxk9g==",
839
839
  "license": "SEE LICENSE IN LICENSE.txt",
840
840
  "dependencies": {
841
841
  "@babel/core": "^7.24.0",
@@ -845,12 +845,12 @@
845
845
  "@babel/plugin-transform-optional-chaining": "^7.23.4",
846
846
  "@babel/plugin-transform-react-jsx": "^7.23.4",
847
847
  "@babel/preset-typescript": "^7.23.3",
848
- "@forge/api": "5.1.0-next.3",
848
+ "@forge/api": "5.1.0-next.6",
849
849
  "@forge/babel-plugin-transform-ui": "1.1.20",
850
- "@forge/cli-shared": "6.6.1-next.8",
850
+ "@forge/cli-shared": "6.6.1-next.16",
851
851
  "@forge/i18n": "0.0.3",
852
- "@forge/lint": "5.7.1-next.9",
853
- "@forge/manifest": "8.7.0-next.4",
852
+ "@forge/lint": "5.7.1-next.18",
853
+ "@forge/manifest": "8.7.0-next.8",
854
854
  "@forge/util": "1.4.8-next.0",
855
855
  "assert": "^2.1.0",
856
856
  "babel-loader": "^8.3.0",
@@ -889,13 +889,13 @@
889
889
  }
890
890
  },
891
891
  "node_modules/@forge/bundler/node_modules/@forge/api": {
892
- "version": "5.1.0-next.3",
893
- "resolved": "https://registry.npmjs.org/@forge/api/-/api-5.1.0-next.3.tgz",
894
- "integrity": "sha512-c5TWBRYubx1Iq7f09xD0ZHqkmi657S//HvoJZO8tyidl6x7Eb+IqUNUe36J92gVJRrWdZqdvartXeid4Xm+BYg==",
892
+ "version": "5.1.0-next.6",
893
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-5.1.0-next.6.tgz",
894
+ "integrity": "sha512-PprzeBkBUmAQOEY6AtKAr1gYzWaK3pfPOlnCT/lNzO6pkfKBOQOhUUr44J8xbbEm30/WALqgWPUBLn9lkisQ1A==",
895
895
  "license": "SEE LICENSE IN LICENSE.txt",
896
896
  "dependencies": {
897
897
  "@forge/auth": "0.0.6",
898
- "@forge/egress": "1.4.0-next.0",
898
+ "@forge/egress": "1.4.0-next.2",
899
899
  "@forge/storage": "1.7.2",
900
900
  "@forge/util": "1.4.8-next.0",
901
901
  "@types/node-fetch": "^2.6.11",
@@ -918,13 +918,13 @@
918
918
  "license": "SEE LICENSE IN LICENSE.txt"
919
919
  },
920
920
  "node_modules/@forge/cli-shared": {
921
- "version": "6.6.1-next.8",
922
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-6.6.1-next.8.tgz",
923
- "integrity": "sha512-Q2xgEjsxAvrM37U6GunFSjKR4VpxrJvgNzgUq38K+QFmHKsieG3BwCSfsSdSXwl6yGmtv1r0VhOGpjTy1afrag==",
921
+ "version": "6.6.1-next.16",
922
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-6.6.1-next.16.tgz",
923
+ "integrity": "sha512-JICVXNdwV20AkfKvOHScurK9W0INPdGQOXZ8fIKMyKNPXHyhcOMTWTmQLv1ZtieMvtnOOQ96fUh5LsMRInXU0A==",
924
924
  "license": "SEE LICENSE IN LICENSE.txt",
925
925
  "dependencies": {
926
926
  "@forge/i18n": "0.0.3",
927
- "@forge/manifest": "8.7.0-next.4",
927
+ "@forge/manifest": "8.7.0-next.8",
928
928
  "@forge/util": "1.4.8-next.0",
929
929
  "@sentry/node": "7.106.0",
930
930
  "adm-zip": "^0.5.10",
@@ -968,9 +968,9 @@
968
968
  }
969
969
  },
970
970
  "node_modules/@forge/egress": {
971
- "version": "1.4.0-next.0",
972
- "resolved": "https://registry.npmjs.org/@forge/egress/-/egress-1.4.0-next.0.tgz",
973
- "integrity": "sha512-lcoISp2nyNXSRSGqnWmjYsP4Y5SgdAe7mmFKXXh/D72PlTczXEuJbxEhmhrq51oZgjK3wiakrRO5DdF2Uqz+YQ==",
971
+ "version": "1.4.0-next.2",
972
+ "resolved": "https://registry.npmjs.org/@forge/egress/-/egress-1.4.0-next.2.tgz",
973
+ "integrity": "sha512-dQECjH2Ow+f5P+D0ctRFW2MAd4SgS3CyLaCfpKjhjNlmaBJCyLPQhbOhfdApM6tNpx56eI2oCqf5dVCYz3MmiA==",
974
974
  "license": "SEE LICENSE IN LICENSE.txt",
975
975
  "dependencies": {
976
976
  "minimatch": "^9.0.3"
@@ -986,15 +986,15 @@
986
986
  }
987
987
  },
988
988
  "node_modules/@forge/lint": {
989
- "version": "5.7.1-next.9",
990
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.7.1-next.9.tgz",
991
- "integrity": "sha512-NcdaCMr30vUbu+A/L33jnsVq+1a27qdGCpfthjfeSQwKQ/Yy/yYoTWePMO1xZciZOqr7pMl17nL1pDBl6DHovA==",
989
+ "version": "5.7.1-next.18",
990
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.7.1-next.18.tgz",
991
+ "integrity": "sha512-ck4fqBRIsjhWn53AM0puGycV5+HHmuuw3aLZY7MuZJ4Sv9zvioYmYe6aZBYBFA6TOgEXcV+vwhxJPv7qSGVtyQ==",
992
992
  "license": "SEE LICENSE IN LICENSE.txt",
993
993
  "dependencies": {
994
- "@forge/cli-shared": "6.6.1-next.8",
994
+ "@forge/cli-shared": "6.6.1-next.16",
995
995
  "@forge/csp": "3.6.1",
996
- "@forge/egress": "1.4.0-next.0",
997
- "@forge/manifest": "8.7.0-next.4",
996
+ "@forge/egress": "1.4.0-next.2",
997
+ "@forge/manifest": "8.7.0-next.8",
998
998
  "@typescript-eslint/typescript-estree": "^5.62.0",
999
999
  "array.prototype.flatmap": "^1.3.2",
1000
1000
  "atlassian-openapi": "^1.0.18",
@@ -1003,9 +1003,9 @@
1003
1003
  }
1004
1004
  },
1005
1005
  "node_modules/@forge/manifest": {
1006
- "version": "8.7.0-next.4",
1007
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-8.7.0-next.4.tgz",
1008
- "integrity": "sha512-HSfV816F5foiX3cSbEkpPfmRwQzVdhafm7QImsH4553hpNFidfvpnuDn3LxXARWfoQgozyGhRQNoXtKAnWsLow==",
1006
+ "version": "8.7.0-next.8",
1007
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-8.7.0-next.8.tgz",
1008
+ "integrity": "sha512-QJ3AaAfuD9R5BWLsLSaky0mSXjWmzxpRU3+4sIJdOIsr3IfCiUArz+ra6U27FB10n2G+M0uWmNEA0yKaORvIfA==",
1009
1009
  "license": "SEE LICENSE IN LICENSE.txt",
1010
1010
  "dependencies": {
1011
1011
  "@forge/i18n": "0.0.3",
@@ -1036,13 +1036,13 @@
1036
1036
  }
1037
1037
  },
1038
1038
  "node_modules/@forge/tunnel": {
1039
- "version": "5.9.3-next.11",
1040
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.9.3-next.11.tgz",
1041
- "integrity": "sha512-RqZe1w75PVDOfsgicLzHodhrN97xKjlzx7LOQkCzppjg8cEpUuixHfwAxc7BZHfXOMSZGHAfm1tDazh6GThV8Q==",
1039
+ "version": "5.9.3-next.21",
1040
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.9.3-next.21.tgz",
1041
+ "integrity": "sha512-ouxDwG601dgdzdTo093yA8IVlS7FOZTGbU1B0ShBueSyl/f4Rk+9watxadjinxwc3wE9JBefj5Fbl1Wglo2rYw==",
1042
1042
  "license": "SEE LICENSE IN LICENSE.txt",
1043
1043
  "dependencies": {
1044
- "@forge/bundler": "4.20.9-next.11",
1045
- "@forge/cli-shared": "6.6.1-next.8",
1044
+ "@forge/bundler": "4.20.9-next.21",
1045
+ "@forge/cli-shared": "6.6.1-next.16",
1046
1046
  "@forge/csp": "3.6.1",
1047
1047
  "@forge/runtime": "5.10.6-next.0",
1048
1048
  "chokidar": "^3.6.0",
package/out/command-line/command.d.ts CHANGED
@@ -81,7 +81,7 @@ export declare class Command<Args extends AnyArgs = [], Opts extends AnyOpts = D
81
81
  environmentOption(): Command<Args, Opts & {
82
82
  environment: string;
83
83
  }>;
84
- contextOption(supportedProducts: SupportedProduct[]): Command<Args, Opts & {
84
+ contextOption(): Command<Args, Opts & {
85
85
  site?: URL;
86
86
  product?: SupportedProduct;
87
87
  }>;
@@ -108,9 +108,9 @@ export declare function validateContext({ supportedProductsService, site, produc
108
108
  supportedProductsService: SupportedProductsService;
109
109
  site?: string;
110
110
  product?: string;
111
- }): Promise<{
111
+ }): {
112
112
  site?: URL;
113
113
  product?: SupportedProduct;
114
- }>;
114
+ };
115
115
  export {};
116
116
  //# sourceMappingURL=command.d.ts.map
package/out/command-line/command.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
package/out/command-line/command.js CHANGED
@@ -178,13 +178,13 @@ class Command {
178
178
  return { environment: (0, environment_1.checkEnvironmentOption)(environment) };
179
179
  });
180
180
  }
181
- contextOption(supportedProducts) {
181
+ contextOption() {
182
182
  const supportedProductsService = this.supportedProductsService;
183
183
  return this.option('-s, --site [site]', cli_shared_1.Text.optionSite)
184
- .option('-p, --product [product]', cli_shared_1.Text.optionProduct(supportedProducts))
184
+ .option('-p, --product [product]', cli_shared_1.Text.optionProduct(supportedProductsService.getSupportedProducts()))
185
185
  .precondition(async (...args) => {
186
186
  const { site, product } = last(args);
187
- return await validateContext({ supportedProductsService, site, product });
187
+ return validateContext({ supportedProductsService, site, product });
188
188
  });
189
189
  }
190
190
  jsonOption() {
@@ -427,14 +427,14 @@ function getAutocompleteConfig(cmd) {
427
427
  return { commands, options };
428
428
  }
429
429
  exports.getAutocompleteConfig = getAutocompleteConfig;
430
- async function validateContext({ supportedProductsService, site, product }) {
430
+ function validateContext({ supportedProductsService, site, product }) {
431
431
  let maybeSupportedProduct = undefined;
432
432
  let maybeSiteUrl = undefined;
433
433
  if (product !== undefined) {
434
- maybeSupportedProduct = await supportedProductsService.validateSupportedProduct(product);
434
+ maybeSupportedProduct = supportedProductsService.validateSupportedProduct(product);
435
435
  }
436
436
  if (site) {
437
- maybeSiteUrl = await supportedProductsService.validateSite(site, maybeSupportedProduct);
437
+ maybeSiteUrl = supportedProductsService.validateSite(site, maybeSupportedProduct);
438
438
  }
439
439
  return { site: maybeSiteUrl, product: maybeSupportedProduct };
440
440
  }
package/out/command-line/controller/install-controller.d.ts CHANGED
@@ -37,6 +37,8 @@ export declare class InstallController {
37
37
  private validateLicenseOption;
38
38
  private checkForUIKit1Modules;
39
39
  run({ environment, site, products, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }: InstallViewProps): Promise<void>;
40
+ private getXPAProductsAndSite;
41
+ private checkForMultiProductScopes;
40
42
  private extractAddedScopes;
41
43
  private isValidLicenseMode;
42
44
  private validateLicenseModes;
package/out/command-line/controller/install-controller.d.ts.map CHANGED
@@ -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,EAYF,wBAAwB,EAEzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAA2C,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAClH,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,MAAM,EAAE,CAAC;IACpB,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;AASD,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;YAmBjB,aAAa;YA2Bb,gBAAgB;IAwB9B,OAAO,CAAC,uCAAuC;IAa/C,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,qBAAqB;IAgB7B,OAAO,CAAC,qBAAqB,CAK3B;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;YA0JrB,kBAAkB;IAUhC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IA8B5B,OAAO,CAAC,uBAAuB;YAoBjB,8CAA8C;IAY5D,OAAO,CAAC,+BAA+B,CAWrC;CACH"}
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,EAYF,wBAAwB,EAGzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAA2C,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAClH,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,MAAM,EAAE,CAAC;IACpB,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;AASD,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;YAyBjB,aAAa;YA0Bb,gBAAgB;IAwB9B,OAAO,CAAC,uCAAuC;IAa/C,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,qBAAqB;IAgB7B,OAAO,CAAC,qBAAqB,CAK3B;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;IA+HnC,OAAO,CAAC,qBAAqB,CA8B3B;IAEF,OAAO,CAAC,0BAA0B,CAyBhC;YAEY,kBAAkB;IAUhC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IA8B5B,OAAO,CAAC,uBAAuB;YAoBjB,8CAA8C;IAY5D,OAAO,CAAC,+BAA+B,CAWrC;CACH"}
package/out/command-line/controller/install-controller.js CHANGED
@@ -43,7 +43,7 @@ class InstallController {
43
43
  }
44
44
  }
45
45
  async installOrUpgrade(upgrade, environment, environmentType, site, product, appId, text, license, overrides) {
46
- const isWorkspaceProduct = !!product && (await this.supportedProductsService.isWorkspaceProduct(product));
46
+ const isWorkspaceProduct = !!product && this.supportedProductsService.isWorkspaceProduct(product);
47
47
  return this.ui.displayProgress(async () => {
48
48
  if (upgrade) {
49
49
  const isAlreadyUpdated = await this.installationService.upgradeInstallation(site, product, environment, appId);
@@ -59,28 +59,31 @@ class InstallController {
59
59
  });
60
60
  return false;
61
61
  }
62
- }, text.cmd.start(environment, environmentType), (alreadyUpdated) => {
62
+ }, text.cmd.start(environment, environmentType, (0, cli_shared_1.productDisplayName)(product)), (alreadyUpdated) => {
63
63
  if (alreadyUpdated) {
64
64
  return isWorkspaceProduct
65
65
  ? cli_shared_1.Text.upgrade.alreadyUpdated.spinnerWorkspace
66
66
  : cli_shared_1.Text.upgrade.alreadyUpdated.spinnerSite;
67
67
  }
68
68
  else {
69
- return text.cmd.end(false);
69
+ return text.cmd.end(false, product);
70
70
  }
71
71
  });
72
72
  }
73
73
  async promptForProducts(requiredProducts) {
74
- this.ui.info(cli_shared_1.Text.installationContext.overviewProduct);
75
74
  if (requiredProducts?.length) {
76
- return await this.ui.promptForMultiSelectList(cli_shared_1.Text.installationContext.promptOptionalProducts, await this.supportedProductsService.getSupportedProducts(requiredProducts));
75
+ const supportedProducts = this.supportedProductsService.getSupportedSecondaryProductsForXPA(requiredProducts) ?? [];
76
+ const choices = supportedProducts.map((product) => ({ names: [product] }));
77
+ const selected = await this.ui.promptForTable(cli_shared_1.Text.installationContext.promptOptionalProducts, '', [], choices, true);
78
+ return selected.map((index) => supportedProducts[index]);
77
79
  }
80
+ this.ui.info(cli_shared_1.Text.installationContext.overviewProduct);
78
81
  return [
79
- await this.ui.promptForList(cli_shared_1.Text.installationContext.promptProduct, await this.supportedProductsService.getSupportedProducts())
82
+ await this.ui.promptForList(cli_shared_1.Text.installationContext.promptProduct, this.supportedProductsService.getSupportedProducts())
80
83
  ];
81
84
  }
82
85
  async promptForSite(products) {
83
- const isWorkspaceBased = products.length > 0 && (await this.supportedProductsService.isWorkspaceProduct(products[0]));
86
+ const isWorkspaceBased = products.length > 0 && this.supportedProductsService.isWorkspaceProduct(products[0]);
84
87
  const overviewText = isWorkspaceBased
85
88
  ? cli_shared_1.Text.installationContext.overviewWorkspace
86
89
  : cli_shared_1.Text.installationContext.overviewSite;
@@ -104,7 +107,7 @@ class InstallController {
104
107
  const { site, product, environmentKey, environmentType } = await this.installView.promptForUpgrade(installations);
105
108
  const productName = (0, cli_shared_1.productDisplayName)(product);
106
109
  return {
107
- site: await this.supportedProductsService.validateSite(site, productName),
110
+ site: this.supportedProductsService.validateSite(site, productName),
108
111
  product: productName,
109
112
  environment: environmentKey,
110
113
  environmentType
@@ -153,7 +156,6 @@ class InstallController {
153
156
  const text = upgrade ? cli_shared_1.Text.upgrade : cli_shared_1.Text.install;
154
157
  const validLicense = this.validateLicenseOption(license, environment);
155
158
  const overrides = await this.validateEcosystemAppInstallationOverridesInput(licenseModes, usersWithAccess, environment);
156
- const { installations } = (await this.installationService.listAppInstallations()) ?? [];
157
159
  const environmentPermissions = await this.installationService.getAppEnvironmentPermissions(id, environment);
158
160
  const requiredProducts = environmentPermissions?.requiredProducts;
159
161
  if (upgrade && (!site || !products?.length)) {
@@ -165,33 +167,17 @@ class InstallController {
165
167
  if (!requiredProducts?.length) {
166
168
  products = products?.length ? products : await this.promptForProducts();
167
169
  site = site ? site : await this.promptForSite(products);
170
+ const bannerText = (await this.supportedProductsService.isWorkspaceProduct(products[0]))
171
+ ? text.bannerWorkspace
172
+ : text.bannerSite;
173
+ this.ui.info(bannerText);
168
174
  }
169
175
  else {
170
- site = site ? site : await this.promptForSite([]);
171
- if (!products?.length) {
172
- const hasRequiredInstallations = this.checkRequiredInstallationExists(installations, site.host, requiredProducts);
173
- if (hasRequiredInstallations) {
174
- this.ui.info(cli_shared_1.Text.install.alreadyInstalledInRequiredProduct(requiredProducts[0]));
175
- products = products?.length ? products : await this.promptForProducts(requiredProducts);
176
- }
177
- else {
178
- this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(requiredProducts[0]));
179
- products = requiredProducts;
180
- }
181
- }
182
- else {
183
- if (requiredProducts.includes(products[0])) {
184
- this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(products[0]));
185
- }
186
- else {
187
- this.ui.info(cli_shared_1.Text.install.installingToOptionalProduct);
188
- }
189
- }
176
+ const result = await this.getXPAProductsAndSite(requiredProducts.map(cli_shared_1.productDisplayName), products, site);
177
+ site = result.site;
178
+ products = result.products;
179
+ this.ui.info(cli_shared_1.Text.install.installConfirmation(products.join(', '), site.host));
190
180
  }
191
- const bannerText = (await this.supportedProductsService.isWorkspaceProduct(products[0]))
192
- ? text.bannerWorkspace
193
- : text.bannerSite;
194
- this.ui.info(bannerText);
195
181
  if ((0, cli_shared_1.isSecureSite)(site)) {
196
182
  await this.securityPrompt(site);
197
183
  }
@@ -216,32 +202,82 @@ class InstallController {
216
202
  const scopesConfirmationResult = await this.installView.promptForPermissionsConfirmation(environmentPermissions, addedScopes, [...manifestScopes], manifestEgressAddresses, environment, confirmScopes, !!nonInteractive, text);
217
203
  if (!scopesConfirmationResult)
218
204
  return;
205
+ const successfulProducts = [];
206
+ const failedProducts = [];
219
207
  for (const product of products) {
220
- const isAlreadyUpdated = await this.installOrUpgrade(upgrade, environment, environmentType, site, product, id, text, validLicense, overrides);
221
- if (isAlreadyUpdated) {
222
- this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, product, site.host));
208
+ try {
209
+ const isAlreadyUpdated = await this.installOrUpgrade(upgrade, environment, environmentType, site, product, id, text, validLicense, overrides);
210
+ if (isAlreadyUpdated) {
211
+ this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, (0, cli_shared_1.productDisplayName)(product), site.host));
212
+ }
213
+ else {
214
+ this.ui.clearSpinner();
215
+ this.ui.emptyLine();
216
+ successfulProducts.push(product);
217
+ }
223
218
  }
224
- else {
225
- this.ui.emptyLine();
226
- this.ui.info(text.success.banner(environment, environmentType, product, site.host));
227
- const uniqueProductsFromScopes = this.getUniqueInstallationProductsFromScopes(environmentScopes);
228
- if (!uniqueProductsFromScopes || uniqueProductsFromScopes.length <= 1)
229
- return;
230
- const { installations } = await this.installationService.listNonTechnicalAppInstallations({
231
- site,
232
- environment
233
- });
234
- const productsToUpgrade = installations
235
- .filter((installation) => !installation.version.isLatest)
236
- .map((installation) => installation.product);
237
- const installedProducts = installations.map((installation) => installation.product);
238
- const productsToInstall = uniqueProductsFromScopes.filter((product) => !installedProducts.includes(product));
239
- if (!productsToInstall.length && productsToUpgrade.length === 0)
240
- return;
241
- this.ui.warn(cli_shared_1.Text.install.multiProductScopesDetected(productsToInstall, productsToUpgrade, site.host, environment));
219
+ catch (error) {
220
+ this.ui.clearSpinner();
221
+ this.ui.error(error);
222
+ failedProducts.push(product);
242
223
  }
224
+ await this.checkForMultiProductScopes(environmentScopes, site, environment);
225
+ }
226
+ if (successfulProducts.length) {
227
+ this.ui.info(text.success.banner(environment, environmentType, (0, cli_shared_1.productDisplayName)(successfulProducts.join(', ')), site.host));
228
+ }
229
+ else {
230
+ this.ui.info(cli_shared_1.Text.install.failedAll(site, environment));
231
+ }
232
+ if (failedProducts.length) {
233
+ throw new cli_shared_1.PartialInstallationError(cli_shared_1.Text.error.partialInstallation(failedProducts));
243
234
  }
244
235
  }
236
+ getXPAProductsAndSite = async (requiredProducts, products, site) => {
237
+ const { installations } = (await this.installationService.listAppInstallations()) ?? [];
238
+ site = site ? site : await this.promptForSite([]);
239
+ if (!products?.length) {
240
+ const hasRequiredInstallations = this.checkRequiredInstallationExists(installations, site.host, requiredProducts);
241
+ if (hasRequiredInstallations) {
242
+ this.ui.info(cli_shared_1.Text.install.alreadyInstalledInRequiredProduct(requiredProducts[0]));
243
+ products = products?.length ? products : await this.promptForProducts(requiredProducts);
244
+ }
245
+ else {
246
+ this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(requiredProducts[0]));
247
+ products = requiredProducts;
248
+ }
249
+ }
250
+ else {
251
+ const allowedProducts = this.supportedProductsService.getSupportedSecondaryProductsForXPA([]);
252
+ if (products.some((product) => !allowedProducts.includes(product))) {
253
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidProduct);
254
+ }
255
+ if (requiredProducts.includes(products[0])) {
256
+ this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(products[0]));
257
+ }
258
+ else {
259
+ this.ui.info(cli_shared_1.Text.install.installingToOptionalProduct(products[0]));
260
+ }
261
+ }
262
+ return { site, products };
263
+ };
264
+ checkForMultiProductScopes = async (environmentScopes, site, environment) => {
265
+ const uniqueProductsFromScopes = this.getUniqueInstallationProductsFromScopes(environmentScopes);
266
+ if (!uniqueProductsFromScopes || uniqueProductsFromScopes.length <= 1)
267
+ return;
268
+ const { installations: nonTechnicalInstallations } = await this.installationService.listNonTechnicalAppInstallations({
269
+ site,
270
+ environment
271
+ });
272
+ const productsToUpgrade = nonTechnicalInstallations
273
+ .filter((installation) => !installation.version.isLatest)
274
+ .map((installation) => installation.product);
275
+ const installedProducts = nonTechnicalInstallations.map((installation) => installation.product);
276
+ const productsToInstall = uniqueProductsFromScopes.filter((product) => !installedProducts.includes(product));
277
+ if (productsToInstall.length === 0 && productsToUpgrade.length === 0)
278
+ return;
279
+ this.ui.warn(cli_shared_1.Text.install.multiProductScopesDetected(productsToInstall, productsToUpgrade, site.host, environment));
280
+ };
245
281
  async extractAddedScopes({ addedScopes }) {
246
282
  const scopesWithInteractiveConsent = (0, manifest_1.getScopesWithInteractiveConsent)();
247
283
  return addedScopes.map((scope) => ({
package/out/command-line/dependency-injection.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8XvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoYvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
package/out/command-line/dependency-injection.js CHANGED
@@ -97,7 +97,7 @@ const getDependencies = async (cliDetails) => {
97
97
  const credentialStore = (0, cli_shared_1.getCredentialStore)(ui, userRepository);
98
98
  const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, credentialStore, appConfigReader);
99
99
  const statsigService = new cli_shared_1.StatsigService(ui, cliDetails, credentialStore, appConfigReader);
100
- const supportedProductsService = new cli_shared_1.SupportedProductsService(statsigService);
100
+ const supportedProductsService = new cli_shared_1.SupportedProductsService();
101
101
  const settingsView = new settings_view_1.SettingsView(ui);
102
102
  const settingsController = new settings_controller_1.SettingsController(settingsView, cachedConfigService, assertiveAppConfigReader);
103
103
  const liteLintView = new lite_lint_view_1.LiteLintView(ui);
@@ -199,6 +199,7 @@ const getDependencies = async (cliDetails) => {
199
199
  const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, cliDetails);
200
200
  const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, userRepository, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery);
201
201
  cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, featureFlagService, supportedProductsService);
202
+ await supportedProductsService.initializeWithSupportedProducts(statsigService);
202
203
  return {
203
204
  ui,
204
205
  cmd,
package/out/command-line/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Dependencies } from './dependency-injection';
2
- export declare function registerCommands(deps: Dependencies): Promise<void>;
2
+ export declare function registerCommands(deps: Dependencies): void;
3
3
  export declare const main: () => Promise<void>;
4
4
  //# sourceMappingURL=index.d.ts.map
package/out/command-line/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBAkBxD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAkBlD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}
package/out/command-line/index.js CHANGED
@@ -21,18 +21,18 @@ const register_environments_commands_1 = require("./register-environments-comman
21
21
  const register_storage_commands_1 = require("./register-storage-commands");
22
22
  const register_eligibility_commands_1 = require("./register-eligibility-commands");
23
23
  const register_version_commands_1 = require("./register-version-commands");
24
- async function registerCommands(deps) {
24
+ function registerCommands(deps) {
25
25
  (0, register_autocomplete_commands_1.registerCommands)(deps);
26
26
  (0, register_authentication_command_1.registerCommands)(deps);
27
27
  (0, register_app_commands_1.registerCommands)(deps);
28
28
  (0, register_deployment_commands_1.registerCommands)(deps);
29
- await (0, register_installation_commands_1.registerCommands)(deps);
29
+ (0, register_installation_commands_1.registerCommands)(deps);
30
30
  (0, register_environments_commands_1.registerCommands)(deps);
31
31
  (0, register_environment_variables_commands_1.registerCommands)(deps);
32
32
  (0, register_lint_command_1.registerCommands)(deps);
33
33
  (0, register_log_commands_1.registerCommands)(deps);
34
34
  (0, register_tunnel_commands_1.registerCommands)(deps);
35
- await (0, register_webtrigger_commands_1.registerCommands)(deps);
35
+ (0, register_webtrigger_commands_1.registerCommands)(deps);
36
36
  (0, register_feedback_commands_1.registerCommands)(deps);
37
37
  (0, register_settings_commands_1.registerCommands)(deps);
38
38
  (0, register_providers_commands_1.registerCommands)(deps);
@@ -50,7 +50,7 @@ const main = async () => {
50
50
  const cliDetails = (0, version_info_1.getCLIDetails)();
51
51
  const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
52
52
  registerEvents(deps);
53
- await registerCommands(deps);
53
+ registerCommands(deps);
54
54
  await deps.controllers.prerequisitesController.check();
55
55
  await deps.cmd.parse(process.argv);
56
56
  };
package/out/command-line/register-installation-commands.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Dependencies } from './dependency-injection';
2
2
  export declare const registerListInstallationsCommand: ({ cmd, ui, services: { installationsService } }: Dependencies) => void;
3
- export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => Promise<void>;
3
+ export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => void;
4
4
  //# sourceMappingURL=register-installation-commands.d.ts.map
package/out/command-line/register-installation-commands.d.ts.map CHANGED
@@ -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;AA2DtD,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAmC7G,CAAC;AA6EF,eAAO,MAAM,gBAAgB,qBAA4B,YAAY,KAAG,QAAQ,IAAI,CAenF,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,SAmC7G,CAAC;AA2EF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
package/out/command-line/register-installation-commands.js CHANGED
@@ -6,12 +6,11 @@ const shared_1 = require("../installations/shared");
6
6
  const uninstall_command_helpers_1 = require("./uninstall-command-helpers");
7
7
  const semver_1 = require("semver");
8
8
  const COMMAND_NAME = 'install';
9
- const registerInstallAppCommand = async ({ cmd, controllers: { installController }, services: { supportedProductsService } }) => {
10
- const supportedProducts = await supportedProductsService.getSupportedProducts();
9
+ const registerInstallAppCommand = ({ cmd, controllers: { installController } }) => {
11
10
  cmd
12
11
  .requireAppId()
13
12
  .environmentOption()
14
- .contextOption(supportedProducts)
13
+ .contextOption()
15
14
  .option('--upgrade', cli_shared_1.Text.install.optionUpgrade, false)
16
15
  .option('--confirm-scopes', cli_shared_1.Text.install.optionConfirmScopes, false)
17
16
  .option('-l, --license [license]', cli_shared_1.Text.install.optionLicense)
@@ -65,12 +64,11 @@ const registerListInstallationsCommand = ({ cmd, ui, services: { installationsSe
65
64
  });
66
65
  };
67
66
  exports.registerListInstallationsCommand = registerListInstallationsCommand;
68
- const registerUninstallCommand = async (deps) => {
69
- const { cmd, ui, services: { installationsService, supportedProductsService } } = deps;
70
- const supportedProducts = await supportedProductsService.getSupportedProducts();
67
+ const registerUninstallCommand = (deps) => {
68
+ const { cmd, ui, services: { installationsService } } = deps;
71
69
  cmd
72
70
  .command('uninstall')
73
- .contextOption(supportedProducts)
71
+ .contextOption()
74
72
  .environmentOption()
75
73
  .requireAppId()
76
74
  .description(cli_shared_1.Text.uninstall.cmd.desc)
@@ -111,11 +109,11 @@ const registerUninstallCommand = async (deps) => {
111
109
  });
112
110
  };
113
111
  const DEPRECATED_LIST_COMMAND = 'install:list';
114
- const registerCommands = async ({ cmd, ...deps }) => {
112
+ const registerCommands = ({ cmd, ...deps }) => {
115
113
  const install = cmd.command(COMMAND_NAME).description(cli_shared_1.Text.variables.description);
116
- await registerUninstallCommand({ cmd, ...deps });
114
+ registerUninstallCommand({ cmd, ...deps });
117
115
  cmd.deprecatedCommand(DEPRECATED_LIST_COMMAND, `${COMMAND_NAME} ${LIST_COMMAND_NAME}`, deps.controllers.stubController);
118
- await registerInstallAppCommand({ cmd: install, ...deps });
116
+ registerInstallAppCommand({ cmd: install, ...deps });
119
117
  (0, exports.registerListInstallationsCommand)({ cmd: install, ...deps });
120
118
  };
121
119
  exports.registerCommands = registerCommands;
package/out/command-line/register-webtrigger-commands.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { Dependencies } from './dependency-injection';
2
- export declare const registerCommands: ({ cmd, ui, configFile, services: { installationsService, supportedProductsService }, commands: { getWebTriggerURLCommand } }: Dependencies) => Promise<void>;
2
+ export declare const registerCommands: ({ cmd, ui, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }: Dependencies) => void;
3
3
  //# sourceMappingURL=register-webtrigger-commands.d.ts.map
package/out/command-line/register-webtrigger-commands.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-webtrigger-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAgCtD,eAAO,MAAM,gBAAgB,iIAM1B,YAAY,kBAyDd,CAAC"}
1
+ {"version":3,"file":"register-webtrigger-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAgCtD,eAAO,MAAM,gBAAgB,uGAM1B,YAAY,SAsDd,CAAC"}
package/out/command-line/register-webtrigger-commands.js CHANGED
@@ -26,7 +26,7 @@ function manifestDefinesTriggers(configFile) {
26
26
  await getValidWebtriggers(configFile);
27
27
  };
28
28
  }
29
- const registerCommands = async ({ cmd, ui, configFile, services: { installationsService, supportedProductsService }, commands: { getWebTriggerURLCommand } }) => {
29
+ const registerCommands = ({ cmd, ui, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }) => {
30
30
  const validateWebtriggerKey = async (functionKey) => {
31
31
  const availableWebTriggers = await getValidWebtriggers(configFile);
32
32
  if (functionKey) {
@@ -40,13 +40,12 @@ const registerCommands = async ({ cmd, ui, configFile, services: { installations
40
40
  return await ui.promptForList(cli_shared_1.Text.webtrigger.promptFuncKey, options);
41
41
  }
42
42
  };
43
- const supportedProducts = await supportedProductsService.getSupportedProducts();
44
43
  cmd
45
44
  .command('webtrigger')
46
45
  .requireAppId()
47
46
  .description(cli_shared_1.Text.webtrigger.cmd)
48
47
  .option('-f, --functionKey [function]', cli_shared_1.Text.webtrigger.optionFuncKey)
49
- .contextOption(supportedProducts)
48
+ .contextOption()
50
49
  .environmentOption()
51
50
  .precondition(manifestDefinesTriggers(configFile))
52
51
  .action(async ({ functionKey, site, environment, product }) => {
package/out/service/version-service.d.ts CHANGED
@@ -61,6 +61,7 @@ export interface VersionOverview {
61
61
  export declare class VersionService {
62
62
  private readonly getAppConfig;
63
63
  private readonly versionDetailsClient;
64
+ private readonly adapters;
64
65
  constructor(getAppConfig: AppConfigProvider, versionDetailsClient: AppVersionDetailsClient);
65
66
  private filterOutEmpty;
66
67
  private getEgresses;
@@ -73,5 +74,7 @@ export declare class VersionService {
73
74
  private removeInternalPropertiesFromObject;
74
75
  private getAppVersions;
75
76
  getAppVersionOverviewList(environmentKey: string): Promise<VersionOverview[]>;
77
+ private applyPropertyAdapter;
78
+ private addDefaultTypeToLegacyWebtriggerDetails;
76
79
  }
77
80
  //# sourceMappingURL=version-service.d.ts.map
package/out/service/version-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version-service.d.ts","sourceRoot":"","sources":["../../src/service/version-service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAOnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,IAAI,CAAC;IACzB,eAAe,EAAE,kBAAkB,CAAC;IACpC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,GAAG,CAAA;SAAE,EAAE,CAAA;KAAE,EAAE,CAAC;IACvE,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IAClD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACjD,WAAW,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAChD,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;CACnE;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,IAAI,CAAC;IACzB,eAAe,EAAE,kBAAkB,CAAC;IACpC,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IACJ,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IACJ,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IACJ,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBADpB,YAAY,EAAE,iBAAiB,EAC/B,oBAAoB,EAAE,uBAAuB;IAGhE,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,WAAW;IA4BnB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,YAAY;IAmDP,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IA4BzG,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,kCAAkC;YAM5B,cAAc;IAKf,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;CAsB3F"}
1
+ {"version":3,"file":"version-service.d.ts","sourceRoot":"","sources":["../../src/service/version-service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAOnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,IAAI,CAAC;IACzB,eAAe,EAAE,kBAAkB,CAAC;IACpC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,GAAG,CAAA;SAAE,EAAE,CAAA;KAAE,EAAE,CAAC;IACvE,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IAClD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACjD,WAAW,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAChD,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;CACnE;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,IAAI,CAAC;IACzB,eAAe,EAAE,kBAAkB,CAAC;IACpC,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IACJ,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IACJ,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IACJ,eAAe,EAAE,OAAO,CAAC;CAC1B;AAOD,qBAAa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IAHvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuE;gBAE7E,YAAY,EAAE,iBAAiB,EAC/B,oBAAoB,EAAE,uBAAuB;IAGhE,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,WAAW;IA4BnB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,YAAY;IAmDP,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAgCzG,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,kCAAkC;YAM5B,cAAc;IAKf,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAuB1F,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,uCAAuC;CAmBhD"}
package/out/service/version-service.js CHANGED
@@ -7,6 +7,7 @@ const manifest_1 = require("@forge/manifest");
7
7
  class VersionService {
8
8
  getAppConfig;
9
9
  versionDetailsClient;
10
+ adapters = [this.addDefaultTypeToLegacyWebtriggerDetails];
10
11
  constructor(getAppConfig, versionDetailsClient) {
11
12
  this.getAppConfig = getAppConfig;
12
13
  this.versionDetailsClient = versionDetailsClient;
@@ -83,7 +84,7 @@ class VersionService {
83
84
  const functionModules = data.modules?.filter((mod) => mod?.extensionData.type === manifest_1.AllModuleTypes.CoreFunction);
84
85
  const remoteModules = data.modules?.filter((mod) => mod?.extensionData.type === manifest_1.AllModuleTypes.CoreRemote);
85
86
  const allModules = this.getModulesGroupedByTypes(data.modules);
86
- return {
87
+ const appDetails = {
87
88
  requiresLicense: data.requiresLicense,
88
89
  egresses: this.getEgresses(data.permissions?.[0].egress, remoteModules),
89
90
  scopes: data.permissions?.[0].scopes.map((scope) => scope.key).sort() || [],
@@ -102,6 +103,8 @@ class VersionService {
102
103
  operations: entry.extensionData.operations || []
103
104
  }))
104
105
  };
106
+ this.applyPropertyAdapter(appDetails);
107
+ return appDetails;
105
108
  }
106
109
  getTypeFromPermissionType(permissionType) {
107
110
  switch (permissionType) {
@@ -159,5 +162,32 @@ class VersionService {
159
162
  requiresLicense: entry.requiresLicense
160
163
  }));
161
164
  }
165
+ applyPropertyAdapter(appDetails) {
166
+ for (const adapter of this.adapters) {
167
+ for (const [property, propertyDetails] of Object.entries(appDetails)) {
168
+ const [propertyKey, updatedPropertyDetails] = adapter([property, propertyDetails]);
169
+ Object.defineProperty(appDetails, propertyKey, { value: updatedPropertyDetails });
170
+ }
171
+ }
172
+ }
173
+ addDefaultTypeToLegacyWebtriggerDetails(params) {
174
+ if (params[0] === 'modules') {
175
+ for (const module of params[1]) {
176
+ if (module.type !== 'webtrigger')
177
+ continue;
178
+ for (const wt of module.items) {
179
+ if (!wt.properties.response) {
180
+ wt.properties = {
181
+ ...wt.properties,
182
+ response: {
183
+ type: 'dynamic (default)'
184
+ }
185
+ };
186
+ }
187
+ }
188
+ }
189
+ }
190
+ return params;
191
+ }
162
192
  }
163
193
  exports.VersionService = VersionService;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "11.0.1-next.14",
3
+ "version": "11.1.0-next.24",
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,13 +18,13 @@
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-next.11",
22
- "@forge/cli-shared": "6.6.1-next.8",
23
- "@forge/egress": "1.4.0-next.0",
24
- "@forge/lint": "5.7.1-next.9",
25
- "@forge/manifest": "8.7.0-next.4",
21
+ "@forge/bundler": "4.20.9-next.21",
22
+ "@forge/cli-shared": "6.6.1-next.16",
23
+ "@forge/egress": "1.4.0-next.2",
24
+ "@forge/lint": "5.7.1-next.18",
25
+ "@forge/manifest": "8.7.0-next.8",
26
26
  "@forge/runtime": "5.10.6-next.0",
27
- "@forge/tunnel": "5.9.3-next.11",
27
+ "@forge/tunnel": "5.9.3-next.21",
28
28
  "@forge/util": "1.4.8-next.0",
29
29
  "@sentry/node": "7.106.0",
30
30
  "@forge/i18n": "0.0.3",