@forge/cli 6.12.0 → 6.13.0-next.7

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 (56) hide show
  1. package/CHANGELOG.md +91 -0
  2. package/npm-shrinkwrap.json +79 -77
  3. package/out/command-line/controller/default-environment-controller.d.ts.map +1 -1
  4. package/out/command-line/controller/default-environment-controller.js +2 -2
  5. package/out/command-line/controller/deploy-controller.d.ts +5 -2
  6. package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
  7. package/out/command-line/controller/deploy-controller.js +22 -5
  8. package/out/command-line/controller/install-controller.d.ts.map +1 -1
  9. package/out/command-line/controller/install-controller.js +5 -5
  10. package/out/command-line/controller/settings-controller.d.ts.map +1 -1
  11. package/out/command-line/controller/settings-controller.js +7 -4
  12. package/out/command-line/controller/tunnel-controller.d.ts +3 -3
  13. package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
  14. package/out/command-line/controller/tunnel-controller.js +3 -3
  15. package/out/command-line/dependency-injection.d.ts +5 -2
  16. package/out/command-line/dependency-injection.d.ts.map +1 -1
  17. package/out/command-line/dependency-injection.js +17 -11
  18. package/out/command-line/environment.d.ts.map +1 -1
  19. package/out/command-line/environment.js +1 -1
  20. package/out/command-line/register-app-commands.d.ts.map +1 -1
  21. package/out/command-line/register-app-commands.js +23 -24
  22. package/out/command-line/register-environment-commands.d.ts.map +1 -1
  23. package/out/command-line/register-environment-commands.js +2 -2
  24. package/out/command-line/register-environment-variables-commands.d.ts.map +1 -1
  25. package/out/command-line/register-environment-variables-commands.js +4 -4
  26. package/out/command-line/register-installation-commands.d.ts.map +1 -1
  27. package/out/command-line/register-installation-commands.js +2 -2
  28. package/out/command-line/register-providers-commands.d.ts.map +1 -1
  29. package/out/command-line/register-providers-commands.js +1 -2
  30. package/out/command-line/register-storage-commands.d.ts.map +1 -1
  31. package/out/command-line/register-storage-commands.js +4 -2
  32. package/out/command-line/view/deploy-view.d.ts +4 -2
  33. package/out/command-line/view/deploy-view.d.ts.map +1 -1
  34. package/out/command-line/view/deploy-view.js +13 -5
  35. package/out/command-line/view/install-view.js +1 -1
  36. package/out/command-line/view/settings-view.d.ts +1 -0
  37. package/out/command-line/view/settings-view.d.ts.map +1 -1
  38. package/out/command-line/view/settings-view.js +5 -0
  39. package/out/command-line/view/tunnel-view.d.ts.map +1 -1
  40. package/out/command-line/view/tunnel-view.js +1 -1
  41. package/out/entities/graphql-client.d.ts +1 -1
  42. package/out/entities/graphql-client.d.ts.map +1 -1
  43. package/out/entities/graphql-client.js +5 -7
  44. package/out/entities/list-indexes.d.ts +7 -7
  45. package/out/entities/list-indexes.d.ts.map +1 -1
  46. package/out/entities/list-indexes.js +4 -48
  47. package/out/environment/graphql-client.d.ts.map +1 -1
  48. package/out/environment/graphql-client.js +1 -1
  49. package/out/installations/graphql-client.d.ts.map +1 -1
  50. package/out/installations/graphql-client.js +1 -1
  51. package/out/service/custom-entities-service.d.ts +12 -0
  52. package/out/service/custom-entities-service.d.ts.map +1 -0
  53. package/out/service/custom-entities-service.js +76 -0
  54. package/out/service/tunnel-service.d.ts.map +1 -1
  55. package/out/service/tunnel-service.js +1 -2
  56. package/package.json +6 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,96 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 6.13.0-next.7
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [7cab7f9c]
8
+ - @forge/bundler@4.10.0-next.6
9
+ - @forge/tunnel@3.5.2-next.6
10
+
11
+ ## 6.13.0-next.6
12
+
13
+ ### Patch Changes
14
+
15
+ - 0b2835ad: Run E2E tests in parallel
16
+
17
+ ## 6.13.0-next.5
18
+
19
+ ### Minor Changes
20
+
21
+ - f00b749: Show additional message when using forge settings set
22
+
23
+ ### Patch Changes
24
+
25
+ - Updated dependencies [f00b749]
26
+ - @forge/cli-shared@3.14.0-next.5
27
+ - @forge/bundler@4.9.1-next.5
28
+ - @forge/lint@3.5.2-next.5
29
+ - @forge/tunnel@3.5.2-next.5
30
+
31
+ ## 6.13.0-next.4
32
+
33
+ ### Minor Changes
34
+
35
+ - 85bf4a8: Refactor and cleanup usages of environmentToOption
36
+
37
+ ### Patch Changes
38
+
39
+ - Updated dependencies [85bf4a8]
40
+ - @forge/cli-shared@3.14.0-next.4
41
+ - @forge/bundler@4.9.1-next.4
42
+ - @forge/lint@3.5.2-next.4
43
+ - @forge/tunnel@3.5.2-next.4
44
+
45
+ ## 6.13.0-next.3
46
+
47
+ ### Patch Changes
48
+
49
+ - Updated dependencies [91b77cb7]
50
+ - @forge/bundler@4.9.1-next.3
51
+ - @forge/cli-shared@3.14.0-next.3
52
+ - @forge/lint@3.5.2-next.3
53
+ - @forge/tunnel@3.5.2-next.3
54
+
55
+ ## 6.13.0-next.2
56
+
57
+ ### Minor Changes
58
+
59
+ - 2c219665: Added pre deployment prompt and post deployment message if custom entities reindexing is in progress, improved storage index command and increased index limit from 5 to 7
60
+
61
+ ### Patch Changes
62
+
63
+ - Updated dependencies [2c219665]
64
+ - @forge/cli-shared@3.14.0-next.2
65
+ - @forge/manifest@4.15.0-next.0
66
+ - @forge/bundler@4.9.1-next.2
67
+ - @forge/lint@3.5.2-next.2
68
+ - @forge/tunnel@3.5.2-next.2
69
+
70
+ ## 6.13.0-next.1
71
+
72
+ ### Patch Changes
73
+
74
+ - Updated dependencies [2517649d]
75
+ - @forge/cli-shared@3.14.0-next.1
76
+ - @forge/bundler@4.9.1-next.1
77
+ - @forge/lint@3.5.2-next.1
78
+ - @forge/tunnel@3.5.2-next.1
79
+
80
+ ## 6.13.0-next.0
81
+
82
+ ### Minor Changes
83
+
84
+ - fb00b34f: CLI selects bundler based on runtime type specified in manifest
85
+
86
+ ### Patch Changes
87
+
88
+ - Updated dependencies [fb00b34f]
89
+ - @forge/cli-shared@3.14.0-next.0
90
+ - @forge/bundler@4.9.1-next.0
91
+ - @forge/lint@3.5.2-next.0
92
+ - @forge/tunnel@3.5.2-next.0
93
+
3
94
  ## 6.12.0
4
95
 
5
96
  ### Minor Changes
package/npm-shrinkwrap.json CHANGED
@@ -1,22 +1,22 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.12.0",
3
+ "version": "6.13.0-next.7",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "6.12.0",
9
+ "version": "6.13.0-next.7",
10
10
  "hasInstallScript": true,
11
11
  "license": "UNLICENSED",
12
12
  "dependencies": {
13
- "@forge/bundler": "4.9.0",
14
- "@forge/cli-shared": "3.13.0",
13
+ "@forge/bundler": "4.10.0-next.6",
14
+ "@forge/cli-shared": "3.14.0-next.5",
15
15
  "@forge/egress": "1.2.1",
16
- "@forge/lint": "3.5.1",
17
- "@forge/manifest": "4.14.0",
16
+ "@forge/lint": "3.5.2-next.5",
17
+ "@forge/manifest": "4.15.0-next.0",
18
18
  "@forge/runtime": "4.4.1",
19
- "@forge/tunnel": "3.5.1",
19
+ "@forge/tunnel": "3.5.2-next.6",
20
20
  "@forge/util": "1.2.3",
21
21
  "@sentry/node": "^7.29.0",
22
22
  "ajv": "^6.12.6",
@@ -651,18 +651,6 @@
651
651
  "node": ">=10.0.0"
652
652
  }
653
653
  },
654
- "node_modules/@forge/api": {
655
- "version": "2.17.0",
656
- "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.17.0.tgz",
657
- "integrity": "sha512-Lev/RejG/bq7BmSNoB3WQrL6K3Gl/XGB6DZcoQGDo1WHxvGso91ARtI6950xZY0VYriBvbr36ApZ3PVgBA9nZQ==",
658
- "dependencies": {
659
- "@forge/auth": "0.0.1",
660
- "@forge/egress": "1.2.1",
661
- "@forge/storage": "1.5.3",
662
- "@types/node-fetch": "^2.6.4",
663
- "node-fetch": "2.6.11"
664
- }
665
- },
666
654
  "node_modules/@forge/auth": {
667
655
  "version": "0.0.1",
668
656
  "resolved": "https://registry.npmjs.org/@forge/auth/-/auth-0.0.1.tgz",
@@ -682,9 +670,9 @@
682
670
  "integrity": "sha512-n2eXc/shPwx0ahD3NNfsmeiFoBCukeglt2htePaNnJBDt0VpC6R4Njsjc/wnL5OMgrGl5/GXzN+mymngXrw9qQ=="
683
671
  },
684
672
  "node_modules/@forge/bundler": {
685
- "version": "4.9.0",
686
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.9.0.tgz",
687
- "integrity": "sha512-Ue+M+xCKqm0oFSef19uV4GClyqu9cEAJQcIICmTjrcp2v/Q6fP8JYYrgtBlZNwASTwjoq+1tsF/w0nooxllK7Q==",
673
+ "version": "4.10.0-next.6",
674
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.0-next.6.tgz",
675
+ "integrity": "sha512-rBYI0p4Td/+pbNVMgVZHEZ5WuLS6VlWxexyru10HR6/qjxIi08B4kaodL3qqtppBijSjC8Ajq1scsTBdKwMu/g==",
688
676
  "dependencies": {
689
677
  "@babel/core": "^7.16.7",
690
678
  "@babel/plugin-proposal-class-properties": "^7.16.7",
@@ -692,10 +680,10 @@
692
680
  "@babel/plugin-proposal-optional-chaining": "^7.16.7",
693
681
  "@babel/plugin-transform-react-jsx": "^7.16.7",
694
682
  "@babel/preset-typescript": "^7.16.7",
695
- "@forge/api": "2.17.0",
683
+ "@forge/api": "2.18.0-next.0",
696
684
  "@forge/babel-plugin-transform-ui": "1.1.2",
697
- "@forge/cli-shared": "3.13.0",
698
- "@forge/lint": "3.5.1",
685
+ "@forge/cli-shared": "3.14.0-next.5",
686
+ "@forge/lint": "3.5.2-next.5",
699
687
  "@forge/runtime": "4.4.1",
700
688
  "@forge/util": "1.2.3",
701
689
  "assert": "^1.1.1",
@@ -731,12 +719,24 @@
731
719
  "node": ">=12.13.1"
732
720
  }
733
721
  },
722
+ "node_modules/@forge/bundler/node_modules/@forge/api": {
723
+ "version": "2.18.0-next.0",
724
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.18.0-next.0.tgz",
725
+ "integrity": "sha512-4XoQG/QoZxr4XF+8NAvjFTpwxAIb6DQXfphzdEpRS7gxgvp6kDOtFDMqYQaax1POfSE1aqh9rRmdZRTVgeL30Q==",
726
+ "dependencies": {
727
+ "@forge/auth": "0.0.1",
728
+ "@forge/egress": "1.2.1",
729
+ "@forge/storage": "1.5.3",
730
+ "@types/node-fetch": "^2.6.4",
731
+ "node-fetch": "2.6.11"
732
+ }
733
+ },
734
734
  "node_modules/@forge/cli-shared": {
735
- "version": "3.13.0",
736
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.13.0.tgz",
737
- "integrity": "sha512-rYNHaglzeDdm5v6qw40V9icj+epGL5KrMfWVpw0IKrke0mETbg2aeNyxnskraJM7HXhwnYKYo6aMONTRczEiyg==",
735
+ "version": "3.14.0-next.5",
736
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.14.0-next.5.tgz",
737
+ "integrity": "sha512-Z/WFEUm/qRGF2ANWZEwzCIgWdlS4wgjt1szOvm1wkw0XR0Gp1O6vi0l9bOxZ6u2fr6+C9qB8gui9PklcWzY7iw==",
738
738
  "dependencies": {
739
- "@forge/manifest": "4.14.0",
739
+ "@forge/manifest": "4.15.0-next.0",
740
740
  "@forge/util": "1.2.3",
741
741
  "@sentry/node": "^7.29.0",
742
742
  "array.prototype.flatmap": "^1.2.3",
@@ -787,13 +787,13 @@
787
787
  }
788
788
  },
789
789
  "node_modules/@forge/lint": {
790
- "version": "3.5.1",
791
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.1.tgz",
792
- "integrity": "sha512-4CPStUUR5160mmE3/PVHhbBoYCgaWw7jMxdTVw74eLWv2Y3FJVSD209CnGYPMF5ZR+BvmnbvTBaNryKsO5eOug==",
790
+ "version": "3.5.2-next.5",
791
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.2-next.5.tgz",
792
+ "integrity": "sha512-YpsM67WZpIYCB3K5/7X1ohmBSdwVTcC5uSc9ErMUlG5OTbwbO3LioD83v3zkp+h17rBPZljV/N1dl+4YV7Ja3w==",
793
793
  "dependencies": {
794
- "@forge/cli-shared": "3.13.0",
794
+ "@forge/cli-shared": "3.14.0-next.5",
795
795
  "@forge/egress": "1.2.1",
796
- "@forge/manifest": "4.14.0",
796
+ "@forge/manifest": "4.15.0-next.0",
797
797
  "@typescript-eslint/typescript-estree": "^5.40.0",
798
798
  "array.prototype.flatmap": "^1.2.3",
799
799
  "atlassian-openapi": "^1.0.17",
@@ -802,9 +802,9 @@
802
802
  }
803
803
  },
804
804
  "node_modules/@forge/manifest": {
805
- "version": "4.14.0",
806
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.14.0.tgz",
807
- "integrity": "sha512-RxUYD4EOrF2ONHMo4x/lwesJgznhHj7ym57fg9HA7xxt/3S6NKpPGSU2dHhJGZfXh43+DcZf4o2ypKyDH9HOKQ==",
805
+ "version": "4.15.0-next.0",
806
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.15.0-next.0.tgz",
807
+ "integrity": "sha512-DZCi5aMdZkPO3Ebb+2pGfr81q9UC1ozKqUv9wHuw35uVKKNmNwrNvzXeGFaZJTLxBjD3mNWQE5OhgHqIps55sQ==",
808
808
  "dependencies": {
809
809
  "@forge/util": "1.2.3",
810
810
  "ajv": "^6.12.6",
@@ -841,12 +841,12 @@
841
841
  "integrity": "sha512-RyLf1GI0r+56oRk0bLNR9kUhBc3uH3zi4NRo2w5YfBvOjUqWe6/pi/a1bBsNz6z9gP8eyb+Y0VVxpgYiV895+A=="
842
842
  },
843
843
  "node_modules/@forge/tunnel": {
844
- "version": "3.5.1",
845
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.5.1.tgz",
846
- "integrity": "sha512-N3J/FbBQWOB5tXyPcs+Hg81eGD7Vra1P+8YR2RTBcJ9dyiZFvg5jCEbdfm2rBKqASrjTmCd6rALKxFueEgvZhQ==",
844
+ "version": "3.5.2-next.6",
845
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.5.2-next.6.tgz",
846
+ "integrity": "sha512-pFtY/imo+Idj5iQDm1IJHZIc3BA0lGEE3QlvZforT/4BdyLODdbufhr/XsMFGSqA7UBP5hL8FU/D0+t8pv2Y4Q==",
847
847
  "dependencies": {
848
- "@forge/bundler": "4.9.0",
849
- "@forge/cli-shared": "3.13.0",
848
+ "@forge/bundler": "4.10.0-next.6",
849
+ "@forge/cli-shared": "3.14.0-next.5",
850
850
  "@forge/csp": "2.1.3",
851
851
  "@forge/runtime": "4.4.1",
852
852
  "express": "^4.17.1",
@@ -10073,18 +10073,6 @@
10073
10073
  "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
10074
10074
  "integrity": "sha1-HVcr+74Ut3BOC6Dzm3SBW4SHDXA= sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
10075
10075
  },
10076
- "@forge/api": {
10077
- "version": "2.17.0",
10078
- "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.17.0.tgz",
10079
- "integrity": "sha512-Lev/RejG/bq7BmSNoB3WQrL6K3Gl/XGB6DZcoQGDo1WHxvGso91ARtI6950xZY0VYriBvbr36ApZ3PVgBA9nZQ==",
10080
- "requires": {
10081
- "@forge/auth": "0.0.1",
10082
- "@forge/egress": "1.2.1",
10083
- "@forge/storage": "1.5.3",
10084
- "@types/node-fetch": "^2.6.4",
10085
- "node-fetch": "2.6.11"
10086
- }
10087
- },
10088
10076
  "@forge/auth": {
10089
10077
  "version": "0.0.1",
10090
10078
  "resolved": "https://registry.npmjs.org/@forge/auth/-/auth-0.0.1.tgz",
@@ -10106,9 +10094,9 @@
10106
10094
  "integrity": "sha512-n2eXc/shPwx0ahD3NNfsmeiFoBCukeglt2htePaNnJBDt0VpC6R4Njsjc/wnL5OMgrGl5/GXzN+mymngXrw9qQ=="
10107
10095
  },
10108
10096
  "@forge/bundler": {
10109
- "version": "4.9.0",
10110
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.9.0.tgz",
10111
- "integrity": "sha512-Ue+M+xCKqm0oFSef19uV4GClyqu9cEAJQcIICmTjrcp2v/Q6fP8JYYrgtBlZNwASTwjoq+1tsF/w0nooxllK7Q==",
10097
+ "version": "4.10.0-next.6",
10098
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.0-next.6.tgz",
10099
+ "integrity": "sha512-rBYI0p4Td/+pbNVMgVZHEZ5WuLS6VlWxexyru10HR6/qjxIi08B4kaodL3qqtppBijSjC8Ajq1scsTBdKwMu/g==",
10112
10100
  "requires": {
10113
10101
  "@babel/core": "^7.16.7",
10114
10102
  "@babel/plugin-proposal-class-properties": "^7.16.7",
@@ -10116,10 +10104,10 @@
10116
10104
  "@babel/plugin-proposal-optional-chaining": "^7.16.7",
10117
10105
  "@babel/plugin-transform-react-jsx": "^7.16.7",
10118
10106
  "@babel/preset-typescript": "^7.16.7",
10119
- "@forge/api": "2.17.0",
10107
+ "@forge/api": "2.18.0-next.0",
10120
10108
  "@forge/babel-plugin-transform-ui": "1.1.2",
10121
- "@forge/cli-shared": "3.13.0",
10122
- "@forge/lint": "3.5.1",
10109
+ "@forge/cli-shared": "3.14.0-next.5",
10110
+ "@forge/lint": "3.5.2-next.5",
10123
10111
  "@forge/runtime": "4.4.1",
10124
10112
  "@forge/util": "1.2.3",
10125
10113
  "assert": "^1.1.1",
@@ -10150,14 +10138,28 @@
10150
10138
  "webpack": "5.78.0",
10151
10139
  "webpack-bundle-analyzer": "^4.8.0",
10152
10140
  "whatwg-url": "^7.0.0"
10141
+ },
10142
+ "dependencies": {
10143
+ "@forge/api": {
10144
+ "version": "2.18.0-next.0",
10145
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.18.0-next.0.tgz",
10146
+ "integrity": "sha512-4XoQG/QoZxr4XF+8NAvjFTpwxAIb6DQXfphzdEpRS7gxgvp6kDOtFDMqYQaax1POfSE1aqh9rRmdZRTVgeL30Q==",
10147
+ "requires": {
10148
+ "@forge/auth": "0.0.1",
10149
+ "@forge/egress": "1.2.1",
10150
+ "@forge/storage": "1.5.3",
10151
+ "@types/node-fetch": "^2.6.4",
10152
+ "node-fetch": "2.6.11"
10153
+ }
10154
+ }
10153
10155
  }
10154
10156
  },
10155
10157
  "@forge/cli-shared": {
10156
- "version": "3.13.0",
10157
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.13.0.tgz",
10158
- "integrity": "sha512-rYNHaglzeDdm5v6qw40V9icj+epGL5KrMfWVpw0IKrke0mETbg2aeNyxnskraJM7HXhwnYKYo6aMONTRczEiyg==",
10158
+ "version": "3.14.0-next.5",
10159
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.14.0-next.5.tgz",
10160
+ "integrity": "sha512-Z/WFEUm/qRGF2ANWZEwzCIgWdlS4wgjt1szOvm1wkw0XR0Gp1O6vi0l9bOxZ6u2fr6+C9qB8gui9PklcWzY7iw==",
10159
10161
  "requires": {
10160
- "@forge/manifest": "4.14.0",
10162
+ "@forge/manifest": "4.15.0-next.0",
10161
10163
  "@forge/util": "1.2.3",
10162
10164
  "@sentry/node": "^7.29.0",
10163
10165
  "array.prototype.flatmap": "^1.2.3",
@@ -10208,13 +10210,13 @@
10208
10210
  }
10209
10211
  },
10210
10212
  "@forge/lint": {
10211
- "version": "3.5.1",
10212
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.1.tgz",
10213
- "integrity": "sha512-4CPStUUR5160mmE3/PVHhbBoYCgaWw7jMxdTVw74eLWv2Y3FJVSD209CnGYPMF5ZR+BvmnbvTBaNryKsO5eOug==",
10213
+ "version": "3.5.2-next.5",
10214
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.2-next.5.tgz",
10215
+ "integrity": "sha512-YpsM67WZpIYCB3K5/7X1ohmBSdwVTcC5uSc9ErMUlG5OTbwbO3LioD83v3zkp+h17rBPZljV/N1dl+4YV7Ja3w==",
10214
10216
  "requires": {
10215
- "@forge/cli-shared": "3.13.0",
10217
+ "@forge/cli-shared": "3.14.0-next.5",
10216
10218
  "@forge/egress": "1.2.1",
10217
- "@forge/manifest": "4.14.0",
10219
+ "@forge/manifest": "4.15.0-next.0",
10218
10220
  "@typescript-eslint/typescript-estree": "^5.40.0",
10219
10221
  "array.prototype.flatmap": "^1.2.3",
10220
10222
  "atlassian-openapi": "^1.0.17",
@@ -10223,9 +10225,9 @@
10223
10225
  }
10224
10226
  },
10225
10227
  "@forge/manifest": {
10226
- "version": "4.14.0",
10227
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.14.0.tgz",
10228
- "integrity": "sha512-RxUYD4EOrF2ONHMo4x/lwesJgznhHj7ym57fg9HA7xxt/3S6NKpPGSU2dHhJGZfXh43+DcZf4o2ypKyDH9HOKQ==",
10228
+ "version": "4.15.0-next.0",
10229
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.15.0-next.0.tgz",
10230
+ "integrity": "sha512-DZCi5aMdZkPO3Ebb+2pGfr81q9UC1ozKqUv9wHuw35uVKKNmNwrNvzXeGFaZJTLxBjD3mNWQE5OhgHqIps55sQ==",
10229
10231
  "requires": {
10230
10232
  "@forge/util": "1.2.3",
10231
10233
  "ajv": "^6.12.6",
@@ -10259,12 +10261,12 @@
10259
10261
  "integrity": "sha512-RyLf1GI0r+56oRk0bLNR9kUhBc3uH3zi4NRo2w5YfBvOjUqWe6/pi/a1bBsNz6z9gP8eyb+Y0VVxpgYiV895+A=="
10260
10262
  },
10261
10263
  "@forge/tunnel": {
10262
- "version": "3.5.1",
10263
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.5.1.tgz",
10264
- "integrity": "sha512-N3J/FbBQWOB5tXyPcs+Hg81eGD7Vra1P+8YR2RTBcJ9dyiZFvg5jCEbdfm2rBKqASrjTmCd6rALKxFueEgvZhQ==",
10264
+ "version": "3.5.2-next.6",
10265
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.5.2-next.6.tgz",
10266
+ "integrity": "sha512-pFtY/imo+Idj5iQDm1IJHZIc3BA0lGEE3QlvZforT/4BdyLODdbufhr/XsMFGSqA7UBP5hL8FU/D0+t8pv2Y4Q==",
10265
10267
  "requires": {
10266
- "@forge/bundler": "4.9.0",
10267
- "@forge/cli-shared": "3.13.0",
10268
+ "@forge/bundler": "4.10.0-next.6",
10269
+ "@forge/cli-shared": "3.14.0-next.5",
10268
10270
  "@forge/csp": "2.1.3",
10269
10271
  "@forge/runtime": "4.4.1",
10270
10272
  "express": "^4.17.1",
package/out/command-line/controller/default-environment-controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"default-environment-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/default-environment-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,eAAe,EAEf,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EAEZ,EAAE,EAGH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAI1E,qBAAa,6BAA8B,SAAQ,KAAK;;CAIvD;AAED,qBAAa,4BAA4B;IAErC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBARzB,EAAE,EAAE,EAAE,EACG,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB,EACtC,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB,EAC/B,YAAY,EAAE,YAAY,EAC1B,wBAAwB,EAAE,wBAAwB,EAClD,sBAAsB,EAAE,sBAAsB,EAC9C,gBAAgB,EAAE,gBAAgB;IAGxC,GAAG,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAyB9C,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAgBnD,4CAA4C;YAO5C,8BAA8B;YAgB9B,iBAAiB;YAKjB,+BAA+B;YAoB/B,8BAA8B;YAY9B,qBAAqB;CAKpC"}
1
+ {"version":3,"file":"default-environment-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/default-environment-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,eAAe,EAEf,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EAEZ,EAAE,EAEH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAI1E,qBAAa,6BAA8B,SAAQ,KAAK;;CAIvD;AAED,qBAAa,4BAA4B;IAErC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBARzB,EAAE,EAAE,EAAE,EACG,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB,EACtC,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB,EAC/B,YAAY,EAAE,YAAY,EAC1B,wBAAwB,EAAE,wBAAwB,EAClD,sBAAsB,EAAE,sBAAsB,EAC9C,gBAAgB,EAAE,gBAAgB;IAGxC,GAAG,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAyB9C,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAgBnD,4CAA4C;YAO5C,8BAA8B;YAgB9B,iBAAiB;YAKjB,+BAA+B;YAoB/B,8BAA8B;YAU9B,qBAAqB;CAKpC"}
package/out/command-line/controller/default-environment-controller.js CHANGED
@@ -84,7 +84,7 @@ class DefaultEnvironmentController {
84
84
  this.ui.emptyLine();
85
85
  if (confirm) {
86
86
  await this.setDefaultEnvironment(environmentKey);
87
- this.ui.info(cli_shared_1.Text.defaultEnv.setSuccess(environmentKey, cli_shared_1.AppEnvironmentType.Development, cli_shared_1.environmentToOption));
87
+ this.ui.info(cli_shared_1.Text.defaultEnv.setSuccess(environmentKey, cli_shared_1.AppEnvironmentType.Development));
88
88
  this.ui.emptyLine();
89
89
  return environmentKey;
90
90
  }
@@ -93,7 +93,7 @@ class DefaultEnvironmentController {
93
93
  async createAndSetDefaultEnvironment(environmentKey) {
94
94
  await this.createEnvironmentCommand.execute({ environmentKey });
95
95
  await this.setDefaultEnvironment(environmentKey);
96
- this.ui.info(cli_shared_1.Text.defaultEnv.createAndSetSuccess(environmentKey, cli_shared_1.AppEnvironmentType.Development, cli_shared_1.environmentToOption));
96
+ this.ui.info(cli_shared_1.Text.defaultEnv.createAndSetSuccess(environmentKey, cli_shared_1.AppEnvironmentType.Development));
97
97
  this.ui.emptyLine();
98
98
  return environmentKey;
99
99
  }
package/out/command-line/controller/deploy-controller.d.ts CHANGED
@@ -6,6 +6,7 @@ import { MigrationKeysService } from '../../service/migration-keys-service';
6
6
  import { PackageUploadDeployCommand } from '../../deploy';
7
7
  import { DeploymentResult } from '../register-deployment-commands';
8
8
  import { CreateEnvironmentCommand } from '../../environment/create-environment';
9
+ import { CustomEntitiesService } from '../../service/custom-entities-service';
9
10
  interface DeployOptions {
10
11
  environment: string;
11
12
  verify: boolean;
@@ -29,11 +30,13 @@ export declare class DeployController {
29
30
  private readonly lintService;
30
31
  private readonly installationsService;
31
32
  private readonly migrationKeysService;
33
+ private readonly customEntitiesService;
32
34
  private readonly appEnvironmentClient;
33
35
  private readonly deployView;
34
- private readonly packageUploadDeployCommand;
36
+ private readonly sandboxPackageUploadDeployCommand;
37
+ private readonly nodePackageUploadDeployCommand;
35
38
  private readonly createEnvironmentCommand;
36
- constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, migrationKeysService: MigrationKeysService, appEnvironmentClient: AppEnvironmentClient, deployView: DeployView, packageUploadDeployCommand: PackageUploadDeployCommand, createEnvironmentCommand: CreateEnvironmentCommand);
39
+ constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, migrationKeysService: MigrationKeysService, customEntitiesService: CustomEntitiesService, appEnvironmentClient: AppEnvironmentClient, deployView: DeployView, sandboxPackageUploadDeployCommand: PackageUploadDeployCommand, nodePackageUploadDeployCommand: PackageUploadDeployCommand, createEnvironmentCommand: CreateEnvironmentCommand);
37
40
  private isMpacProductionApp;
38
41
  private connectKeyDeleted;
39
42
  private connectKeyChanged;
package/out/command-line/controller/deploy-controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EAEpB,UAAU,EAEV,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAA+B,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAGhF,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,qBAAa,sBAAuB,SAAQ,WAAW;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMpC,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,sBAAuB,SAAQ,WAAW;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAGpC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMvC,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBARxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,oBAAoB,EAAE,oBAAoB,EAC1C,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,0BAA0B,EACtD,wBAAwB,EAAE,wBAAwB;IAGrE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,iBAAiB;YAGX,wBAAwB;YAwBxB,mBAAmB;YAiBnB,oBAAoB;YAYpB,2BAA2B;YAe3B,wBAAwB;IAkBzB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAwD3G"}
1
+ {"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EAEpB,UAAU,EACV,WAAW,EAIZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAA+B,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,qBAAa,sBAAuB,SAAQ,WAAW;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMpC,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,sBAAuB,SAAQ,WAAW;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAGpC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMvC,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iCAAiC;IAClD,OAAO,CAAC,QAAQ,CAAC,8BAA8B;IAC/C,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAVxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,UAAU,EACtB,iCAAiC,EAAE,0BAA0B,EAC7D,8BAA8B,EAAE,0BAA0B,EAC1D,wBAAwB,EAAE,wBAAwB;IAGrE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,iBAAiB;YAGX,wBAAwB;YAwBxB,mBAAmB;YA2BnB,oBAAoB;YAgBpB,2BAA2B;YAe3B,wBAAwB;IAkBzB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CA4D3G"}
package/out/command-line/controller/deploy-controller.js CHANGED
@@ -30,15 +30,17 @@ class InvalidConnectKeyError extends cli_shared_1.HiddenError {
30
30
  }
31
31
  exports.InvalidConnectKeyError = InvalidConnectKeyError;
32
32
  class DeployController {
33
- constructor(appConfigProvider, configFile, lintService, installationsService, migrationKeysService, appEnvironmentClient, deployView, packageUploadDeployCommand, createEnvironmentCommand) {
33
+ constructor(appConfigProvider, configFile, lintService, installationsService, migrationKeysService, customEntitiesService, appEnvironmentClient, deployView, sandboxPackageUploadDeployCommand, nodePackageUploadDeployCommand, createEnvironmentCommand) {
34
34
  this.appConfigProvider = appConfigProvider;
35
35
  this.configFile = configFile;
36
36
  this.lintService = lintService;
37
37
  this.installationsService = installationsService;
38
38
  this.migrationKeysService = migrationKeysService;
39
+ this.customEntitiesService = customEntitiesService;
39
40
  this.appEnvironmentClient = appEnvironmentClient;
40
41
  this.deployView = deployView;
41
- this.packageUploadDeployCommand = packageUploadDeployCommand;
42
+ this.sandboxPackageUploadDeployCommand = sandboxPackageUploadDeployCommand;
43
+ this.nodePackageUploadDeployCommand = nodePackageUploadDeployCommand;
42
44
  this.createEnvironmentCommand = createEnvironmentCommand;
43
45
  }
44
46
  isMpacProductionApp(mpacAppKey, environment) {
@@ -72,6 +74,7 @@ class DeployController {
72
74
  return { proceed: true, connectKeyChanged: false, connectKeyDeleted: false };
73
75
  }
74
76
  async verifyPreDeployment(environment) {
77
+ var _a, _b;
75
78
  this.deployView.displayLintRunning();
76
79
  const { lintResults } = await this.lintService.run(environment, { fix: false }, this.deployView.getLogger());
77
80
  const problemCount = this.lintService.problemCount(lintResults);
@@ -86,6 +89,14 @@ class DeployController {
86
89
  else {
87
90
  this.deployView.displayNoLintProblems();
88
91
  }
92
+ const manifest = await this.configFile.readConfig();
93
+ if ((_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest.app) === null || _a === void 0 ? void 0 : _a.storage) === null || _b === void 0 ? void 0 : _b.entities) {
94
+ if (await this.customEntitiesService.isReindexingInProgress(environment)) {
95
+ if (!(await this.deployView.promptToContinueDeploymentWhileReindexing())) {
96
+ throw new errors_1.UserAbortError();
97
+ }
98
+ }
99
+ }
89
100
  }
90
101
  async verifyPostDeployment(environment) {
91
102
  var _a, _b;
@@ -95,7 +106,10 @@ class DeployController {
95
106
  }
96
107
  const manifest = await this.configFile.readConfig();
97
108
  if ((_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest.app) === null || _a === void 0 ? void 0 : _a.storage) === null || _b === void 0 ? void 0 : _b.entities) {
98
- this.deployView.displayIndexingCommand((0, cli_shared_1.environmentToOption)(environment));
109
+ if (await this.customEntitiesService.isReindexingInProgress(environment)) {
110
+ this.deployView.displaySuccessfulDeploymentWhileReindexing();
111
+ }
112
+ this.deployView.displayIndexingCommand(environment);
99
113
  }
100
114
  }
101
115
  async confirmAndCreateEnvironment(environment, nonInteractive) {
@@ -124,7 +138,7 @@ class DeployController {
124
138
  async run({ environment, verify, nonInteractive }) {
125
139
  const { id } = await this.appConfigProvider();
126
140
  const appDetails = await this.getAppEnvironmentDetails(id, environment, nonInteractive);
127
- this.deployView.displayStart(environment);
141
+ this.deployView.displayStart(environment, appDetails.environmentType);
128
142
  let hasConnectKeyChanged = false;
129
143
  let hasConnectKeyDeleted = false;
130
144
  if (verify) {
@@ -152,7 +166,10 @@ class DeployController {
152
166
  throw err;
153
167
  }
154
168
  }
155
- const analytics = await this.deployView.reportDeploymentProgress(appDetails, hasProdInstallations, () => this.packageUploadDeployCommand.execute({ handlers, resources, environmentKey: environment }));
169
+ const deployCommand = (await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs
170
+ ? this.nodePackageUploadDeployCommand
171
+ : this.sandboxPackageUploadDeployCommand;
172
+ const analytics = await this.deployView.reportDeploymentProgress(appDetails, hasProdInstallations, () => deployCommand.execute({ handlers, resources, environmentKey: environment }));
156
173
  if (verify) {
157
174
  await this.verifyPostDeployment(environment);
158
175
  }
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,EAUF,iBAAiB,EAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAA6B,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;AAsBD,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,YAAY;gBANZ,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,iBAAiB;YAGpC,cAAc;YAmBd,gBAAgB;YAuChB,gBAAgB;YAKhB,aAAa;YAeb,gBAAgB;IAqB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;YAmHrB,kBAAkB;CAYjC"}
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,EASF,iBAAiB,EAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAA6B,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;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,YAAY;gBANZ,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,iBAAiB;YAGpC,cAAc;YAmBd,gBAAgB;YAuChB,gBAAgB;YAKhB,aAAa;YAeb,gBAAgB;IAqB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;YA6GrB,kBAAkB;CAYjC"}
package/out/command-line/controller/install-controller.js CHANGED
@@ -5,7 +5,7 @@ const cli_shared_1 = require("@forge/cli-shared");
5
5
  const manifest_1 = require("@forge/manifest");
6
6
  class NoDeploymentError extends Error {
7
7
  constructor(environment) {
8
- super(cli_shared_1.Text.install.error.noDeploymentFound((0, cli_shared_1.environmentToOption)(environment)));
8
+ super(cli_shared_1.Text.install.error.noDeploymentFound(environment));
9
9
  }
10
10
  }
11
11
  exports.NoDeploymentError = NoDeploymentError;
@@ -49,7 +49,7 @@ class InstallController {
49
49
  });
50
50
  return false;
51
51
  }
52
- }, text.cmd.start(environment, environmentType, cli_shared_1.environmentToOption), (alreadyUpdated) => {
52
+ }, text.cmd.start(environment, environmentType), (alreadyUpdated) => {
53
53
  if (alreadyUpdated) {
54
54
  return cli_shared_1.Text.upgrade.alreadyUpdated.spinner;
55
55
  }
@@ -143,11 +143,11 @@ class InstallController {
143
143
  return;
144
144
  const isAlreadyUpdated = await this.installOrUpgrade(upgrade, environment, environmentType, site, product, id, text);
145
145
  if (isAlreadyUpdated) {
146
- this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, cli_shared_1.environmentToOption, product, site.host));
146
+ this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, product, site.host));
147
147
  }
148
148
  else {
149
149
  this.ui.emptyLine();
150
- this.ui.info(text.success.banner(environment, environmentType, cli_shared_1.environmentToOption, product, site.host));
150
+ this.ui.info(text.success.banner(environment, environmentType, product, site.host));
151
151
  const uniqueProductsFromScopes = this.getUniqueInstallationProductsFromScopes(environmentScopes);
152
152
  if (!uniqueProductsFromScopes || uniqueProductsFromScopes.length <= 1)
153
153
  return;
@@ -162,7 +162,7 @@ class InstallController {
162
162
  const productsToInstall = uniqueProductsFromScopes.filter((product) => !installedProducts.includes(product));
163
163
  if (productsToInstall.length === 0 && productsToUpgrade.length === 0)
164
164
  return;
165
- this.ui.warn(cli_shared_1.Text.install.multiProductScopesDetected(productsToInstall, productsToUpgrade, site.host, environment, cli_shared_1.environmentToOption));
165
+ this.ui.warn(cli_shared_1.Text.install.multiProductScopesDetected(productsToInstall, productsToUpgrade, site.host, environment));
166
166
  }
167
167
  }
168
168
  async extractAddedScopes({ addedScopes }) {
package/out/command-line/controller/settings-controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,iBAAiB,EAEjB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAK3B,eAAO,MAAM,2BAA2B,wBAAwB,CAAC;AAajE,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAHlB,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB,EAC/B,kBAAkB,EAAE,kBAAkB;IAGzD,OAAO,CAAC,YAAY,CA6BlB;YAEY,QAAQ;YAKR,mBAAmB;IAKjC,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;YAIV,UAAU;IAWX,iBAAiB;IAWjB,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAY3B,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAY1D"}
1
+ {"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,iBAAiB,EAEjB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAK3B,eAAO,MAAM,2BAA2B,wBAAwB,CAAC;AAcjE,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAHlB,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB,EAC/B,kBAAkB,EAAE,kBAAkB;IAGzD,OAAO,CAAC,YAAY,CA4BlB;YAEY,QAAQ;YAKR,mBAAmB;IAKjC,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;YAIV,UAAU;IAWX,iBAAiB;IAWjB,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAY3B,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAgB1D"}
package/out/command-line/controller/settings-controller.js CHANGED
@@ -20,7 +20,6 @@ class SettingsController {
20
20
  const parsedValue = this.parseBoolean(value);
21
21
  this.cachedConfigService.setAnalyticsPreferences(parsedValue);
22
22
  },
23
- display: (value) => value,
24
23
  isAvailable: () => true
25
24
  },
26
25
  'default-environment': {
@@ -36,8 +35,9 @@ class SettingsController {
36
35
  const appId = await this.getAppId();
37
36
  this.cachedConfigService.setDefaultEnvironment(appId, environment);
38
37
  },
39
- display: (value) => cli_shared_1.Text.env.displayEnvironment(value, cli_shared_1.AppEnvironmentType.Development, cli_shared_1.environmentToOption),
40
- isAvailable: async () => (await this.validateAppManifest()).success && (await this.featureFlagService.isConcurrentDevEnabled())
38
+ getDisplayValue: (value) => cli_shared_1.Text.env.displayEnvironment(value, cli_shared_1.AppEnvironmentType.Development),
39
+ isAvailable: async () => (await this.validateAppManifest()).success && (await this.featureFlagService.isConcurrentDevEnabled()),
40
+ additionalInfo: cli_shared_1.Text.settings.defaultEnvironment.info
41
41
  }
42
42
  };
43
43
  }
@@ -97,8 +97,11 @@ class SettingsController {
97
97
  const publicSettings = await this.getPublicSettings();
98
98
  throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.set.invalidSetting(publicSettings));
99
99
  }
100
+ if (setting.additionalInfo) {
101
+ this.settingsView.showAdditionalInfo(setting.additionalInfo);
102
+ }
100
103
  await setting.set(value);
101
- const displayValue = setting.display(value);
104
+ const displayValue = setting.getDisplayValue ? setting.getDisplayValue(value) : value;
102
105
  this.settingsView.setSuccess(preference, displayValue);
103
106
  }
104
107
  }
package/out/command-line/controller/tunnel-controller.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { CommandLineUI, FeatureFlagReader, PersonalApiCredentialsValidated } from '@forge/cli-shared';
1
+ import { CommandLineUI, ConfigFile, PersonalApiCredentialsValidated } from '@forge/cli-shared';
2
2
  import { TunnelAnalyticsService } from '../../service/tunnel-analytics-service';
3
3
  import { DockerTunnelService, TunnelOptions, TunnelService } from '../../service/tunnel-service';
4
4
  import { TunnelView } from '../view/tunnel-view';
@@ -8,8 +8,8 @@ export declare class TunnelController {
8
8
  private readonly localTunnelService;
9
9
  private readonly dockerTunnelService;
10
10
  private readonly tunnelView;
11
- private readonly featureFlags;
12
- constructor(analyticsService: TunnelAnalyticsService, nodeTunnelService: TunnelService, localTunnelService: TunnelService, dockerTunnelService: DockerTunnelService, tunnelView: TunnelView, featureFlags: FeatureFlagReader);
11
+ private readonly configFile;
12
+ constructor(analyticsService: TunnelAnalyticsService, nodeTunnelService: TunnelService, localTunnelService: TunnelService, dockerTunnelService: DockerTunnelService, tunnelView: TunnelView, configFile: ConfigFile);
13
13
  run(tunnelOptions: TunnelOptions, ui: CommandLineUI): Promise<void>;
14
14
  runDockerTunnel(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
15
15
  }
package/out/command-line/controller/tunnel-controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,iBAAiB,EAGjB,+BAA+B,EAChC,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBALZ,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,aAAa,EAChC,kBAAkB,EAAE,aAAa,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,iBAAiB;IAGrC,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnE,eAAe,CAC1B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;CAuBjB"}
1
+ {"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EAIV,+BAA+B,EAEhC,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBALV,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,aAAa,EAChC,kBAAkB,EAAE,aAAa,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IAG5B,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnE,eAAe,CAC1B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;CAuBjB"}