@forge/cli 11.2.0 → 11.2.1-next.2-experimental-611b366

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 (12) hide show
  1. package/CHANGELOG.md +50 -0
  2. package/npm-shrinkwrap.json +35 -35
  3. package/out/command-line/controller/install-controller.d.ts +1 -1
  4. package/out/command-line/controller/install-controller.d.ts.map +1 -1
  5. package/out/command-line/controller/install-controller.js +5 -4
  6. package/out/command-line/uninstall-command-helpers.js +1 -1
  7. package/out/command-line/view/install-view.d.ts +3 -3
  8. package/out/command-line/view/install-view.d.ts.map +1 -1
  9. package/out/command-line/view/install-view.js +3 -3
  10. package/out/deploy/deployer/deployer.d.ts.map +1 -1
  11. package/out/deploy/deployer/deployer.js +6 -1
  12. package/package.json +6 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,55 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 11.2.1-next.2-experimental-611b366
4
+
5
+ ### Patch Changes
6
+
7
+ - 2cdac63: forge install should list all scopes
8
+ - 999a9d0: Update error messages for deployment
9
+ - b4cee28: Fix uninstall message
10
+ - Updated dependencies [2cdac63]
11
+ - Updated dependencies [999a9d0]
12
+ - Updated dependencies [94e48b9]
13
+ - @forge/cli-shared@6.7.1-next.2-experimental-611b366
14
+ - @forge/manifest@8.9.0-next.0-experimental-611b366
15
+ - @forge/bundler@4.21.1-next.2-experimental-611b366
16
+ - @forge/lint@5.7.3-next.2-experimental-611b366
17
+ - @forge/tunnel@5.10.1-next.2-experimental-611b366
18
+
19
+ ## 11.2.1-next.2
20
+
21
+ ### Patch Changes
22
+
23
+ - b4cee28: Fix uninstall message
24
+ - Updated dependencies [94e48b9]
25
+ - @forge/manifest@8.9.0-next.0
26
+ - @forge/bundler@4.21.1-next.2
27
+ - @forge/cli-shared@6.7.1-next.2
28
+ - @forge/lint@5.7.3-next.2
29
+ - @forge/tunnel@5.10.1-next.2
30
+
31
+ ## 11.2.1-next.1
32
+
33
+ ### Patch Changes
34
+
35
+ - 2cdac63: forge install should list all scopes
36
+ - Updated dependencies [2cdac63]
37
+ - @forge/cli-shared@6.7.1-next.1
38
+ - @forge/bundler@4.21.1-next.1
39
+ - @forge/lint@5.7.3-next.1
40
+ - @forge/tunnel@5.10.1-next.1
41
+
42
+ ## 11.2.1-next.0
43
+
44
+ ### Patch Changes
45
+
46
+ - 999a9d0: Update error messages for deployment
47
+ - Updated dependencies [999a9d0]
48
+ - @forge/cli-shared@6.7.1-next.0
49
+ - @forge/bundler@4.21.1-next.0
50
+ - @forge/lint@5.7.3-next.0
51
+ - @forge/tunnel@5.10.1-next.0
52
+
3
53
  ## 11.2.0
4
54
 
5
55
  ### Minor Changes
package/npm-shrinkwrap.json CHANGED
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "11.2.0",
3
+ "version": "11.2.1-next.2-experimental-611b366",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "11.2.0",
9
+ "version": "11.2.1-next.2-experimental-611b366",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
13
- "@forge/bundler": "4.21.0",
14
- "@forge/cli-shared": "6.7.0",
13
+ "@forge/bundler": "4.21.1-next.2-experimental-611b366",
14
+ "@forge/cli-shared": "6.7.1-next.2-experimental-611b366",
15
15
  "@forge/egress": "1.4.0",
16
16
  "@forge/i18n": "0.0.4",
17
- "@forge/lint": "5.7.2",
18
- "@forge/manifest": "8.8.0",
17
+ "@forge/lint": "5.7.3-next.2-experimental-611b366",
18
+ "@forge/manifest": "8.9.0-next.0-experimental-611b366",
19
19
  "@forge/runtime": "5.10.7",
20
- "@forge/tunnel": "5.10.0",
20
+ "@forge/tunnel": "5.10.1-next.2-experimental-611b366",
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.21.0",
838
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.21.0.tgz",
839
- "integrity": "sha512-z8xgolQynABbVaNK+a+Gjx0QxFmEVNmvOycjp2eMlDt+K+n22b93ReVWxxpRBPhTvl7m9CPLj0YCKh5iwvXzQA==",
837
+ "version": "4.21.1-next.2-experimental-611b366",
838
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.21.1-next.2-experimental-611b366.tgz",
839
+ "integrity": "sha512-SUkcoi2LbSTgc11L+hcgKc3P3CMm93EYO4AFokfa2FIdYMXv6x5X8s4fPJPLm6t8vdC6Yfd4TLaR2+C60IGzpw==",
840
840
  "license": "SEE LICENSE IN LICENSE.txt",
841
841
  "dependencies": {
842
842
  "@babel/core": "^7.24.0",
@@ -848,10 +848,10 @@
848
848
  "@babel/preset-typescript": "^7.23.3",
849
849
  "@forge/api": "5.1.1",
850
850
  "@forge/babel-plugin-transform-ui": "1.1.21",
851
- "@forge/cli-shared": "6.7.0",
851
+ "@forge/cli-shared": "6.7.1-next.2-experimental-611b366",
852
852
  "@forge/i18n": "0.0.4",
853
- "@forge/lint": "5.7.2",
854
- "@forge/manifest": "8.8.0",
853
+ "@forge/lint": "5.7.3-next.2-experimental-611b366",
854
+ "@forge/manifest": "8.9.0-next.0-experimental-611b366",
855
855
  "@forge/util": "1.4.8",
856
856
  "assert": "^2.1.0",
857
857
  "babel-loader": "^8.3.0",
@@ -919,13 +919,13 @@
919
919
  "license": "SEE LICENSE IN LICENSE.txt"
920
920
  },
921
921
  "node_modules/@forge/cli-shared": {
922
- "version": "6.7.0",
923
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-6.7.0.tgz",
924
- "integrity": "sha512-6XwrAKhNejivZ5kaJV905Dnl2hY8bn1I7/sX9ksDCkTUtERpZUaVhZHZai5A7ouPbksnixSPD0TjHFu0LnAxRQ==",
922
+ "version": "6.7.1-next.2-experimental-611b366",
923
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-6.7.1-next.2-experimental-611b366.tgz",
924
+ "integrity": "sha512-wpRNnfYPJiQd+E5N0EQujpTOr8Ys9uCC6rtKi2pZ0KKMPgWD3GzUoOfV8dEWsIDnB9s8EpajCBHg7xRlBn0ekg==",
925
925
  "license": "SEE LICENSE IN LICENSE.txt",
926
926
  "dependencies": {
927
927
  "@forge/i18n": "0.0.4",
928
- "@forge/manifest": "8.8.0",
928
+ "@forge/manifest": "8.9.0-next.0-experimental-611b366",
929
929
  "@forge/util": "1.4.8",
930
930
  "@sentry/node": "7.106.0",
931
931
  "adm-zip": "^0.5.10",
@@ -958,9 +958,9 @@
958
958
  }
959
959
  },
960
960
  "node_modules/@forge/csp": {
961
- "version": "3.6.2",
962
- "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-3.6.2.tgz",
963
- "integrity": "sha512-G6KVTiiZe1O/tpuSz6WgM8qgiRqf+E6GQeQDnmPlQlaGmur8qrKA2wHWmZtSgV3PuDt1Vts/ISCPa9mQtohIVw==",
961
+ "version": "3.6.2-experimental-611b366",
962
+ "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-3.6.2-experimental-611b366.tgz",
963
+ "integrity": "sha512-y73arlJF1Zd1V2CVsC0ELrjp5Cv94xSam4gRuvpcL0rlsweJRVG8WSNTqy/Mv0q6P7PM14tpbNhPf5v4yNcc6A==",
964
964
  "license": "SEE LICENSE IN LICENSE.txt",
965
965
  "dependencies": {
966
966
  "cheerio": "^0.22.0",
@@ -986,15 +986,15 @@
986
986
  }
987
987
  },
988
988
  "node_modules/@forge/lint": {
989
- "version": "5.7.2",
990
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.7.2.tgz",
991
- "integrity": "sha512-PRTzWN+QiyYpb/ZErEOiTQwy4sJi3XBSbydu2RkRsL0QjL9SB1Pw7dY0NkHtQ/eMa6ufGyEY163QZ6ChdiKcVg==",
989
+ "version": "5.7.3-next.2-experimental-611b366",
990
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.7.3-next.2-experimental-611b366.tgz",
991
+ "integrity": "sha512-O8Y3jBMIPAEQoy4LZNg2y8WnMUVMqF9p14jWkZkSxp3yYqxetAD1l1H2VdJS9ibw38ABFBiifOkfumSgIhi2SQ==",
992
992
  "license": "SEE LICENSE IN LICENSE.txt",
993
993
  "dependencies": {
994
- "@forge/cli-shared": "6.7.0",
995
- "@forge/csp": "3.6.2",
994
+ "@forge/cli-shared": "6.7.1-next.2-experimental-611b366",
995
+ "@forge/csp": "3.6.2-experimental-611b366",
996
996
  "@forge/egress": "1.4.0",
997
- "@forge/manifest": "8.8.0",
997
+ "@forge/manifest": "8.9.0-next.0-experimental-611b366",
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.8.0",
1007
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-8.8.0.tgz",
1008
- "integrity": "sha512-omAGuLZkR1V5qGFuKX1c5KgurSAYrNlwfMpLYWb8ju0BLEHac9iXRjM9RxvYkkwTuLz9eX9R8SEEVJ8NPJu5oA==",
1006
+ "version": "8.9.0-next.0-experimental-611b366",
1007
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-8.9.0-next.0-experimental-611b366.tgz",
1008
+ "integrity": "sha512-8zgE3gs19EpHdlTt8/K9SN6+OtAWNr2xPsvur0vMCxs+TSqWcRURFFKF1+zxiJL16oKupPoLcpmcGy5Z2nnZXA==",
1009
1009
  "license": "SEE LICENSE IN LICENSE.txt",
1010
1010
  "dependencies": {
1011
1011
  "@forge/i18n": "0.0.4",
@@ -1036,14 +1036,14 @@
1036
1036
  }
1037
1037
  },
1038
1038
  "node_modules/@forge/tunnel": {
1039
- "version": "5.10.0",
1040
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.10.0.tgz",
1041
- "integrity": "sha512-d0P6TInRjFo7u/i5pqVcdEraDj9/600ILo22Kxt445GrP/dR682dKUBSb4GzEng61dolfuilKBEmkK6qShtySw==",
1039
+ "version": "5.10.1-next.2-experimental-611b366",
1040
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.10.1-next.2-experimental-611b366.tgz",
1041
+ "integrity": "sha512-pz3ZvOuFG8fuRtOR6/w0SNMJmPke/uC+8KjKGNBYylAQFggJjN0rAdinHHmFoJdC8pF58CCVkqZv0h7tY9OAeA==",
1042
1042
  "license": "SEE LICENSE IN LICENSE.txt",
1043
1043
  "dependencies": {
1044
- "@forge/bundler": "4.21.0",
1045
- "@forge/cli-shared": "6.7.0",
1046
- "@forge/csp": "3.6.2",
1044
+ "@forge/bundler": "4.21.1-next.2-experimental-611b366",
1045
+ "@forge/cli-shared": "6.7.1-next.2-experimental-611b366",
1046
+ "@forge/csp": "3.6.2-experimental-611b366",
1047
1047
  "@forge/runtime": "5.10.7",
1048
1048
  "chokidar": "^3.6.0",
1049
1049
  "cloudflared": "^0.7.0",
package/out/command-line/controller/install-controller.d.ts CHANGED
@@ -39,7 +39,7 @@ export declare class InstallController {
39
39
  run({ environment, site, products, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }: InstallViewProps): Promise<void>;
40
40
  private getXPAProductsAndSite;
41
41
  private checkForMultiProductScopes;
42
- private extractAddedScopes;
42
+ private convertListScope;
43
43
  private isValidLicenseMode;
44
44
  private validateLicenseModes;
45
45
  private validateUsersWithAccess;
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,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;IA8HnC,OAAO,CAAC,qBAAqB,CA8B3B;IAEF,OAAO,CAAC,0BAA0B,CA8BhC;YAEY,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,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,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;IAiInC,OAAO,CAAC,qBAAqB,CA8B3B;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"}
package/out/command-line/controller/install-controller.js CHANGED
@@ -198,8 +198,9 @@ class InstallController {
198
198
  }
199
199
  const manifestEgressAddresses = (0, cli_shared_1.flatMap)(manifestEgressEntries, ({ domains }) => domains ?? []);
200
200
  const manifestScopes = new Set(permissions?.scopes ?? []);
201
- const addedScopes = await this.extractAddedScopes(environmentPermissions);
202
- const scopesConfirmationResult = await this.installView.promptForPermissionsConfirmation(environmentPermissions, addedScopes, [...manifestScopes], manifestEgressAddresses, environment, confirmScopes, !!nonInteractive, text);
201
+ const listScopesString = upgrade ? environmentPermissions.addedScopes : environmentPermissions.scopes;
202
+ const listScopes = await this.convertListScope(listScopesString);
203
+ const scopesConfirmationResult = await this.installView.promptForPermissionsConfirmation(environmentPermissions, listScopes, [...manifestScopes], manifestEgressAddresses, environment, confirmScopes, !!nonInteractive, text);
203
204
  if (!scopesConfirmationResult)
204
205
  return;
205
206
  const successfulProducts = [];
@@ -283,9 +284,9 @@ class InstallController {
283
284
  return;
284
285
  this.ui.warn(cli_shared_1.Text.install.multiProductScopesDetected(productsToInstall, productsToUpgrade, site.host, environment));
285
286
  };
286
- async extractAddedScopes({ addedScopes }) {
287
+ async convertListScope(scopesToList) {
287
288
  const scopesWithInteractiveConsent = (0, manifest_1.getScopesWithInteractiveConsent)();
288
- return addedScopes.map((scope) => ({
289
+ return scopesToList.map((scope) => ({
289
290
  name: scope,
290
291
  requiresInteractiveConsent: scopesWithInteractiveConsent.has(scope)
291
292
  }));
package/out/command-line/uninstall-command-helpers.js CHANGED
@@ -57,7 +57,7 @@ const performSingleUninstall = async (installId, installationContext, { ui, comm
57
57
  message: cli_shared_1.Text.uninstall.cmd.success(false)
58
58
  }));
59
59
  const uninstallMessageFormat = installation.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
60
- const uninstallMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)(installation.product), installation.site, installation.environmentKey, false);
60
+ const uninstallMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)((0, cli_shared_1.parseInstallationContext)(installationContext).resourceOwner), installation.site, installation.environmentKey, false);
61
61
  if (installation.successful) {
62
62
  ui.info(uninstallMessage);
63
63
  }
package/out/command-line/view/install-view.d.ts CHANGED
@@ -1,7 +1,7 @@
1
- import { UI, AddedScope } from '@forge/cli-shared';
1
+ import { UI, ListScope } from '@forge/cli-shared';
2
2
  import { AppEnvironmentPermissions, Installation } from '../../service/installation-service';
3
3
  interface InstallOrUpgradeCommandText {
4
- listScopes: (scopes: AddedScope[]) => string;
4
+ listScopes: (scopes: ListScope[]) => string;
5
5
  listEgressAddresses: (egressAddresses: string[]) => string;
6
6
  permissionsMismatch: (environment: string) => string;
7
7
  promptForPermissionsConfirmation: (permissionsMismatchInDevelopment: boolean) => string;
@@ -9,7 +9,7 @@ interface InstallOrUpgradeCommandText {
9
9
  export declare class InstallView {
10
10
  private readonly ui;
11
11
  constructor(ui: UI);
12
- promptForPermissionsConfirmation({ scopes, egressAddresses }: AppEnvironmentPermissions, addedScopes: AddedScope[], manifestScopes: string[], manifestEgressAddresses: string[], environment: string, confirmScopes: boolean, nonInteractive: boolean, text: InstallOrUpgradeCommandText): Promise<boolean>;
12
+ promptForPermissionsConfirmation({ scopes, egressAddresses }: AppEnvironmentPermissions, listScopes: ListScope[], manifestScopes: string[], manifestEgressAddresses: string[], environment: string, confirmScopes: boolean, nonInteractive: boolean, text: InstallOrUpgradeCommandText): Promise<boolean>;
13
13
  promptForUpgrade(installations: Installation[]): Promise<Installation>;
14
14
  displayUIKit1DeprecationMessage(modules: string[]): void;
15
15
  }
package/out/command-line/view/install-view.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,EAAE,EAA8B,UAAU,EAAa,MAAM,mBAAmB,CAAC;AAKrH,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,MAAM,CAAC;IAC7C,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,yBAAyB,EACtD,WAAW,EAAE,UAAU,EAAE,EACzB,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,OAAO,CAAC;IA+BN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAc5E,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;CAKhE"}
1
+ {"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,EAAE,EAA8B,SAAS,EAAa,MAAM,mBAAmB,CAAC;AAKpH,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,MAAM,CAAC;IAC5C,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,yBAAyB,EACtD,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,OAAO,CAAC;IA+BN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAc5E,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;CAKhE"}
package/out/command-line/view/install-view.js CHANGED
@@ -10,9 +10,9 @@ class InstallView {
10
10
  constructor(ui) {
11
11
  this.ui = ui;
12
12
  }
13
- async promptForPermissionsConfirmation({ scopes, egressAddresses }, addedScopes, manifestScopes, manifestEgressAddresses, environment, confirmScopes, nonInteractive, text) {
14
- if (addedScopes.length)
15
- this.ui.info(text.listScopes(addedScopes));
13
+ async promptForPermissionsConfirmation({ scopes, egressAddresses }, listScopes, manifestScopes, manifestEgressAddresses, environment, confirmScopes, nonInteractive, text) {
14
+ if (listScopes.length)
15
+ this.ui.info(text.listScopes(listScopes));
16
16
  if (egressAddresses.length)
17
17
  this.ui.info(text.listEgressAddresses(egressAddresses));
18
18
  const groupedManifestEgressAddresses = (0, egress_1.sortAndGroupEgressPermissionsByDomain)(manifestEgressAddresses);
package/out/deploy/deployer/deployer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAKjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EACF,SAAS,EAET,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAyB,MAAM,iCAAiC,CAAC;AAG7F,qBAAa,wBAAyB,SAAQ,SAAS;IAEnD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,sBAAuB,SAAQ,SAAS;IAEjD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;CAG7D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;IAErD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CACJ,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAyBD,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CACjB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC;YAYF,QAAQ;IAgBT,kBAAkB,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM;;;;YA4BL,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IA6BlC,OAAO,CAAC,gBAAgB;CAwDzB"}
1
+ {"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAKjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EACF,SAAS,EAET,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAyB,MAAM,iCAAiC,CAAC;AAG7F,qBAAa,wBAAyB,SAAQ,SAAS;IAEnD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,sBAAuB,SAAQ,SAAS;IAEjD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;CAG7D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;IAErD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CACJ,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAyBD,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CACjB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC;YAYF,QAAQ;IAgBT,kBAAkB,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM;;;;YA4BL,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IA6BlC,OAAO,CAAC,gBAAgB;CA4DzB"}
package/out/deploy/deployer/deployer.js CHANGED
@@ -181,7 +181,12 @@ class ArtifactDeployer {
181
181
  throw new AppDeploymentFailedError(true, requestId, cli_shared_1.Text.deploy.egressURL.error(causeMessage));
182
182
  }
183
183
  if (causeMessage?.toLowerCase().includes('existing installations')) {
184
- throw new ExistingInstallationsError(true, requestId, cli_shared_1.Text.deploy.crossContext.error);
184
+ if (causeMessage.toLowerCase().includes('modified')) {
185
+ throw new ExistingInstallationsError(true, requestId, cli_shared_1.Text.deploy.crossContext.modifyError);
186
+ }
187
+ else {
188
+ throw new ExistingInstallationsError(true, requestId, cli_shared_1.Text.deploy.crossContext.enableError);
189
+ }
185
190
  }
186
191
  break;
187
192
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "11.2.0",
3
+ "version": "11.2.1-next.2-experimental-611b366",
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.21.0",
22
- "@forge/cli-shared": "6.7.0",
21
+ "@forge/bundler": "4.21.1-next.2-experimental-611b366",
22
+ "@forge/cli-shared": "6.7.1-next.2-experimental-611b366",
23
23
  "@forge/egress": "1.4.0",
24
- "@forge/lint": "5.7.2",
25
- "@forge/manifest": "8.8.0",
24
+ "@forge/lint": "5.7.3-next.2-experimental-611b366",
25
+ "@forge/manifest": "8.9.0-next.0-experimental-611b366",
26
26
  "@forge/runtime": "5.10.7",
27
- "@forge/tunnel": "5.10.0",
27
+ "@forge/tunnel": "5.10.1-next.2-experimental-611b366",
28
28
  "@forge/util": "1.4.8",
29
29
  "@sentry/node": "7.106.0",
30
30
  "@forge/i18n": "0.0.4",