@forge/cli 13.4.0-next.7-experimental-ccd5143 → 13.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/CHANGELOG.md +134 -6
  2. package/npm-shrinkwrap.json +52 -38
  3. package/out/autocomplete/autocomplete-config.json +12 -3
  4. package/out/command-line/controller/settings-controller.d.ts +3 -1
  5. package/out/command-line/controller/settings-controller.d.ts.map +1 -1
  6. package/out/command-line/controller/settings-controller.js +38 -1
  7. package/out/command-line/controller/settings-controller.js.map +1 -1
  8. package/out/command-line/index.d.ts +0 -2
  9. package/out/command-line/index.d.ts.map +1 -1
  10. package/out/command-line/index.js +14 -21
  11. package/out/command-line/index.js.map +1 -1
  12. package/out/command-line/proxy.d.ts +16 -0
  13. package/out/command-line/proxy.d.ts.map +1 -0
  14. package/out/command-line/proxy.js +73 -0
  15. package/out/command-line/proxy.js.map +1 -0
  16. package/out/command-line/register-log-commands.d.ts.map +1 -1
  17. package/out/command-line/register-log-commands.js +11 -4
  18. package/out/command-line/register-log-commands.js.map +1 -1
  19. package/out/command-line/register-settings-commands.d.ts.map +1 -1
  20. package/out/command-line/register-settings-commands.js +1 -0
  21. package/out/command-line/register-settings-commands.js.map +1 -1
  22. package/out/deploy/package-upload-deploy.d.ts.map +1 -1
  23. package/out/deploy/package-upload-deploy.js +5 -5
  24. package/out/deploy/package-upload-deploy.js.map +1 -1
  25. package/out/deploy/uploader/artifact-graphql-client.d.ts +2 -0
  26. package/out/deploy/uploader/artifact-graphql-client.d.ts.map +1 -1
  27. package/out/deploy/uploader/artifact-graphql-client.js +31 -0
  28. package/out/deploy/uploader/artifact-graphql-client.js.map +1 -1
  29. package/out/deploy/uploader/uploader.d.ts.map +1 -1
  30. package/out/deploy/uploader/uploader.js +3 -0
  31. package/out/deploy/uploader/uploader.js.map +1 -1
  32. package/out/service/cached-config-service.d.ts +1 -0
  33. package/out/service/cached-config-service.d.ts.map +1 -1
  34. package/out/service/cached-config-service.js +3 -2
  35. package/out/service/cached-config-service.js.map +1 -1
  36. package/package.json +9 -7
package/CHANGELOG.md CHANGED
@@ -1,31 +1,159 @@
1
1
  # @forge/cli
2
2
 
3
- ## 13.4.0-next.7-experimental-ccd5143
3
+ ## 13.4.0
4
4
 
5
5
  ### Minor Changes
6
6
 
7
+ - d9f80a3: Add feature-gated combined artifact uploads to `forge build`. Combined builds are queued for server-side processing and can be monitored in the Developer Console.
7
8
  - d1767a0: New dynamic hint bar added to progress display
8
9
  - f9fba62: Add an option to inspect the application bundle
9
10
  - 2b13c2e: Move from node-fetch to native fetch
11
+ - f6607ca: Added new logs filtering flags for containers, services and functions as well as removed the existing containers flag
10
12
  - ff4f2bf: Add `forge site provision` to provision a new demo site or get an existing demo site.
11
13
 
12
14
  ### Patch Changes
13
15
 
16
+ - 95b7ea2: Update tests
17
+ - 47c4c75: Add a friendly fail-closed error when Forge CLI proxy setup fails.
14
18
  - 6866aae: Show container commands help
19
+ - 9afd5c3: Add native Forge CLI proxy support for Node and Undici network clients.
20
+ - 860e2b4: Upgrade undici to 7.29.0
21
+ - Updated dependencies [8e5bd63]
15
22
  - Updated dependencies [016ed9d]
23
+ - Updated dependencies [d9f80a3]
24
+ - Updated dependencies [47c4c75]
16
25
  - Updated dependencies [d1767a0]
26
+ - Updated dependencies [05f231c]
17
27
  - Updated dependencies [71d0c4e]
18
28
  - Updated dependencies [f9fba62]
19
29
  - Updated dependencies [2b13c2e]
30
+ - Updated dependencies [f6607ca]
31
+ - Updated dependencies [9afd5c3]
20
32
  - Updated dependencies [ff4f2bf]
21
33
  - Updated dependencies [47fb0a1]
34
+ - Updated dependencies [a38aef6]
22
35
  - Updated dependencies [ccd5143]
23
36
  - Updated dependencies [6c1371a]
24
- - @forge/cli-shared@9.4.0-next.6-experimental-ccd5143
25
- - @forge/bundler@7.2.0-next.7-experimental-ccd5143
26
- - @forge/lint@6.2.0-next.7-experimental-ccd5143
27
- - @forge/manifest@13.3.1-next.0-experimental-ccd5143
28
- - @forge/tunnel@7.1.1-next.7-experimental-ccd5143
37
+ - Updated dependencies [9389854]
38
+ - @forge/tunnel@7.1.1
39
+ - @forge/cli-shared@9.4.0
40
+ - @forge/manifest@13.3.1
41
+ - @forge/bundler@7.2.0
42
+ - @forge/lint@6.2.0
43
+
44
+ ## 13.4.0-next.18
45
+
46
+ ### Patch Changes
47
+
48
+ - Updated dependencies [9389854]
49
+ - @forge/manifest@13.3.1-next.4
50
+ - @forge/bundler@7.2.0-next.16
51
+ - @forge/cli-shared@9.4.0-next.13
52
+ - @forge/lint@6.2.0-next.16
53
+ - @forge/tunnel@7.1.1-next.16
54
+
55
+ ## 13.4.0-next.17
56
+
57
+ ### Patch Changes
58
+
59
+ - 47c4c75: Add a friendly fail-closed error when Forge CLI proxy setup fails.
60
+ - Updated dependencies [47c4c75]
61
+ - Updated dependencies [a38aef6]
62
+ - @forge/cli-shared@9.4.0-next.12
63
+ - @forge/manifest@13.3.1-next.3
64
+ - @forge/bundler@7.2.0-next.15
65
+ - @forge/lint@6.2.0-next.15
66
+ - @forge/tunnel@7.1.1-next.15
67
+
68
+ ## 13.4.0-next.16
69
+
70
+ ### Minor Changes
71
+
72
+ - d9f80a3: Add feature-gated combined artifact uploads to `forge build`. Combined builds are queued for server-side processing and can be monitored in the Developer Console.
73
+
74
+ ### Patch Changes
75
+
76
+ - Updated dependencies [d9f80a3]
77
+ - @forge/cli-shared@9.4.0-next.11
78
+ - @forge/bundler@7.2.0-next.14
79
+ - @forge/lint@6.2.0-next.14
80
+ - @forge/tunnel@7.1.1-next.14
81
+
82
+ ## 13.4.0-next.15
83
+
84
+ ### Minor Changes
85
+
86
+ - f6607ca: Added new logs filtering flags for containers, services and functions as well as removed the existing containers flag
87
+
88
+ ### Patch Changes
89
+
90
+ - Updated dependencies [f6607ca]
91
+ - @forge/cli-shared@9.4.0-next.10
92
+ - @forge/bundler@7.2.0-next.13
93
+ - @forge/lint@6.2.0-next.13
94
+ - @forge/tunnel@7.1.1-next.13
95
+
96
+ ## 13.4.0-next.14
97
+
98
+ ### Patch Changes
99
+
100
+ - Updated dependencies [8e5bd63]
101
+ - Updated dependencies [05f231c]
102
+ - @forge/tunnel@7.1.1-next.12
103
+ - @forge/manifest@13.3.1-next.2
104
+ - @forge/bundler@7.2.0-next.12
105
+ - @forge/cli-shared@9.4.0-next.9
106
+ - @forge/lint@6.2.0-next.12
107
+
108
+ ## 13.4.0-next.13
109
+
110
+ ### Patch Changes
111
+
112
+ - 860e2b4: Upgrade undici to 7.29.0
113
+
114
+ ## 13.4.0-next.12
115
+
116
+ ### Patch Changes
117
+
118
+ - @forge/lint@6.2.0-next.11
119
+ - @forge/tunnel@7.1.1-next.11
120
+ - @forge/bundler@7.2.0-next.11
121
+
122
+ ## 13.4.0-next.11
123
+
124
+ ### Patch Changes
125
+
126
+ - 95b7ea2: Update tests
127
+
128
+ ## 13.4.0-next.10
129
+
130
+ ### Patch Changes
131
+
132
+ - @forge/lint@6.2.0-next.10
133
+ - @forge/tunnel@7.1.1-next.10
134
+ - @forge/bundler@7.2.0-next.10
135
+
136
+ ## 13.4.0-next.9
137
+
138
+ ### Patch Changes
139
+
140
+ - 9afd5c3: Add native Forge CLI proxy support for Node and Undici network clients.
141
+ - Updated dependencies [9afd5c3]
142
+ - @forge/cli-shared@9.4.0-next.8
143
+ - @forge/bundler@7.2.0-next.9
144
+ - @forge/lint@6.2.0-next.9
145
+ - @forge/tunnel@7.1.1-next.9
146
+
147
+ ## 13.4.0-next.8
148
+
149
+ ### Patch Changes
150
+
151
+ - Updated dependencies [ccd5143]
152
+ - @forge/manifest@13.3.1-next.1
153
+ - @forge/bundler@7.2.0-next.8
154
+ - @forge/cli-shared@9.4.0-next.7
155
+ - @forge/lint@6.2.0-next.8
156
+ - @forge/tunnel@7.1.1-next.8
29
157
 
30
158
  ## 13.4.0-next.7
31
159
 
package/npm-shrinkwrap.json CHANGED
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "13.4.0-next.7-experimental-ccd5143",
3
+ "version": "13.4.0",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "13.4.0-next.7-experimental-ccd5143",
9
+ "version": "13.4.0",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
13
- "@forge/bundler": "7.2.0-next.7-experimental-ccd5143",
14
- "@forge/cli-shared": "9.4.0-next.6-experimental-ccd5143",
13
+ "@forge/bundler": "7.2.0",
14
+ "@forge/cli-shared": "9.4.0",
15
15
  "@forge/egress": "3.0.0",
16
16
  "@forge/i18n": "1.0.0",
17
- "@forge/lint": "6.2.0-next.7-experimental-ccd5143",
18
- "@forge/manifest": "13.3.1-next.0-experimental-ccd5143",
17
+ "@forge/lint": "6.2.0",
18
+ "@forge/manifest": "13.3.1",
19
19
  "@forge/runtime": "7.0.0",
20
- "@forge/tunnel": "7.1.1-next.7-experimental-ccd5143",
20
+ "@forge/tunnel": "7.1.1",
21
21
  "@forge/util": "3.0.0",
22
22
  "@sentry/node": "7.106.0",
23
23
  "ajv": "^8.18.0",
@@ -38,6 +38,7 @@
38
38
  "fs-extra": "^11.2.0",
39
39
  "hidefile": "^3.0.0",
40
40
  "http-proxy-agent": "^7.0.2",
41
+ "https-proxy-agent": "^7.0.6",
41
42
  "latest-version": "^7.0.0",
42
43
  "lodash": "^4.17.21",
43
44
  "node-machine-id": "^1.1.12",
@@ -48,6 +49,7 @@
48
49
  "semver": "^7.6.0",
49
50
  "tmp": "^0.2.3",
50
51
  "tslib": "^2.6.2",
52
+ "undici": "^7.29.0",
51
53
  "v8-compile-cache": "^2.4.0",
52
54
  "yaml": "^2.3.4"
53
55
  },
@@ -541,9 +543,9 @@
541
543
  }
542
544
  },
543
545
  "node_modules/@forge/bundler": {
544
- "version": "7.2.0-next.7-experimental-ccd5143",
545
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.2.0-next.7-experimental-ccd5143.tgz",
546
- "integrity": "sha512-GYtwheXDkgElg+wsdmSSmqvwBseC4itwiQkINJAqx/+bNttOsCJlID5iW0XbN5Mnt9K/7qw41vDOI9Ma6kKHlg==",
546
+ "version": "7.2.0",
547
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.2.0.tgz",
548
+ "integrity": "sha512-gYPIcjCy85l+JlrofbQ/CEO/49OpiS1lGRk30EMBPhXdEPYVWztOB4fXR+NufhJzB1XN3hlkbD0At7FwGqtWvA==",
547
549
  "license": "SEE LICENSE IN LICENSE.txt",
548
550
  "dependencies": {
549
551
  "@babel/core": "^7.24.0",
@@ -555,10 +557,10 @@
555
557
  "@babel/plugin-transform-react-jsx": "^7.23.4",
556
558
  "@babel/traverse": "^7.24.0",
557
559
  "@babel/types": "^7.24.0",
558
- "@forge/cli-shared": "9.4.0-next.6-experimental-ccd5143",
560
+ "@forge/cli-shared": "9.4.0",
559
561
  "@forge/i18n": "1.0.0",
560
- "@forge/lint": "6.2.0-next.7-experimental-ccd5143",
561
- "@forge/manifest": "13.3.1-next.0-experimental-ccd5143",
562
+ "@forge/lint": "6.2.0",
563
+ "@forge/manifest": "13.3.1",
562
564
  "babel-loader": "^8.3.0",
563
565
  "cheerio": "^1.2.0",
564
566
  "chokidar": "^4.0.3",
@@ -587,13 +589,13 @@
587
589
  }
588
590
  },
589
591
  "node_modules/@forge/cli-shared": {
590
- "version": "9.4.0-next.6-experimental-ccd5143",
591
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.4.0-next.6-experimental-ccd5143.tgz",
592
- "integrity": "sha512-NQ6DP332eF/m+Q8tZxOsqqmqG4Y24ntLfKNsCOo6Lf1WJtUbtrNoktOz1GXSLSR7A9zSdq2xLudFvb7Tz9gDdw==",
592
+ "version": "9.4.0",
593
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.4.0.tgz",
594
+ "integrity": "sha512-xk0ylzfrRyH6LBdaOXNKFXB1POrtLuGZuwa3UYJusclL16MOYkIRk6JQjprUsBvStak2tjvn90GHZfHSW88BHw==",
593
595
  "license": "SEE LICENSE IN LICENSE.txt",
594
596
  "dependencies": {
595
597
  "@forge/i18n": "1.0.0",
596
- "@forge/manifest": "13.3.1-next.0-experimental-ccd5143",
598
+ "@forge/manifest": "13.3.1",
597
599
  "@forge/util": "3.0.0",
598
600
  "@sentry/node": "7.106.0",
599
601
  "@vercel/detect-agent": "^1.2.3",
@@ -638,9 +640,9 @@
638
640
  }
639
641
  },
640
642
  "node_modules/@forge/csp": {
641
- "version": "6.3.0-experimental-ccd5143",
642
- "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.3.0-experimental-ccd5143.tgz",
643
- "integrity": "sha512-LyjI8HY6TESFU8lLBesG/+pLaNo3xzawXkYJCaM9CSLltPUn/ApCzb/NdoauIF+Ot8hNdkfqHsS+fd3MoIkykQ==",
643
+ "version": "6.3.1",
644
+ "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.3.1.tgz",
645
+ "integrity": "sha512-3G20IOayG3gois5fAgU1ZvKygsCTRzzNV/PuWSu3twUN1F2Mci53X7b2knsNzKNXQiR5Itf78jf9+YPxssPcvg==",
644
646
  "license": "SEE LICENSE IN LICENSE.txt",
645
647
  "dependencies": {
646
648
  "content-security-policy-parser": "^0.6.0"
@@ -690,16 +692,16 @@
690
692
  }
691
693
  },
692
694
  "node_modules/@forge/lint": {
693
- "version": "6.2.0-next.7-experimental-ccd5143",
694
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.2.0-next.7-experimental-ccd5143.tgz",
695
- "integrity": "sha512-ICshyqRiDuuvN7DywDLJZ63Dg2M6gExAtbiIs9Gt1UQsYfcNAC0OiQnXjKNYb2lVFKgweDHBmn+FsVR0gmn1Pg==",
695
+ "version": "6.2.0",
696
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.2.0.tgz",
697
+ "integrity": "sha512-ibra5lVW2R52/gdvHo6tHXk4w7WFIvTwTGSZ0l6r0cDp5rppQTEGVyiCuBD+bRF+GN4woTNC7aGCOAGAocdyrA==",
696
698
  "license": "SEE LICENSE IN LICENSE.txt",
697
699
  "dependencies": {
698
700
  "@atlassian/atlassian-openapi": "^1.0.6",
699
- "@forge/cli-shared": "9.4.0-next.6-experimental-ccd5143",
700
- "@forge/csp": "6.3.0-experimental-ccd5143",
701
+ "@forge/cli-shared": "9.4.0",
702
+ "@forge/csp": "6.3.1",
701
703
  "@forge/egress": "3.0.0",
702
- "@forge/manifest": "13.3.1-next.0-experimental-ccd5143",
704
+ "@forge/manifest": "13.3.1",
703
705
  "@typescript-eslint/typescript-estree": "^5.62.0",
704
706
  "archiver": "^8.0.0",
705
707
  "array.prototype.flatmap": "^1.3.3",
@@ -717,9 +719,9 @@
717
719
  }
718
720
  },
719
721
  "node_modules/@forge/manifest": {
720
- "version": "13.3.1-next.0-experimental-ccd5143",
721
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.3.1-next.0-experimental-ccd5143.tgz",
722
- "integrity": "sha512-xa5/2VJTWCGKOuwuvapIdAmGfhMAw8gcdJXu9OBq8SIka2tVSSXGsyZGF9oTlp306LrCN8eOPlFUQs0EF53l9A==",
722
+ "version": "13.3.1",
723
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.3.1.tgz",
724
+ "integrity": "sha512-YJJxhEX4CX70fmyDKmbOFpEzy2wI92NaoSwDyV4beaDbLsf8L9bPCtF3lf1qXE5/f2Pb+URpPyK3PnJyqnwRPQ==",
723
725
  "license": "SEE LICENSE IN LICENSE.txt",
724
726
  "dependencies": {
725
727
  "@forge/i18n": "1.0.0",
@@ -756,14 +758,14 @@
756
758
  }
757
759
  },
758
760
  "node_modules/@forge/tunnel": {
759
- "version": "7.1.1-next.7-experimental-ccd5143",
760
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.1.1-next.7-experimental-ccd5143.tgz",
761
- "integrity": "sha512-hAg2Ncb5fKGGVN8stVBF58dqRZfrolcrVY637l7cDaTZwkzX7jz+perjTxQtzUim6G0Gageig3tudzq9H39QMQ==",
761
+ "version": "7.1.1",
762
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.1.1.tgz",
763
+ "integrity": "sha512-KQEfazfiy9pZRBSNDsF4+qECzD0SgTTcGYWSPStW0fc+5iJzWoorcC+/x6Hq61I8pRHwzgBaVbocRQ6mHtyrpQ==",
762
764
  "license": "SEE LICENSE IN LICENSE.txt",
763
765
  "dependencies": {
764
- "@forge/bundler": "7.2.0-next.7-experimental-ccd5143",
765
- "@forge/cli-shared": "9.4.0-next.6-experimental-ccd5143",
766
- "@forge/csp": "6.3.0-experimental-ccd5143",
766
+ "@forge/bundler": "7.2.0",
767
+ "@forge/cli-shared": "9.4.0",
768
+ "@forge/csp": "6.3.1",
767
769
  "@forge/runtime": "7.0.0",
768
770
  "@forge/util": "^3.0.0",
769
771
  "cheerio": "^1.2.0",
@@ -5357,6 +5359,18 @@
5357
5359
  "url": "https://github.com/sponsors/sindresorhus"
5358
5360
  }
5359
5361
  },
5362
+ "node_modules/https-proxy-agent": {
5363
+ "version": "7.0.6",
5364
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
5365
+ "integrity": "sha1-2o3+rH2hMLBcK6S1nJts1mYRprk= sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
5366
+ "dependencies": {
5367
+ "agent-base": "^7.1.2",
5368
+ "debug": "4"
5369
+ },
5370
+ "engines": {
5371
+ "node": ">= 14"
5372
+ }
5373
+ },
5360
5374
  "node_modules/hyperdyperid": {
5361
5375
  "version": "1.2.0",
5362
5376
  "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
@@ -8626,9 +8640,9 @@
8626
8640
  }
8627
8641
  },
8628
8642
  "node_modules/undici": {
8629
- "version": "7.27.2",
8630
- "resolved": "https://registry.npmjs.org/undici/-/undici-7.27.2.tgz",
8631
- "integrity": "sha1-+PrpaO5oN3z8YXE9nNFSdzcWgE8= sha512-uZsKNuzQxDMUY6M3pIMvy5tvlGmtq8XJ2oLAkfRKGNu+1VQAIvLy2xIVG5ATZl5wDXl/tddByAWCizRbOme+TA==",
8643
+ "version": "7.29.0",
8644
+ "resolved": "https://registry.npmjs.org/undici/-/undici-7.29.0.tgz",
8645
+ "integrity": "sha1-rg9vYuBuBXqcu3srX94rt095G48= sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==",
8632
8646
  "engines": {
8633
8647
  "node": ">=20.18.1"
8634
8648
  }
package/out/autocomplete/autocomplete-config.json CHANGED
@@ -188,9 +188,6 @@
188
188
  "--verbose": {
189
189
  "requireUserArg": false
190
190
  },
191
- "--containers": {
192
- "requireUserArg": false
193
- },
194
191
  "--environment": {
195
192
  "requireUserArg": true
196
193
  },
@@ -206,6 +203,18 @@
206
203
  "--grouped": {
207
204
  "requireUserArg": false
208
205
  },
206
+ "--containerKey": {
207
+ "requireUserArg": true
208
+ },
209
+ "--instance": {
210
+ "requireUserArg": true
211
+ },
212
+ "--serviceKey": {
213
+ "requireUserArg": true
214
+ },
215
+ "--functionKey": {
216
+ "requireUserArg": true
217
+ },
209
218
  "--help": {
210
219
  "requireUserArg": false
211
220
  }
package/out/command-line/controller/settings-controller.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { AppConfigProvider } from '@forge/cli-shared';
2
2
  import { CachedConfigService } from '../../service/cached-config-service';
3
3
  import { SettingsView } from '../view/settings-view';
4
- export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment", "seasonal-effects"];
4
+ export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment", "seasonal-effects", "proxy"];
5
5
  export declare const DELETABLE_SETTINGS: readonly ["proxy"];
6
6
  export declare class SettingsController {
7
7
  private readonly settingsView;
@@ -12,6 +12,8 @@ export declare class SettingsController {
12
12
  private parseBoolean;
13
13
  private isAllowedSetting;
14
14
  private isSettingDeleteAllowed;
15
+ private validateProxyUrl;
16
+ private redactUrlCredentials;
15
17
  showSettings(json?: boolean): Promise<void>;
16
18
  deleteSetting(preference: string): Promise<void>;
17
19
  setSetting(preference: string, value: string): Promise<void>;
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,EACL,iBAAiB,EAMlB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,yEAA0E,CAAC;AAGxG,eAAO,MAAM,kBAAkB,oBAAqB,CAAC;AAYrD,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB;IAGlD,OAAO,CAAC,YAAY,CA+ClB;IAEF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,sBAAsB;IAIjB,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAU3B,aAAa,CAAC,UAAU,EAAE,MAAM;IAehC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAiB1D"}
1
+ {"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAMlB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,kFAAmF,CAAC;AAGjH,eAAO,MAAM,kBAAkB,oBAAqB,CAAC;AAYrD,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB;IAGlD,OAAO,CAAC,YAAY,CA4DlB;IAEF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,oBAAoB;IAaf,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAU3B,aAAa,CAAC,UAAU,EAAE,MAAM;IAehC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAiB1D"}
package/out/command-line/controller/settings-controller.js CHANGED
@@ -4,7 +4,7 @@ exports.SettingsController = exports.DELETABLE_SETTINGS = exports.ALLOWED_SETTIN
4
4
  const cli_shared_1 = require("@forge/cli-shared");
5
5
  const manifest_1 = require("@forge/manifest");
6
6
  const environment_1 = require("../environment");
7
- exports.ALLOWED_SETTINGS = ['usage-analytics', 'default-environment', 'seasonal-effects'];
7
+ exports.ALLOWED_SETTINGS = ['usage-analytics', 'default-environment', 'seasonal-effects', 'proxy'];
8
8
  exports.DELETABLE_SETTINGS = ['proxy'];
9
9
  class SettingsController {
10
10
  settingsView;
@@ -63,6 +63,19 @@ class SettingsController {
63
63
  const parsedValue = this.parseBoolean(value);
64
64
  this.cachedConfigService.setCustomEffects(parsedValue);
65
65
  }
66
+ },
67
+ proxy: {
68
+ description: cli_shared_1.Text.settings.proxy.description,
69
+ get: async () => {
70
+ const proxy = this.cachedConfigService.getProxy();
71
+ return proxy ? this.redactUrlCredentials(proxy) : proxy;
72
+ },
73
+ set: async (value) => {
74
+ this.validateProxyUrl(value);
75
+ this.cachedConfigService.setProxy(value);
76
+ },
77
+ getDisplayValue: (value) => this.redactUrlCredentials(value),
78
+ delete: async () => this.cachedConfigService.deleteProxy()
66
79
  }
67
80
  };
68
81
  parseBoolean(value) {
@@ -81,6 +94,30 @@ class SettingsController {
81
94
  isSettingDeleteAllowed(preference) {
82
95
  return exports.DELETABLE_SETTINGS.includes(preference);
83
96
  }
97
+ validateProxyUrl(value) {
98
+ try {
99
+ const proxyUrl = new URL(value);
100
+ if (proxyUrl.protocol === 'http:' || proxyUrl.protocol === 'https:') {
101
+ return;
102
+ }
103
+ }
104
+ catch (e) {
105
+ }
106
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.proxy.invalidUrl);
107
+ }
108
+ redactUrlCredentials(value) {
109
+ try {
110
+ const url = new URL(value);
111
+ if (url.username || url.password) {
112
+ url.username = '***';
113
+ url.password = url.password ? '***' : '';
114
+ }
115
+ return url.toString();
116
+ }
117
+ catch (e) {
118
+ return value;
119
+ }
120
+ }
84
121
  async showSettings(json) {
85
122
  const settings = [];
86
123
  for (const settingName of exports.ALLOWED_SETTINGS) {
package/out/command-line/controller/settings-controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settings-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":";;;AAAA,kDAO2B;AAC3B,8CAAyC;AAEzC,gDAAgF;AAInE,QAAA,gBAAgB,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,EAAE,kBAAkB,CAAU,CAAC;AAG3F,QAAA,kBAAkB,GAAG,CAAC,OAAO,CAAU,CAAC;AAYrD,MAAa,kBAAkB;IAEV;IACA;IACA;IAHnB,YACmB,YAA0B,EAC1B,mBAAwC,EACxC,YAA+B;QAF/B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAmB;IAC/C,CAAC;IAEI,YAAY,GAAwC;QAC1D,iBAAiB,EAAE;YACjB,WAAW,EAAE,iBAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW;YACrD,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,EAAE;YACnE,GAAG,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;gBAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC7C,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YAChE,CAAC;SACF;QACD,qBAAqB,EAAE;YACrB,WAAW,EAAE,iBAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,WAAW;YACzD,GAAG,EAAE,KAAK,IAAI,EAAE;gBACd,IAAI,CAAC;oBACH,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChD,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;oBAC1E,OAAO,WAAW,CAAC,CAAC,CAAC,IAAA,gCAAmB,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;gBACtE,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,YAAY,iCAAoB,EAAE,CAAC;wBACtC,OAAO;oBACT,CAAC;oBACD,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;YACD,GAAG,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;gBAC3B,IAAA,oCAAsB,EAAC,KAAK,CAAC,CAAC;gBAC9B,MAAM,WAAW,GAAG,IAAA,oCAAsB,EAAC,KAAK,CAAC,CAAC;gBAClD,IAAI,CAAC;oBACH,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChD,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBACrE,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,YAAY,iCAAoB,EAAE,CAAC;wBACtC,MAAM,IAAI,4BAAe,CAAC,iBAAM,CAAC,eAAe,EAAE,CAAC,CAAC;oBACtD,CAAC;oBACD,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;YACD,eAAe,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,iBAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,+BAAkB,CAAC,WAAW,CAAC;YACtG,cAAc,EAAE,iBAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI;SACtD;QACD,kBAAkB,EAAE;YAClB,WAAW,EAAE,iBAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW;YACpD,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;YAC5D,GAAG,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;gBAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC7C,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACzD,CAAC;SACF;KACF,CAAC;IAEM,YAAY,CAAC,KAAc;QACjC,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC;YACd,KAAK,OAAO;gBACV,OAAO,KAAK,CAAC;YACf;gBACE,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,UAAkB;QACzC,OAAO,wBAAgB,CAAC,QAAQ,CAAC,UAAiB,CAAC,CAAC;IACtD,CAAC;IAEO,sBAAsB,CAAC,UAAkB;QAC/C,OAAO,0BAAkB,CAAC,QAAQ,CAAC,UAAiB,CAAC,CAAC;IACxD,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAc;QACtC,MAAM,QAAQ,GAAqD,EAAE,CAAC;QACtE,KAAK,MAAM,WAAW,IAAI,wBAAgB,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC/C,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAAkB;QAC3C,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,0BAAkB,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE9C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,0BAAkB,CAAC,CAAC,CAAC;QACrF,CAAC;QACD,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QAEvB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,UAAkB,EAAE,KAAa;QACvD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAgB,CAAC,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE9C,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEzB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEtF,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC;CACF;AArHD,gDAqHC"}
1
+ {"version":3,"file":"settings-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"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"}
package/out/command-line/index.d.ts CHANGED
@@ -1,6 +1,4 @@
1
- import { HttpProxyAgent } from 'http-proxy-agent';
2
1
  import { Dependencies } from './dependency-injection';
3
- export declare function setupProxy(): HttpProxyAgent<string> | undefined;
4
2
  export declare function registerCommands(deps: Dependencies): Promise<void>;
5
3
  export declare const main: () => Promise<void>;
6
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":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAmEvE,wBAAgB,UAAU,IAAI,cAAc,CAAC,MAAM,CAAC,GAAG,SAAS,CAc/D;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBA6BxD;AAQD,eAAO,MAAM,IAAI,QAAa,OAAO,CAAC,IAAI,CAgBzC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAoEvE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBA6BxD;AAQD,eAAO,MAAM,IAAI,QAAa,OAAO,CAAC,IAAI,CA6BzC,CAAC"}
package/out/command-line/index.js CHANGED
@@ -1,15 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.main = void 0;
4
- exports.setupProxy = setupProxy;
5
4
  exports.registerCommands = registerCommands;
6
- const tslib_1 = require("tslib");
7
5
  const cli_shared_1 = require("@forge/cli-shared");
8
- const http_proxy_agent_1 = require("http-proxy-agent");
9
- const http_1 = tslib_1.__importDefault(require("http"));
10
- const https_1 = tslib_1.__importDefault(require("https"));
11
6
  const dependency_injection_1 = require("./dependency-injection");
12
7
  const version_info_1 = require("./version-info");
8
+ const proxy_1 = require("./proxy");
13
9
  const register_app_commands_1 = require("./register-app-commands");
14
10
  const register_authentication_command_1 = require("./register-authentication-command");
15
11
  const register_autocomplete_commands_1 = require("./register-autocomplete-commands");
@@ -70,22 +66,6 @@ function applyCommandHelpGroups(deps) {
70
66
  }
71
67
  deps.cmd.sortCommandsByGroup(Object.keys(COMMAND_HELP_GROUPS));
72
68
  }
73
- function setupProxy() {
74
- const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
75
- const proxyUrl = cachedConf.get('proxy');
76
- if (proxyUrl && proxyUrl.trim()) {
77
- let agent;
78
- if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
79
- agent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl, { rejectUnauthorized: false });
80
- }
81
- else {
82
- agent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl);
83
- }
84
- http_1.default.globalAgent = agent;
85
- https_1.default.globalAgent = agent;
86
- return agent;
87
- }
88
- }
89
69
  async function registerCommands(deps) {
90
70
  (0, register_autocomplete_commands_1.registerCommands)(deps);
91
71
  (0, register_authentication_command_1.registerCommands)(deps);
@@ -122,6 +102,19 @@ const registerEvents = ({ ui }) => {
122
102
  });
123
103
  };
124
104
  const main = async () => {
105
+ try {
106
+ (0, proxy_1.setupProxy)();
107
+ }
108
+ catch (e) {
109
+ if (e instanceof proxy_1.ProxySetupError) {
110
+ process.stderr.write(`${e.message}\n`);
111
+ if (process.argv.includes('--verbose') && e.cause instanceof Error) {
112
+ process.stderr.write(`${e.cause.stack || e.cause.message}\n`);
113
+ }
114
+ process.exit(1);
115
+ }
116
+ throw e;
117
+ }
125
118
  const cliDetails = (0, version_info_1.getCLIDetails)();
126
119
  const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
127
120
  registerEvents(deps);
package/out/command-line/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"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"}
package/out/command-line/proxy.d.ts ADDED
@@ -0,0 +1,16 @@
1
+ import { UserError } from '@forge/cli-shared';
2
+ import { HttpProxyAgent } from 'http-proxy-agent';
3
+ import { HttpsProxyAgent } from 'https-proxy-agent';
4
+ import { ProxyAgent } from 'undici';
5
+ export interface ProxyAgents {
6
+ httpAgent: HttpProxyAgent<string>;
7
+ httpsAgent: HttpsProxyAgent<string>;
8
+ undiciProxyAgent: ProxyAgent;
9
+ proxy: URL;
10
+ }
11
+ export declare class ProxySetupError extends UserError {
12
+ readonly cause?: unknown | undefined;
13
+ constructor(cause?: unknown | undefined);
14
+ }
15
+ export declare function setupProxy(): ProxyAgents | undefined;
16
+ //# sourceMappingURL=proxy.d.ts.map
package/out/command-line/proxy.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/command-line/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAuB,MAAM,QAAQ,CAAC;AAGzD,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IACpC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,qBAAa,eAAgB,SAAQ,SAAS;aAChB,KAAK,CAAC,EAAE,OAAO;gBAAf,KAAK,CAAC,EAAE,OAAO,YAAA;CAG5C;AAaD,wBAAgB,UAAU,IAAI,WAAW,GAAG,SAAS,CAsCpD"}
package/out/command-line/proxy.js ADDED
@@ -0,0 +1,73 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ProxySetupError = void 0;
4
+ exports.setupProxy = setupProxy;
5
+ const tslib_1 = require("tslib");
6
+ const cli_shared_1 = require("@forge/cli-shared");
7
+ const http_proxy_agent_1 = require("http-proxy-agent");
8
+ const https_proxy_agent_1 = require("https-proxy-agent");
9
+ const http_1 = tslib_1.__importDefault(require("http"));
10
+ const https_1 = tslib_1.__importDefault(require("https"));
11
+ const undici_1 = require("undici");
12
+ const cached_config_service_1 = require("../service/cached-config-service");
13
+ class ProxySetupError extends cli_shared_1.UserError {
14
+ cause;
15
+ constructor(cause) {
16
+ super(cli_shared_1.Text.settings.proxy.setupError);
17
+ this.cause = cause;
18
+ }
19
+ }
20
+ exports.ProxySetupError = ProxySetupError;
21
+ function parseProxyUrl(proxyUrl) {
22
+ try {
23
+ const parsedUrl = new URL(proxyUrl);
24
+ if (parsedUrl.protocol === 'http:' || parsedUrl.protocol === 'https:') {
25
+ return parsedUrl;
26
+ }
27
+ }
28
+ catch (e) {
29
+ return undefined;
30
+ }
31
+ }
32
+ function setupProxy() {
33
+ const environmentProxyUrl = process.env[cached_config_service_1.FORGE_PROXY_ENV_VAR];
34
+ const proxyUrl = environmentProxyUrl?.trim()
35
+ ? environmentProxyUrl
36
+ : cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME).get('proxy');
37
+ if (proxyUrl && proxyUrl.trim()) {
38
+ const proxy = parseProxyUrl(proxyUrl);
39
+ if (!proxy) {
40
+ if (environmentProxyUrl?.trim()) {
41
+ throw new ProxySetupError();
42
+ }
43
+ return undefined;
44
+ }
45
+ try {
46
+ let httpAgent;
47
+ let httpsAgent;
48
+ let undiciProxyAgent;
49
+ if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
50
+ httpAgent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl, { rejectUnauthorized: false });
51
+ httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, { rejectUnauthorized: false });
52
+ undiciProxyAgent = new undici_1.ProxyAgent({
53
+ uri: proxyUrl,
54
+ requestTls: { rejectUnauthorized: false },
55
+ proxyTls: { rejectUnauthorized: false }
56
+ });
57
+ }
58
+ else {
59
+ httpAgent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl);
60
+ httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl);
61
+ undiciProxyAgent = new undici_1.ProxyAgent(proxyUrl);
62
+ }
63
+ http_1.default.globalAgent = httpAgent;
64
+ https_1.default.globalAgent = httpsAgent;
65
+ (0, undici_1.setGlobalDispatcher)(undiciProxyAgent);
66
+ return { httpAgent, httpsAgent, undiciProxyAgent, proxy };
67
+ }
68
+ catch (e) {
69
+ throw new ProxySetupError(e);
70
+ }
71
+ }
72
+ }
73
+ //# sourceMappingURL=proxy.js.map
package/out/command-line/proxy.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/command-line/proxy.ts"],"names":[],"mappings":";;;AAgCA,gCAsCC;;AAtED,kDAAqF;AACrF,uDAAkD;AAClD,yDAAoD;AACpD,wDAAwB;AACxB,0DAA0B;AAC1B,mCAAyD;AACzD,4EAAuE;AASvE,MAAa,eAAgB,SAAQ,sBAAS;IAChB;IAA5B,YAA4B,KAAe;QACzC,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAU;IAE3C,CAAC;CACF;AAJD,0CAIC;AAED,SAAS,aAAa,CAAC,QAAgB;IACrC,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,SAAS,CAAC,QAAQ,KAAK,OAAO,IAAI,SAAS,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACtE,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAgB,UAAU;IACxB,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,2CAAmB,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,mBAAmB,EAAE,IAAI,EAAE;QAC1C,CAAC,CAAC,mBAAmB;QACrB,CAAC,CAAC,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC,GAAG,CAAS,OAAO,CAAC,CAAC;IAClE,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,mBAAmB,EAAE,IAAI,EAAE,EAAE,CAAC;gBAChC,MAAM,IAAI,eAAe,EAAE,CAAC;YAC9B,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC;YACH,IAAI,SAAS,CAAC;YACd,IAAI,UAAU,CAAC;YACf,IAAI,gBAAgB,CAAC;YACrB,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,GAAG,EAAE,CAAC;gBACrD,SAAS,GAAG,IAAI,iCAAc,CAAC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC;gBACxE,UAAU,GAAG,IAAI,mCAAe,CAAC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1E,gBAAgB,GAAG,IAAI,mBAAU,CAAC;oBAChC,GAAG,EAAE,QAAQ;oBACb,UAAU,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE;oBACzC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE;iBACxC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,IAAI,iCAAc,CAAC,QAAQ,CAAC,CAAC;gBACzC,UAAU,GAAG,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAC;gBAC3C,gBAAgB,GAAG,IAAI,mBAAU,CAAC,QAAQ,CAAC,CAAC;YAC9C,CAAC;YACD,cAAI,CAAC,WAAW,GAAG,SAAS,CAAC;YAC7B,eAAK,CAAC,WAAW,GAAG,UAAU,CAAC;YAC/B,IAAA,4BAAmB,EAAC,gBAAgB,CAAC,CAAC;YACtC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;QAC5D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;AACH,CAAC"}
package/out/command-line/register-log-commands.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-log-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAO9C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAc9E;AA+FD,eAAO,MAAM,gBAAgB,GAAI,+CAA+C,YAAY,SAiD3F,CAAC"}
1
+ {"version":3,"file":"register-log-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAO9C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAc9E;AA+FD,eAAO,MAAM,gBAAgB,GAAI,+CAA+C,YAAY,SAoE3F,CAAC"}
package/out/command-line/register-log-commands.js CHANGED
@@ -116,14 +116,18 @@ const registerCommands = ({ cmd, ui, commands: { viewAppLogsCommand } }) => {
116
116
  .command('logs')
117
117
  .requireAppId()
118
118
  .description(cli_shared_3.Text.logs.cmd)
119
- .option('-c, --containers', cli_shared_3.Text.logs.optionContainers, false)
120
119
  .environmentOption()
121
120
  .option('-i, --invocation <invocation>', cli_shared_3.Text.logs.optionInvocation)
122
121
  .option('-n, --limit <limit>', cli_shared_3.Text.logs.optionLimit)
123
122
  .option('-s, --since <since>', cli_shared_3.Text.logs.optionSince)
124
123
  .option('-g, --grouped', cli_shared_3.Text.logs.optionGroup, false)
125
- .action(async ({ environment, invocation, limit: limitStr, grouped, since, containers }) => {
124
+ .option('-c, --containerKey <containerKey>', cli_shared_3.Text.logs.optionContainer)
125
+ .option('--instance <instance>', cli_shared_3.Text.logs.optionContainerInstance)
126
+ .option('--serviceKey <serviceKey>', cli_shared_3.Text.logs.optionService)
127
+ .option('-f, --functionKey <functionKey>', cli_shared_3.Text.logs.optionFunction)
128
+ .action(async ({ environment, invocation, limit: limitStr, grouped, since, containerKey, instance, serviceKey, functionKey }) => {
126
129
  const limit = limitStr ? parseLimit(limitStr) : DEFAULT_LIMIT;
130
+ const containers = Boolean(containerKey || instance || serviceKey);
127
131
  if (invocation) {
128
132
  if (containers) {
129
133
  ui.error(new LogsCommandError(cli_shared_3.Text.logs.invalidOptionWithContainersCmd('-i')));
@@ -148,10 +152,13 @@ const registerCommands = ({ cmd, ui, commands: { viewAppLogsCommand } }) => {
148
152
  }
149
153
  const logs = await viewAppLogsCommand.getAll({
150
154
  environmentKey: environment,
155
+ containerKey,
156
+ containerInstance: instance,
157
+ serviceKey,
158
+ functionKey,
151
159
  limit,
152
160
  startTime,
153
- grouped,
154
- containers
161
+ grouped
155
162
  });
156
163
  [...logs].forEach((log) => logInvocation(ui, log, grouped, containers));
157
164
  }
package/out/command-line/register-log-commands.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-log-commands.js","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"register-log-commands.js","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"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"}
package/out/command-line/register-settings-commands.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqCtD,eAAO,MAAM,qBAAqB,GAAI,8CAA8C,YAAY,SAU/F,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,kBAAkB,YAAY,SAK9D,CAAC"}
1
+ {"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAkCtD,eAAO,MAAM,qBAAqB,GAAI,8CAA8C,YAAY,SAU/F,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,kBAAkB,YAAY,SAM9D,CAAC"}
package/out/command-line/register-settings-commands.js CHANGED
@@ -46,6 +46,7 @@ const registerCommands = ({ cmd, ...deps }) => {
46
46
  const preferences = cmd.command(COMMAND_NAME).requireNoAuthentication().description(cli_shared_1.Text.settings.description);
47
47
  registerSettingsList({ cmd: preferences, ...deps });
48
48
  registerSettingsSet({ cmd: preferences, ...deps });
49
+ (0, exports.registerDeleteSetting)({ cmd: preferences, ...deps });
49
50
  };
50
51
  exports.registerCommands = registerCommands;
51
52
  //# sourceMappingURL=register-settings-commands.js.map
package/out/command-line/register-settings-commands.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-settings-commands.js","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAEzC,0EAAwF;AAExF,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACjC,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAE9C,MAAM,oBAAoB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAC1F,GAAG;SACA,OAAO,CAAC,iBAAiB,CAAC;SAC1B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;SAC3C,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,UAAU,EAAE;SACZ,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QACzB,MAAM,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IACzF,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,sCAAgB,CAAC,CAAC;SAC5D,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;QAClC,MAAM,kBAAkB,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAKK,MAAM,qBAAqB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAClG,GAAG;SACA,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,wCAAkB,CAAC,CAAC;SACjE,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QAC3B,MAAM,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC;AAEK,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAgB,EAAE,EAAE;IACjE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,uBAAuB,EAAE,CAAC,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE/G,oBAAoB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IACpD,mBAAmB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B"}
1
+ {"version":3,"file":"register-settings-commands.js","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAEzC,0EAAwF;AAExF,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACjC,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAE9C,MAAM,oBAAoB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAC1F,GAAG;SACA,OAAO,CAAC,iBAAiB,CAAC;SAC1B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;SAC3C,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,UAAU,EAAE;SACZ,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QACzB,MAAM,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IACzF,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,sCAAgB,CAAC,CAAC;SAC5D,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;QAClC,MAAM,kBAAkB,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAClG,GAAG;SACA,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,wCAAkB,CAAC,CAAC;SACjE,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QAC3B,MAAM,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC;AAEK,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAgB,EAAE,EAAE;IACjE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,uBAAuB,EAAE,CAAC,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE/G,oBAAoB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IACpD,mBAAmB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IACnD,IAAA,6BAAqB,EAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
package/out/deploy/package-upload-deploy.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-upload-deploy.d.ts","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,OAAO,EACP,2BAA2B,EAC3B,eAAe,EAEf,cAAc,EAEd,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEnG,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,kBAAkB,CAAC;IACrC,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,0BAA0B;IAEnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,2BAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc;gBALd,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,QAAQ,EAClB,wBAAwB,EAAE,wBAAwB,EAClD,2BAA2B,EAAE,2BAA2B,EACxD,cAAc,EAAE,cAAc;IAGpC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyCpD,aAAa,CAAC,OAAO,EAAE,OAAO;;;;;;;CA0D5C"}
1
+ {"version":3,"file":"package-upload-deploy.d.ts","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,OAAO,EACP,2BAA2B,EAC3B,eAAe,EAEf,cAAc,EAEd,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEnG,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,kBAAkB,CAAC;IACrC,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,0BAA0B;IAEnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,2BAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc;gBALd,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,QAAQ,EAClB,wBAAwB,EAAE,wBAAwB,EAClD,2BAA2B,EAAE,2BAA2B,EACxD,cAAc,EAAE,cAAc;IAGpC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyCpD,aAAa,CAAC,OAAO,EAAE,OAAO;;;;;;;CAyD5C"}
package/out/deploy/package-upload-deploy.js CHANGED
@@ -67,14 +67,14 @@ class PackageUploadDeployCommand {
67
67
  let artifactUrl;
68
68
  let hostedResourceUploadId;
69
69
  let combinedArtifactUrl;
70
- if (details.buildTag) {
70
+ const shouldUploadCombinedArtifact = await this.statsigService.isCombinedArtifactUploadEnabled();
71
+ if (shouldUploadCombinedArtifact) {
72
+ combinedArtifactUrl = await this.archiveUploader.uploadCombinedArtifact(runtimeArchivePath, resourcesArchives, details.modules, details.buildTag);
73
+ }
74
+ else if (details.buildTag) {
71
75
  artifactUrl = await this.archiveUploader.uploadArchive(runtimeArchivePath, details.buildTag);
72
76
  hostedResourceUploadId = await this.archiveUploader.uploadHostedResources(resourcesArchives, undefined, details.buildTag);
73
77
  }
74
- else if (details.environmentType &&
75
- (await this.statsigService.isCombinedArtifactUploadEnabled(details.environmentType))) {
76
- combinedArtifactUrl = await this.archiveUploader.uploadCombinedArtifact(runtimeArchivePath, resourcesArchives, details.modules, details.buildTag);
77
- }
78
78
  else {
79
79
  [artifactUrl, hostedResourceUploadId] = await Promise.all([
80
80
  this.archiveUploader.uploadArchive(runtimeArchivePath, details.buildTag),
package/out/deploy/package-upload-deploy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-upload-deploy.js","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-upload-deploy.js","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"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"}
package/out/deploy/uploader/artifact-graphql-client.d.ts CHANGED
@@ -5,6 +5,7 @@ interface HostedResourceUploadResponse {
5
5
  }
6
6
  export interface ArtifactClient {
7
7
  getUploadUrl(appDetails: AppDetails, buildTag?: string): Promise<string>;
8
+ processCombinedBuild(appDetails: AppDetails, buildTag: string): Promise<void>;
8
9
  getHostedResourcesUploadUrls(appDetails: AppDetails, resourceKeys: string[], environmentKey?: string, buildTag?: string): Promise<HostedResourceUploadResponse>;
9
10
  }
10
11
  export declare class NoDeploymentURLError extends Error {
@@ -20,6 +21,7 @@ export declare class ArtifactGraphQLClient implements ArtifactClient {
20
21
  private readonly graphqlClient;
21
22
  constructor(graphqlClient: GraphQLClient);
22
23
  getUploadUrl(appDetails: AppDetails, buildTag?: string): Promise<string>;
24
+ processCombinedBuild(appDetails: AppDetails, buildTag: string): Promise<void>;
23
25
  getHostedResourcesUploadUrls(appDetails: AppDetails, resourceKeys: string[], environmentKey?: string, buildTag?: string): Promise<HostedResourceUploadResponse>;
24
26
  }
25
27
  export {};
package/out/deploy/uploader/artifact-graphql-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"artifact-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EAIb,0BAA0B,EAG3B,MAAM,mBAAmB,CAAC;AAE3B,UAAU,4BAA4B;IACpC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzE,4BAA4B,CAC1B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAIzC;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CxE,4BAA4B,CACvC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,4BAA4B,CAAC;CAqDzC"}
1
+ {"version":3,"file":"artifact-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EAKb,0BAA0B,EAG3B,MAAM,mBAAmB,CAAC;AAE3B,UAAU,4BAA4B;IACpC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzE,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,4BAA4B,CAC1B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAIzC;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CxE,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC7E,4BAA4B,CACvC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,4BAA4B,CAAC;CAqDzC"}
package/out/deploy/uploader/artifact-graphql-client.js CHANGED
@@ -60,6 +60,37 @@ class ArtifactGraphQLClient {
60
60
  }
61
61
  return deploymentUrl;
62
62
  }
63
+ async processCombinedBuild(appDetails, buildTag) {
64
+ const query = `
65
+ mutation forge_cli_processCombinedAppBuild($input: ProcessCombinedAppBuildInput!) {
66
+ processCombinedAppBuild(input: $input) {
67
+ success
68
+ errors {
69
+ message
70
+ extensions {
71
+ errorType
72
+ statusCode
73
+ }
74
+ }
75
+ buildTag
76
+ }
77
+ }
78
+ `;
79
+ const { response: { processCombinedAppBuild: { success, errors } }, requestId } = await this.graphqlClient.mutate(query, {
80
+ input: {
81
+ appId: appDetails.id,
82
+ buildTag
83
+ }
84
+ });
85
+ const error = (0, cli_shared_1.getError)(errors);
86
+ if (!success) {
87
+ throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
88
+ requestId,
89
+ code: error.code,
90
+ statusCode: error.statusCode
91
+ });
92
+ }
93
+ }
63
94
  async getHostedResourcesUploadUrls(appDetails, resourceKeys, environmentKey, buildTag) {
64
95
  const artifactQuery = `
65
96
  mutation forge_cli_getHostedResourcesUploadUrls($input: CreateHostedResourceUploadUrlInput!) {
package/out/deploy/uploader/artifact-graphql-client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"artifact-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":";;;AAAA,kDAS2B;AAiB3B,MAAa,oBAAqB,SAAQ,KAAK;IAC7C;QACE,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;CACF;AAJD,oDAIC;AAED,MAAa,oBAAqB,SAAQ,KAAK;IAC7C;QACE,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7C,CAAC;CACF;AAJD,oDAIC;AAED,MAAa,eAAgB,SAAQ,KAAK;IACxC;QACE,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;CACF;AAJD,0CAIC;AAED,MAAa,qBAAqB;IACH;IAA7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEtD,KAAK,CAAC,YAAY,CAAC,UAAsB,EAAE,QAAiB;QACjE,MAAM,aAAa,GAAG;;;;;;;;;;;;;;KAcrB,CAAC;QAEF,MAAM,EACJ,QAAQ,EAAE,EACR,sBAAsB,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,EAC3D,EACD,SAAS,EACV,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAA+D,aAAa,EAAE;YAC/G,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU,CAAC,EAAE;gBACpB,QAAQ;aACT;SACF,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,IAAA,qBAAQ,EAAC,MAAM,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,iCAAoB,CAAC,GAAG,KAAK,CAAC,OAAO,gBAAgB,SAAS,IAAI,SAAS,GAAG,EAAE;gBACxF,SAAS;gBACT,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,oBAAoB,EAAE,CAAC;QACnC,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACvC,UAAsB,EACtB,YAAsB,EACtB,cAAuB,EACvB,QAAiB;QAEjB,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;GAkBvB,CAAC;QACA,MAAM,EACJ,QAAQ,EAAE,EACR,6BAA6B,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAC5E,EACD,SAAS,EACV,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CACjC,aAAa,EACb;YACE,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU,CAAC,EAAE;gBACpB,cAAc,EAAE,cAAc;gBAC9B,YAAY;gBACZ,QAAQ;aACT;SACF,CACF,CAAC;QAEF,MAAM,KAAK,GAAG,IAAA,qBAAQ,EAAC,MAAM,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,iCAAoB,CAAC,GAAG,KAAK,CAAC,OAAO,gBAAgB,SAAS,IAAI,SAAS,GAAG,EAAE;gBACxF,SAAS;gBACT,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,oBAAoB,EAAE,CAAC;QACnC,CAAC;QAED,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC;IACrC,CAAC;CACF;AA3GD,sDA2GC"}
1
+ {"version":3,"file":"artifact-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"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"}
package/out/deploy/uploader/uploader.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,qBAAqB,CACnB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/B,sBAAsB,CACpB,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,qBAAa,kBAAmB,YAAW,eAAe;IAEtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAPf,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EACxC,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe;IAGtC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtE,qBAAqB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BjB,sBAAsB,CACjC,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC;YA+CJ,sBAAsB;IAYpC,OAAO,CAAC,yBAAyB;IAcjC,OAAO,CAAC,IAAI;IAgBZ,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,aAAa;CAGtB"}
1
+ {"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,qBAAqB,CACnB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/B,sBAAsB,CACpB,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,qBAAa,kBAAmB,YAAW,eAAe;IAEtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAPf,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EACxC,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe;IAGtC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtE,qBAAqB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BjB,sBAAsB,CACjC,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC;YAkDJ,sBAAsB;IAYpC,OAAO,CAAC,yBAAyB;IAcjC,OAAO,CAAC,IAAI;IAgBZ,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,aAAa;CAGtB"}
package/out/deploy/uploader/uploader.js CHANGED
@@ -78,6 +78,9 @@ class AppArchiveUploader {
78
78
  const combinedZipPath = await combinedArchive.finalise();
79
79
  this.logger.debug(cli_shared_1.Text.deploy.taskUpload.uploadingArchive(uploadUrl));
80
80
  await this.uploader.uploadFromPath(uploadUrl, combinedZipPath);
81
+ if (buildTag) {
82
+ await this.artifact.processCombinedBuild(appDetails, buildTag);
83
+ }
81
84
  return uploadUrl;
82
85
  }
83
86
  async createDirectoryArchive(directoryAbsolutePath) {
package/out/deploy/uploader/uploader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"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"}
package/out/service/cached-config-service.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { CachedConf } from '@forge/cli-shared';
2
+ export declare const FORGE_PROXY_ENV_VAR = "FORGE_PROXY";
2
3
  export declare class CachedConfigService {
3
4
  private readonly cachedConf;
4
5
  constructor(cachedConf: CachedConf);
package/out/service/cached-config-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAU/C,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE5C,QAAQ,IAAI,MAAM,GAAG,SAAS;IAI9B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIzC,WAAW,IAAI,IAAI;IAInB,uBAAuB,IAAI,OAAO,GAAG,SAAS;IAO9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;IAIzD,OAAO,CAAC,sBAAsB;IAIvB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMxD,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAM9D,gBAAgB,IAAI,MAAM,GAAG,IAAI;IAIjC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAQ3C,gBAAgB,IAAI,OAAO;IAS3B,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAGhD"}
1
+ {"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO/C,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AAIjD,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE5C,QAAQ,IAAI,MAAM,GAAG,SAAS;IAI9B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIzC,WAAW,IAAI,IAAI;IAInB,uBAAuB,IAAI,OAAO,GAAG,SAAS;IAO9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;IAIzD,OAAO,CAAC,sBAAsB;IAIvB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMxD,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAM9D,gBAAgB,IAAI,MAAM,GAAG,IAAI;IAIjC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAQ3C,gBAAgB,IAAI,OAAO;IAS3B,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAGhD"}
package/out/service/cached-config-service.js CHANGED
@@ -1,18 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.CachedConfigService = void 0;
3
+ exports.CachedConfigService = exports.FORGE_PROXY_ENV_VAR = void 0;
4
4
  const ANALYTICS_PREFERENCES_KEY = 'analytics-preferences';
5
5
  const DEFAULT_ENVIRONMENT_KEY = 'default-environment';
6
6
  const ASSISTANT_NAME_KEY = 'assistant-name';
7
7
  const CUSTOM_EFFECTS_KEY = 'seasonal-effects';
8
8
  const PROXY_KEY = 'proxy';
9
+ exports.FORGE_PROXY_ENV_VAR = 'FORGE_PROXY';
9
10
  class CachedConfigService {
10
11
  cachedConf;
11
12
  constructor(cachedConf) {
12
13
  this.cachedConf = cachedConf;
13
14
  }
14
15
  getProxy() {
15
- return this.cachedConf.get(PROXY_KEY);
16
+ return process.env[exports.FORGE_PROXY_ENV_VAR]?.trim() || this.cachedConf.get(PROXY_KEY);
16
17
  }
17
18
  setProxy(preference) {
18
19
  this.cachedConf.set(PROXY_KEY, preference);
package/out/service/cached-config-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cached-config-service.js","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":";;;AAEA,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAC1D,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAC5C,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAC9C,MAAM,SAAS,GAAG,OAAO,CAAC;AAI1B,MAAa,mBAAmB;IACD;IAA7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEhD,QAAQ;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAEM,QAAQ,CAAC,UAAyB;QACvC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,uBAAuB;QAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACxD,CAAC;IAEM,uBAAuB,CAAC,UAAmB;QAChD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,CAAC,IAAI,EAAE,CAAC;IACjF,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACxC,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE1D,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAEM,qBAAqB,CAAC,KAAa,EAAE,UAAkB;QAC5D,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC1D,mBAAmB,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;IACzF,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,gBAAgB,CAAC,IAAmB;QACzC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEM,gBAAgB;QAErB,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,gBAAgB,CAAC,OAAgB;QACtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACF;AAlED,kDAkEC"}
1
+ {"version":3,"file":"cached-config-service.js","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":";;;AAEA,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAC1D,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAC5C,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAC9C,MAAM,SAAS,GAAG,OAAO,CAAC;AACb,QAAA,mBAAmB,GAAG,aAAa,CAAC;AAIjD,MAAa,mBAAmB;IACD;IAA7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEhD,QAAQ;QACb,OAAO,OAAO,CAAC,GAAG,CAAC,2BAAmB,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpF,CAAC;IAEM,QAAQ,CAAC,UAAyB;QACvC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,uBAAuB;QAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACxD,CAAC;IAEM,uBAAuB,CAAC,UAAmB;QAChD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,CAAC,IAAI,EAAE,CAAC;IACjF,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACxC,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE1D,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAEM,qBAAqB,CAAC,KAAa,EAAE,UAAkB;QAC5D,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC1D,mBAAmB,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;IACzF,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,gBAAgB,CAAC,IAAmB;QACzC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEM,gBAAgB;QAErB,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,gBAAgB,CAAC,OAAgB;QACtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACF;AAlED,kDAkEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "13.4.0-next.7-experimental-ccd5143",
3
+ "version": "13.4.0",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -21,14 +21,14 @@
21
21
  "generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
22
22
  },
23
23
  "dependencies": {
24
- "@forge/bundler": "7.2.0-next.7-experimental-ccd5143",
25
- "@forge/cli-shared": "9.4.0-next.6-experimental-ccd5143",
24
+ "@forge/bundler": "7.2.0",
25
+ "@forge/cli-shared": "9.4.0",
26
26
  "@forge/egress": "3.0.0",
27
- "@forge/lint": "6.2.0-next.7-experimental-ccd5143",
28
- "@forge/manifest": "13.3.1-next.0-experimental-ccd5143",
27
+ "@forge/lint": "6.2.0",
28
+ "@forge/manifest": "13.3.1",
29
29
  "@forge/i18n": "1.0.0",
30
30
  "@forge/runtime": "7.0.0",
31
- "@forge/tunnel": "7.1.1-next.7-experimental-ccd5143",
31
+ "@forge/tunnel": "7.1.1",
32
32
  "@forge/util": "3.0.0",
33
33
  "@sentry/node": "7.106.0",
34
34
  "ajv": "^8.18.0",
@@ -49,6 +49,7 @@
49
49
  "fs-extra": "^11.2.0",
50
50
  "hidefile": "^3.0.0",
51
51
  "http-proxy-agent": "^7.0.2",
52
+ "https-proxy-agent": "^7.0.6",
52
53
  "latest-version": "^7.0.0",
53
54
  "lodash": "^4.17.21",
54
55
  "node-machine-id": "^1.1.12",
@@ -59,6 +60,7 @@
59
60
  "semver": "^7.6.0",
60
61
  "tmp": "^0.2.3",
61
62
  "tslib": "^2.6.2",
63
+ "undici": "^7.29.0",
62
64
  "v8-compile-cache": "^2.4.0",
63
65
  "yaml": "^2.3.4"
64
66
  },
@@ -104,4 +106,4 @@
104
106
  "optional": true
105
107
  }
106
108
  }
107
- }
109
+ }