@forge/cli 6.17.0 → 6.17.1-next.8

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 (6) hide show
  1. package/CHANGELOG.md +99 -0
  2. package/npm-shrinkwrap.json +301 -229
  3. package/out/service/tunnel-service.d.ts +15 -12
  4. package/out/service/tunnel-service.d.ts.map +1 -1
  5. package/out/service/tunnel-service.js +88 -99
  6. package/package.json +13 -13
package/CHANGELOG.md CHANGED
@@ -1,5 +1,104 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 6.17.1-next.8
4
+
5
+ ### Patch Changes
6
+
7
+ - bff722d9: Refactor tunnel setup
8
+
9
+ ## 6.17.1-next.7
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies [7d3fb7a]
14
+ - @forge/bundler@4.12.1-next.6
15
+ - @forge/tunnel@3.7.1-next.6
16
+
17
+ ## 6.17.1-next.6
18
+
19
+ ### Patch Changes
20
+
21
+ - c1c5fb5: Bumping dependencies via Renovate:
22
+
23
+ - @types/node
24
+
25
+ - Updated dependencies [3994557]
26
+ - Updated dependencies [c1c5fb5]
27
+ - @forge/bundler@4.12.1-next.5
28
+ - @forge/cli-shared@3.18.1-next.4
29
+ - @forge/egress@1.2.5-next.0
30
+ - @forge/manifest@4.20.1-next.1
31
+ - @forge/runtime@5.0.2-next.0
32
+ - @forge/tunnel@3.7.1-next.5
33
+ - @forge/node-runtime@0.1.3-next.0
34
+ - @forge/lint@3.6.7-next.4
35
+
36
+ ## 6.17.1-next.5
37
+
38
+ ### Patch Changes
39
+
40
+ - 63838e1: Bumping dependencies via Renovate:
41
+
42
+ - form-data
43
+
44
+ ## 6.17.1-next.4
45
+
46
+ ### Patch Changes
47
+
48
+ - 6ec038fe: Bumping dependencies via Renovate:
49
+
50
+ - chalk
51
+
52
+ - Updated dependencies [6ec038fe]
53
+ - @forge/bundler@4.12.1-next.4
54
+ - @forge/cli-shared@3.18.1-next.3
55
+ - @forge/tunnel@3.7.1-next.4
56
+ - @forge/lint@3.6.7-next.3
57
+
58
+ ## 6.17.1-next.3
59
+
60
+ ### Patch Changes
61
+
62
+ - Updated dependencies [4268a819]
63
+ - @forge/cli-shared@3.18.1-next.2
64
+ - @forge/lint@3.6.7-next.2
65
+ - @forge/bundler@4.12.1-next.3
66
+ - @forge/tunnel@3.7.1-next.3
67
+
68
+ ## 6.17.1-next.2
69
+
70
+ ### Patch Changes
71
+
72
+ - Updated dependencies [5540b552]
73
+ - @forge/bundler@4.12.1-next.2
74
+ - @forge/tunnel@3.7.1-next.2
75
+
76
+ ## 6.17.1-next.1
77
+
78
+ ### Patch Changes
79
+
80
+ - Updated dependencies [0a747ea2]
81
+ - @forge/manifest@4.20.1-next.0
82
+ - @forge/cli-shared@3.18.1-next.1
83
+ - @forge/lint@3.6.7-next.1
84
+ - @forge/tunnel@3.7.1-next.1
85
+ - @forge/bundler@4.12.1-next.1
86
+
87
+ ## 6.17.1-next.0
88
+
89
+ ### Patch Changes
90
+
91
+ - fe74dfbd: Bumping dependencies via Renovate:
92
+
93
+ - @sentry/node
94
+
95
+ - Updated dependencies [521fda43]
96
+ - Updated dependencies [fe74dfbd]
97
+ - @forge/bundler@4.12.1-next.0
98
+ - @forge/cli-shared@3.18.1-next.0
99
+ - @forge/tunnel@3.7.1-next.0
100
+ - @forge/lint@3.6.7-next.0
101
+
3
102
  ## 6.17.0
4
103
 
5
104
  ### Minor Changes
package/npm-shrinkwrap.json CHANGED
@@ -1,29 +1,29 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.17.0",
3
+ "version": "6.17.1-next.8",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "6.17.0",
9
+ "version": "6.17.1-next.8",
10
10
  "hasInstallScript": true,
11
11
  "license": "UNLICENSED",
12
12
  "dependencies": {
13
- "@forge/bundler": "4.12.0",
14
- "@forge/cli-shared": "3.18.0",
15
- "@forge/egress": "1.2.4",
16
- "@forge/lint": "3.6.6",
17
- "@forge/manifest": "4.20.0",
18
- "@forge/node-runtime": "0.1.2",
19
- "@forge/runtime": "5.0.1",
20
- "@forge/tunnel": "3.7.0",
13
+ "@forge/bundler": "4.12.1-next.6",
14
+ "@forge/cli-shared": "3.18.1-next.4",
15
+ "@forge/egress": "1.2.5-next.0",
16
+ "@forge/lint": "3.6.7-next.4",
17
+ "@forge/manifest": "4.20.1-next.1",
18
+ "@forge/node-runtime": "0.1.3-next.0",
19
+ "@forge/runtime": "5.0.2-next.0",
20
+ "@forge/tunnel": "3.7.1-next.6",
21
21
  "@forge/util": "1.3.1",
22
- "@sentry/node": "^7.66.0",
22
+ "@sentry/node": "^7.68.0",
23
23
  "ajv": "^8.12.0",
24
24
  "archiver": "^6.0.1",
25
25
  "case": "^1.6.3",
26
- "chalk": "^2.4.2",
26
+ "chalk": "^4.1.2",
27
27
  "cheerio": "^0.22.0",
28
28
  "cli-table3": "^0.6.3",
29
29
  "command-exists": "^1.2.9",
@@ -32,7 +32,7 @@
32
32
  "dayjs": "^1.11.9",
33
33
  "didyoumean": "^1.2.2",
34
34
  "env-paths": "^2.2.1",
35
- "form-data": "^3.0.1",
35
+ "form-data": "^4.0.0",
36
36
  "fs-extra": "^8.1.0",
37
37
  "hidefile": "^3.0.0",
38
38
  "latest-version": "^6.0.0",
@@ -65,7 +65,7 @@
65
65
  "@types/js-yaml": "^3.12.7",
66
66
  "@types/minimatch": "^3.0.5",
67
67
  "@types/mkdirp": "^1.0.2",
68
- "@types/node": "14.18.58",
68
+ "@types/node": "14.18.59",
69
69
  "@types/node-fetch": "^2.6.4",
70
70
  "@types/omelette": "^0.4.2",
71
71
  "@types/semver": "^7.5.1",
@@ -134,6 +134,62 @@
134
134
  "node": ">=6.9.0"
135
135
  }
136
136
  },
137
+ "node_modules/@babel/code-frame/node_modules/ansi-styles": {
138
+ "version": "3.2.1",
139
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
140
+ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0= sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
141
+ "dependencies": {
142
+ "color-convert": "^1.9.0"
143
+ },
144
+ "engines": {
145
+ "node": ">=4"
146
+ }
147
+ },
148
+ "node_modules/@babel/code-frame/node_modules/chalk": {
149
+ "version": "2.4.2",
150
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
151
+ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ= sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
152
+ "dependencies": {
153
+ "ansi-styles": "^3.2.1",
154
+ "escape-string-regexp": "^1.0.5",
155
+ "supports-color": "^5.3.0"
156
+ },
157
+ "engines": {
158
+ "node": ">=4"
159
+ }
160
+ },
161
+ "node_modules/@babel/code-frame/node_modules/color-convert": {
162
+ "version": "1.9.3",
163
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
164
+ "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg= sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
165
+ "dependencies": {
166
+ "color-name": "1.1.3"
167
+ }
168
+ },
169
+ "node_modules/@babel/code-frame/node_modules/color-name": {
170
+ "version": "1.1.3",
171
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
172
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
173
+ },
174
+ "node_modules/@babel/code-frame/node_modules/has-flag": {
175
+ "version": "3.0.0",
176
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
177
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
178
+ "engines": {
179
+ "node": ">=4"
180
+ }
181
+ },
182
+ "node_modules/@babel/code-frame/node_modules/supports-color": {
183
+ "version": "5.5.0",
184
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
185
+ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8= sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
186
+ "dependencies": {
187
+ "has-flag": "^3.0.0"
188
+ },
189
+ "engines": {
190
+ "node": ">=4"
191
+ }
192
+ },
137
193
  "node_modules/@babel/compat-data": {
138
194
  "version": "7.22.9",
139
195
  "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
@@ -455,6 +511,62 @@
455
511
  "node": ">=6.9.0"
456
512
  }
457
513
  },
514
+ "node_modules/@babel/highlight/node_modules/ansi-styles": {
515
+ "version": "3.2.1",
516
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
517
+ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0= sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
518
+ "dependencies": {
519
+ "color-convert": "^1.9.0"
520
+ },
521
+ "engines": {
522
+ "node": ">=4"
523
+ }
524
+ },
525
+ "node_modules/@babel/highlight/node_modules/chalk": {
526
+ "version": "2.4.2",
527
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
528
+ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ= sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
529
+ "dependencies": {
530
+ "ansi-styles": "^3.2.1",
531
+ "escape-string-regexp": "^1.0.5",
532
+ "supports-color": "^5.3.0"
533
+ },
534
+ "engines": {
535
+ "node": ">=4"
536
+ }
537
+ },
538
+ "node_modules/@babel/highlight/node_modules/color-convert": {
539
+ "version": "1.9.3",
540
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
541
+ "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg= sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
542
+ "dependencies": {
543
+ "color-name": "1.1.3"
544
+ }
545
+ },
546
+ "node_modules/@babel/highlight/node_modules/color-name": {
547
+ "version": "1.1.3",
548
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
549
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
550
+ },
551
+ "node_modules/@babel/highlight/node_modules/has-flag": {
552
+ "version": "3.0.0",
553
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
554
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
555
+ "engines": {
556
+ "node": ">=4"
557
+ }
558
+ },
559
+ "node_modules/@babel/highlight/node_modules/supports-color": {
560
+ "version": "5.5.0",
561
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
562
+ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8= sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
563
+ "dependencies": {
564
+ "has-flag": "^3.0.0"
565
+ },
566
+ "engines": {
567
+ "node": ">=4"
568
+ }
569
+ },
458
570
  "node_modules/@babel/parser": {
459
571
  "version": "7.22.16",
460
572
  "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
@@ -735,19 +847,6 @@
735
847
  "node": ">=10.0.0"
736
848
  }
737
849
  },
738
- "node_modules/@forge/api": {
739
- "version": "2.19.0",
740
- "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.19.0.tgz",
741
- "integrity": "sha512-kWyI1J6PdftRPnjPFKIM8g6wZAsJDzWtSFdfDfk07gv3pMOpwkajs+Qh0DOVvSP9FPexV+0lTIW7Rl6mrKImxw==",
742
- "dependencies": {
743
- "@forge/auth": "0.0.5",
744
- "@forge/egress": "1.2.4",
745
- "@forge/storage": "1.5.8",
746
- "@forge/util": "1.3.1",
747
- "@types/node-fetch": "^2.6.4",
748
- "node-fetch": "2.7.0"
749
- }
750
- },
751
850
  "node_modules/@forge/auth": {
752
851
  "version": "0.0.5",
753
852
  "resolved": "https://registry.npmjs.org/@forge/auth/-/auth-0.0.5.tgz",
@@ -757,33 +856,33 @@
757
856
  }
758
857
  },
759
858
  "node_modules/@forge/babel-plugin-transform-ui": {
760
- "version": "1.1.7",
761
- "resolved": "https://registry.npmjs.org/@forge/babel-plugin-transform-ui/-/babel-plugin-transform-ui-1.1.7.tgz",
762
- "integrity": "sha512-heofqwqu/zdWdvxlV3y11cuyDob17LmwaV2lVyfgbpnC/vJE11x6mFpLPmqIzHGi8ogja1c5Kn3pcg3HCRaCFQ=="
859
+ "version": "1.1.8-next.0",
860
+ "resolved": "https://registry.npmjs.org/@forge/babel-plugin-transform-ui/-/babel-plugin-transform-ui-1.1.8-next.0.tgz",
861
+ "integrity": "sha512-xMYbxScJMhHxdk4qMVA7YN2OXf2r6c0qD74mThtrkUiczg7fcmBal7TKGjMWyB/2UUt1cfduwU6pHDUsGZOLUQ=="
763
862
  },
764
863
  "node_modules/@forge/bundler": {
765
- "version": "4.12.0",
766
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.12.0.tgz",
767
- "integrity": "sha512-zh29buHsdtmDDUz8J91IQY5mOGDAMPRw7fz4Asxsx3bNN5X3cV0b/OGVgypJnsg7HrCerT7NAoqTs2rUMX6xuw==",
864
+ "version": "4.12.1-next.6",
865
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.12.1-next.6.tgz",
866
+ "integrity": "sha512-iBov59yucqb/VYpks9YQrp5cvnWOGL+Qv2l8TJZF/tlTKh2k1E151BC5T8T3Kvh9PzncCbqzotMuJAVljSMt/Q==",
768
867
  "dependencies": {
769
- "@babel/core": "^7.22.15",
868
+ "@babel/core": "^7.22.17",
770
869
  "@babel/plugin-transform-class-properties": "^7.22.5",
771
870
  "@babel/plugin-transform-class-static-block": "^7.22.11",
772
871
  "@babel/plugin-transform-numeric-separator": "^7.22.11",
773
872
  "@babel/plugin-transform-optional-chaining": "^7.22.15",
774
873
  "@babel/plugin-transform-react-jsx": "^7.22.15",
775
874
  "@babel/preset-typescript": "^7.22.15",
776
- "@forge/api": "2.19.0",
777
- "@forge/babel-plugin-transform-ui": "1.1.7",
778
- "@forge/cli-shared": "3.18.0",
779
- "@forge/lint": "3.6.6",
780
- "@forge/node-runtime": "0.1.2",
875
+ "@forge/api": "2.19.1-next.0",
876
+ "@forge/babel-plugin-transform-ui": "1.1.8-next.0",
877
+ "@forge/cli-shared": "3.18.1-next.4",
878
+ "@forge/lint": "3.6.7-next.4",
879
+ "@forge/node-runtime": "0.1.3-next.0",
781
880
  "@forge/util": "1.3.1",
782
- "assert": "^2.0.0",
881
+ "assert": "^2.1.0",
783
882
  "babel-loader": "^8.3.0",
784
883
  "browserify-zlib": "^0.2.0",
785
884
  "buffer": "^6.0.3",
786
- "chalk": "^2.4.2",
885
+ "chalk": "^4.1.2",
787
886
  "cheerio": "^0.22.0",
788
887
  "console-browserify": "^1.2.0",
789
888
  "crypto-browserify": "^3.12.0",
@@ -805,7 +904,7 @@
805
904
  "tmp": "^0.2.1",
806
905
  "ts-loader": "^9.4.4",
807
906
  "typescript": "^4.9.5",
808
- "url": "^0.11.1",
907
+ "url": "^0.11.2",
809
908
  "util": "^0.12.5",
810
909
  "webpack": "5.88.2",
811
910
  "webpack-bundle-analyzer": "^4.9.1",
@@ -815,18 +914,36 @@
815
914
  "node": ">=12.13.1"
816
915
  }
817
916
  },
917
+ "node_modules/@forge/bundler/node_modules/@forge/api": {
918
+ "version": "2.19.1-next.0",
919
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.19.1-next.0.tgz",
920
+ "integrity": "sha512-MHLI+YYi/1Mljn0ZF9eaBYJ0MQHFViypkCVJbH0hhvmc1r6axUwHPERQcvV3h+UVpDTlzPGqrkX9DHJ8mBex2g==",
921
+ "dependencies": {
922
+ "@forge/auth": "0.0.5",
923
+ "@forge/egress": "1.2.5-next.0",
924
+ "@forge/storage": "1.5.9-next.0",
925
+ "@forge/util": "1.3.1",
926
+ "@types/node-fetch": "^2.6.4",
927
+ "node-fetch": "2.7.0"
928
+ }
929
+ },
930
+ "node_modules/@forge/bundler/node_modules/@forge/storage": {
931
+ "version": "1.5.9-next.0",
932
+ "resolved": "https://registry.npmjs.org/@forge/storage/-/storage-1.5.9-next.0.tgz",
933
+ "integrity": "sha512-HxcHNxk71AMzvZzZKBV4EqpzWcRiNAOIee/jCvcO3s70VzzKBwh0PnGIxmaVCXkNPZ2XugaYXAUZ8wiNbpcfJw=="
934
+ },
818
935
  "node_modules/@forge/cli-shared": {
819
- "version": "3.18.0",
820
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.18.0.tgz",
821
- "integrity": "sha512-1EoxW0JGX8Gk0bqv3xeTogS5V6WpV7ObMNY0WSmXI+HYi/4tkHr6Tey3N4pN/yaKF9LpwEqTi7fiKUi1SBGQGw==",
936
+ "version": "3.18.1-next.4",
937
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.18.1-next.4.tgz",
938
+ "integrity": "sha512-KwwnMhfw79NYNJyBy9X9AQBBPWEt6l5ZA8C/tTq+bSkzgaeg6CAgXgANuJLhgzfsktp+Y3MuamVCz5AeYdZ46A==",
822
939
  "dependencies": {
823
- "@forge/manifest": "4.20.0",
940
+ "@forge/manifest": "4.20.1-next.1",
824
941
  "@forge/util": "1.3.1",
825
- "@sentry/node": "^7.66.0",
942
+ "@sentry/node": "^7.68.0",
826
943
  "adm-zip": "^0.5.10",
827
- "array.prototype.flatmap": "^1.3.1",
944
+ "array.prototype.flatmap": "^1.3.2",
828
945
  "case": "^1.6.3",
829
- "chalk": "^2.4.2",
946
+ "chalk": "^4.1.2",
830
947
  "cheerio": "^0.22.0",
831
948
  "cli-table3": "^0.6.3",
832
949
  "conf": "^10.2.0",
@@ -855,41 +972,41 @@
855
972
  }
856
973
  },
857
974
  "node_modules/@forge/csp": {
858
- "version": "2.2.1",
859
- "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-2.2.1.tgz",
860
- "integrity": "sha512-LWE6VHPkIy6oiPYdjuKfnNCxZKqXE06jT0W6+5nO6lsfqhFMn3pmB43ZNI3PS3/TJ8Zx+ZSxUOv713V5Ga2p6A==",
975
+ "version": "2.2.2-next.0",
976
+ "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-2.2.2-next.0.tgz",
977
+ "integrity": "sha512-OvW1QCjg/siV/MZAo3ZCidl8ZYzn/0+LUCC6HVpM9pw9b8gGPEW/wHS0VExAoMDDZr07+9r3eWsAQVv+iO6j2w==",
861
978
  "dependencies": {
862
979
  "cheerio": "^0.22.0",
863
980
  "content-security-policy-parser": "^0.4.1"
864
981
  }
865
982
  },
866
983
  "node_modules/@forge/egress": {
867
- "version": "1.2.4",
868
- "resolved": "https://registry.npmjs.org/@forge/egress/-/egress-1.2.4.tgz",
869
- "integrity": "sha512-FIaeMj8mvMuocppoPpxEiPm4WwxCKF7V4c7+a04MoQ+nnoVa4c6Bcj8S6dRcGS4hT8i5YE7UKpo42bENaqS6SQ==",
984
+ "version": "1.2.5-next.0",
985
+ "resolved": "https://registry.npmjs.org/@forge/egress/-/egress-1.2.5-next.0.tgz",
986
+ "integrity": "sha512-jyv8sTUOCYJR4HTfeIdiX+QFnDhWjmlWcLBsoyFo+gZ6hq3aMrF3z5RwsuuWifxBo8VHasth1phJ6yUWZnJHSQ==",
870
987
  "dependencies": {
871
988
  "minimatch": "^5.1.0"
872
989
  }
873
990
  },
874
991
  "node_modules/@forge/lint": {
875
- "version": "3.6.6",
876
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.6.6.tgz",
877
- "integrity": "sha512-LAJHs4aabzyzUGBIElJUkahO7jdvN9kpgczkMQeCqjs9peD8v9FvljTPtTajtAc5iV7+LB/V4M/7WY+dzFczwA==",
992
+ "version": "3.6.7-next.4",
993
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.6.7-next.4.tgz",
994
+ "integrity": "sha512-P9YHqS1GyQrBu7CTA6x8RyHbc6jjkRnjZSyYrEB9YOuUyZ3HwDmgmgxDDyPVwegBD3Z5kUDfIdNOlsCROfg+lg==",
878
995
  "dependencies": {
879
- "@forge/cli-shared": "3.18.0",
880
- "@forge/egress": "1.2.4",
881
- "@forge/manifest": "4.20.0",
996
+ "@forge/cli-shared": "3.18.1-next.4",
997
+ "@forge/egress": "1.2.5-next.0",
998
+ "@forge/manifest": "4.20.1-next.1",
882
999
  "@typescript-eslint/typescript-estree": "^5.62.0",
883
- "array.prototype.flatmap": "^1.3.1",
1000
+ "array.prototype.flatmap": "^1.3.2",
884
1001
  "atlassian-openapi": "^1.0.17",
885
1002
  "cross-spawn": "^7.0.3",
886
1003
  "node-fetch": "2.7.0"
887
1004
  }
888
1005
  },
889
1006
  "node_modules/@forge/manifest": {
890
- "version": "4.20.0",
891
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.20.0.tgz",
892
- "integrity": "sha512-2WQjfKz+TW/f5CtXZuXLNCylXPizLIBGcYFNBQghzaOCW905rkrXK8jGmUuH26fCivtgse89HGw7uilpLIBPxA==",
1007
+ "version": "4.20.1-next.1",
1008
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.20.1-next.1.tgz",
1009
+ "integrity": "sha512-JQH4Bf6NkwdR3lGFDtb9GJBbtRjs2q2Nu4ZZ7sILn9XEt/H1/ZhSFzDySkxMv9OonhERLRFR+fwwx1p4wQq5mA==",
893
1010
  "dependencies": {
894
1011
  "@forge/util": "1.3.1",
895
1012
  "ajv": "^8.12.0",
@@ -899,23 +1016,41 @@
899
1016
  "json-schema-to-typescript": "^9.1.1",
900
1017
  "lodash": "^4.17.21",
901
1018
  "node-fetch": "2.7.0",
902
- "typescript-json-schema": "^0.60.0"
1019
+ "typescript-json-schema": "^0.61.0"
903
1020
  }
904
1021
  },
905
1022
  "node_modules/@forge/node-runtime": {
906
- "version": "0.1.2",
907
- "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.1.2.tgz",
908
- "integrity": "sha512-kUr8tOfNvRtUDDgzxwqv8pT1OFENBz0GquC9JmW5NCnwHecBnasjl9b1HC4H/Fw14JpbBr/HL9QBPshGRfoPiA==",
1023
+ "version": "0.1.3-next.0",
1024
+ "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.1.3-next.0.tgz",
1025
+ "integrity": "sha512-A+I76nsG3ShF5wiPSdAIheew3Diil00hbExTMQwfAkaezx4vT38wFDM/ACkqOaNVBHtI704uUjQbYCg0grDJmA==",
909
1026
  "dependencies": {
910
- "@forge/api": "2.19.0",
911
- "@forge/runtime": "5.0.1",
1027
+ "@forge/api": "2.19.1-next.0",
1028
+ "@forge/runtime": "5.0.2-next.0",
912
1029
  "uuid": "^3.4.0"
913
1030
  }
914
1031
  },
1032
+ "node_modules/@forge/node-runtime/node_modules/@forge/api": {
1033
+ "version": "2.19.1-next.0",
1034
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.19.1-next.0.tgz",
1035
+ "integrity": "sha512-MHLI+YYi/1Mljn0ZF9eaBYJ0MQHFViypkCVJbH0hhvmc1r6axUwHPERQcvV3h+UVpDTlzPGqrkX9DHJ8mBex2g==",
1036
+ "dependencies": {
1037
+ "@forge/auth": "0.0.5",
1038
+ "@forge/egress": "1.2.5-next.0",
1039
+ "@forge/storage": "1.5.9-next.0",
1040
+ "@forge/util": "1.3.1",
1041
+ "@types/node-fetch": "^2.6.4",
1042
+ "node-fetch": "2.7.0"
1043
+ }
1044
+ },
1045
+ "node_modules/@forge/node-runtime/node_modules/@forge/storage": {
1046
+ "version": "1.5.9-next.0",
1047
+ "resolved": "https://registry.npmjs.org/@forge/storage/-/storage-1.5.9-next.0.tgz",
1048
+ "integrity": "sha512-HxcHNxk71AMzvZzZKBV4EqpzWcRiNAOIee/jCvcO3s70VzzKBwh0PnGIxmaVCXkNPZ2XugaYXAUZ8wiNbpcfJw=="
1049
+ },
915
1050
  "node_modules/@forge/runtime": {
916
- "version": "5.0.1",
917
- "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.0.1.tgz",
918
- "integrity": "sha512-on2s7si1Ma7m3+oRuqfUACgUFBIuxtmnmyGfB0TCzqkrIOi97BW1WMj3uyRJk8vdLNwkGt9biP/QWWsEefAs1A==",
1051
+ "version": "5.0.2-next.0",
1052
+ "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.0.2-next.0.tgz",
1053
+ "integrity": "sha512-7aeRWBtcrZa6RThgB2wvpaX8/tFz4h/lkDA1F4g1osxAIWXPJl6QRtZrp9AMY7yQJWJA1GMr1lWqboZLgfJqUg==",
919
1054
  "dependencies": {
920
1055
  "@forge/util": "1.3.1",
921
1056
  "fp-ts": "^2.16.1",
@@ -927,20 +1062,15 @@
927
1062
  "ws": "^7.5.9"
928
1063
  }
929
1064
  },
930
- "node_modules/@forge/storage": {
931
- "version": "1.5.8",
932
- "resolved": "https://registry.npmjs.org/@forge/storage/-/storage-1.5.8.tgz",
933
- "integrity": "sha512-yrfhAkO+GEV/Sij8tAZkieRB/Hs+gi3adMzPXoDbOyC5IWAdmFp3nIP6g+mzVmf+vWbhBvxclUYfVEzSoHOd0Q=="
934
- },
935
1065
  "node_modules/@forge/tunnel": {
936
- "version": "3.7.0",
937
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.7.0.tgz",
938
- "integrity": "sha512-StC3djiuhQln/1Vc1mDcUoll7jyZBGiX8JE1Afam6afwg8lvg4jOQYXpVWFWNYHdVxK/j8gV8LnOpZP/ACYFJg==",
939
- "dependencies": {
940
- "@forge/bundler": "4.12.0",
941
- "@forge/cli-shared": "3.18.0",
942
- "@forge/csp": "2.2.1",
943
- "@forge/runtime": "5.0.1",
1066
+ "version": "3.7.1-next.6",
1067
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.7.1-next.6.tgz",
1068
+ "integrity": "sha512-YjQ8O8BGe9FHPugpj9pwjk8RlckU+1Cf2Fm/8e5zplXMNSZgqdc4SfI8JfVYqCJ/mQ8x9tEC0beqYUVHqLX7gA==",
1069
+ "dependencies": {
1070
+ "@forge/bundler": "4.12.1-next.6",
1071
+ "@forge/cli-shared": "3.18.1-next.4",
1072
+ "@forge/csp": "2.2.2-next.0",
1073
+ "@forge/runtime": "5.0.2-next.0",
944
1074
  "express": "^4.18.2",
945
1075
  "express-intercept": "^1.1.0",
946
1076
  "http-proxy-middleware": "^1.3.1",
@@ -1062,13 +1192,13 @@
1062
1192
  "integrity": "sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="
1063
1193
  },
1064
1194
  "node_modules/@sentry-internal/tracing": {
1065
- "version": "7.66.0",
1066
- "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.66.0.tgz",
1067
- "integrity": "sha1-RepgeRfVWlvKoyKTQTh/9u2bOis= sha512-3vCgC2hC3T45pn53yTDVcRpHoJTBxelDPPZVsipAbZnoOVPkj7n6dNfDhj3I3kwWCBPahPkXmE+R4xViR8VqJg==",
1195
+ "version": "7.68.0",
1196
+ "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.68.0.tgz",
1197
+ "integrity": "sha1-y4Onl7qmcXAs9DyvIoCGiFCg7wQ= sha512-nNKS/q21+Iqzxs2K7T/l3dZi8Z9s/uxsAazpk2AYhFzx9mFnPj1Xfe3dgbFoygNifE+IrpUuldr6D5HQamTDPQ==",
1068
1198
  "dependencies": {
1069
- "@sentry/core": "7.66.0",
1070
- "@sentry/types": "7.66.0",
1071
- "@sentry/utils": "7.66.0",
1199
+ "@sentry/core": "7.68.0",
1200
+ "@sentry/types": "7.68.0",
1201
+ "@sentry/utils": "7.68.0",
1072
1202
  "tslib": "^2.4.1 || ^1.9.3"
1073
1203
  },
1074
1204
  "engines": {
@@ -1076,12 +1206,12 @@
1076
1206
  }
1077
1207
  },
1078
1208
  "node_modules/@sentry/core": {
1079
- "version": "7.66.0",
1080
- "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.66.0.tgz",
1081
- "integrity": "sha1-iWjyqeZB0z43UKjiTR05lTaAxPI= sha512-WMAEPN86NeCJ1IT48Lqiz4MS5gdDjBwP4M63XP4msZn9aujSf2Qb6My5uT87AJr9zBtgk8MyJsuHr35F0P3q1w==",
1209
+ "version": "7.68.0",
1210
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.68.0.tgz",
1211
+ "integrity": "sha1-MjgXr+oGsfwi2zdiC/dPP4pG288= sha512-mT3ObBWgvAky/QF3dZy4KBoXbRXbNsD6evn+mYi9UEeIZQ5NpnQYDEp78mapiEjI/TAHZIhTIuaBhj1Jk0qUUA==",
1082
1212
  "dependencies": {
1083
- "@sentry/types": "7.66.0",
1084
- "@sentry/utils": "7.66.0",
1213
+ "@sentry/types": "7.68.0",
1214
+ "@sentry/utils": "7.68.0",
1085
1215
  "tslib": "^2.4.1 || ^1.9.3"
1086
1216
  },
1087
1217
  "engines": {
@@ -1089,14 +1219,14 @@
1089
1219
  }
1090
1220
  },
1091
1221
  "node_modules/@sentry/node": {
1092
- "version": "7.66.0",
1093
- "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.66.0.tgz",
1094
- "integrity": "sha1-0+CEceHsrijTzQujwYSH7LJEmIE= sha512-PxqIqLr4Sh5xcDfECiBQ4PuZ7v8yTgLhaRkruWrZPYxQrcJFPkwbFkw/IskzVnhT2VwXUmeWEIlRMQKBJ0t83A==",
1095
- "dependencies": {
1096
- "@sentry-internal/tracing": "7.66.0",
1097
- "@sentry/core": "7.66.0",
1098
- "@sentry/types": "7.66.0",
1099
- "@sentry/utils": "7.66.0",
1222
+ "version": "7.68.0",
1223
+ "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.68.0.tgz",
1224
+ "integrity": "sha1-2jQHunRVEJz2JcmhNKP3TsX1yms= sha512-gtcHoi6Xu6Iu8MpPgKJA4E0nozqLvYF0fKtt+27T0QBzWioO6lkxSQkKGWMyJGL0AmpLCex0E28fck/rlbt0LA==",
1225
+ "dependencies": {
1226
+ "@sentry-internal/tracing": "7.68.0",
1227
+ "@sentry/core": "7.68.0",
1228
+ "@sentry/types": "7.68.0",
1229
+ "@sentry/utils": "7.68.0",
1100
1230
  "cookie": "^0.4.1",
1101
1231
  "https-proxy-agent": "^5.0.0",
1102
1232
  "lru_map": "^0.3.3",
@@ -1115,19 +1245,19 @@
1115
1245
  }
1116
1246
  },
1117
1247
  "node_modules/@sentry/types": {
1118
- "version": "7.66.0",
1119
- "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.66.0.tgz",
1120
- "integrity": "sha1-TsKQzGo90gJKYaC/+0aM7bQJ9/s= sha512-uUMSoSiar6JhuD8p7ON/Ddp4JYvrVd2RpwXJRPH1A4H4Bd4DVt1mKJy1OLG6HdeQv39XyhB1lPZckKJg4tATPw==",
1248
+ "version": "7.68.0",
1249
+ "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.68.0.tgz",
1250
+ "integrity": "sha1-YTRREQbu2QvwM9ws52lV9hWCtI8= sha512-5J2pH1Pjx/029zTm3CNY9MaE8Aui81nG7JCtlMp7uEfQ//9Ja4d4Sliz/kV4ARbkIKUZerSgaRAm3xCy5XOXLg==",
1121
1251
  "engines": {
1122
1252
  "node": ">=8"
1123
1253
  }
1124
1254
  },
1125
1255
  "node_modules/@sentry/utils": {
1126
- "version": "7.66.0",
1127
- "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.66.0.tgz",
1128
- "integrity": "sha1-LjfJZhDya8eawGT8pCIuqR/s5o0= sha512-9GYUVgXjK66uXXcLXVMXVzlptqMtq1eJENCuDeezQiEFrNA71KkLDg00wESp+LL+bl3wpVTBApArpbF6UEG5hQ==",
1256
+ "version": "7.68.0",
1257
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.68.0.tgz",
1258
+ "integrity": "sha1-6f0z9OhWz27zhDrhGvPINtiMu4g= sha512-NecnQegvKARyeFmBx7mYmbI17mTvjARWs1nfzY5jhPyNc3Zk4M3bQsgIdnJ1t+jo93UYudlNND7hxhDzjcBAVg==",
1129
1259
  "dependencies": {
1130
- "@sentry/types": "7.66.0",
1260
+ "@sentry/types": "7.68.0",
1131
1261
  "tslib": "^2.4.1 || ^1.9.3"
1132
1262
  },
1133
1263
  "engines": {
@@ -1340,9 +1470,9 @@
1340
1470
  "integrity": "sha1-k+Jb+e51/g/YC1lLxP6w6GIRG1o= sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
1341
1471
  },
1342
1472
  "node_modules/@types/node": {
1343
- "version": "14.18.58",
1344
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.58.tgz",
1345
- "integrity": "sha1-VH5kAn3vuV80gkeUV02r9UF7xhU= sha512-Y8ETZc8afYf6lQ/mVp096phIVsgD/GmDxtm3YaPcc+71jmi/J6zdwbwaUU4JvS56mq6aSfbpkcKhQ5WugrWFPw=="
1473
+ "version": "14.18.59",
1474
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.59.tgz",
1475
+ "integrity": "sha1-K2GlHYdeKk3rDGtJj/IaeOaR7cY= sha512-NWJMpBL2Xs3MY93yrD6YrrTKep8eIA6iMnfG4oIc6LrTRlBZgiSCGiY3V/Owlp6umIBLyKb4F8Q7hxWatjYH5A=="
1346
1476
  },
1347
1477
  "node_modules/@types/node-fetch": {
1348
1478
  "version": "2.6.4",
@@ -1358,6 +1488,19 @@
1358
1488
  "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
1359
1489
  "integrity": "sha1-UNaAyKinj+MKvmkGRTshrYqwrXs= sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
1360
1490
  },
1491
+ "node_modules/@types/node-fetch/node_modules/form-data": {
1492
+ "version": "3.0.1",
1493
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
1494
+ "integrity": "sha1-69U3kbeDVqma+aMA1CgsTV65dV8= sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
1495
+ "dependencies": {
1496
+ "asynckit": "^0.4.0",
1497
+ "combined-stream": "^1.0.8",
1498
+ "mime-types": "^2.1.12"
1499
+ },
1500
+ "engines": {
1501
+ "node": ">= 6"
1502
+ }
1503
+ },
1361
1504
  "node_modules/@types/qs": {
1362
1505
  "version": "6.9.7",
1363
1506
  "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
@@ -1958,13 +2101,13 @@
1958
2101
  }
1959
2102
  },
1960
2103
  "node_modules/array.prototype.flatmap": {
1961
- "version": "1.3.1",
1962
- "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
1963
- "integrity": "sha1-Gq55A8IQBDPLgmHNTtMQqrXEoYM= sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
2104
+ "version": "1.3.2",
2105
+ "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
2106
+ "integrity": "sha1-yafGgx245xnWzmORkBRsJLvT5Sc= sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
1964
2107
  "dependencies": {
1965
2108
  "call-bind": "^1.0.2",
1966
- "define-properties": "^1.1.4",
1967
- "es-abstract": "^1.20.4",
2109
+ "define-properties": "^1.2.0",
2110
+ "es-abstract": "^1.22.1",
1968
2111
  "es-shim-unscopables": "^1.0.0"
1969
2112
  },
1970
2113
  "engines": {
@@ -1999,14 +2142,15 @@
1999
2142
  }
2000
2143
  },
2001
2144
  "node_modules/assert": {
2002
- "version": "2.0.0",
2003
- "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
2004
- "integrity": "sha1-lfwcYW1IcTUQaA8ury0Q3SLgLTI= sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
2145
+ "version": "2.1.0",
2146
+ "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
2147
+ "integrity": "sha1-bZKiONBdwC50J8iB+4voHIRIst0= sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
2005
2148
  "dependencies": {
2006
- "es6-object-assign": "^1.1.0",
2007
- "is-nan": "^1.2.1",
2008
- "object-is": "^1.0.1",
2009
- "util": "^0.12.0"
2149
+ "call-bind": "^1.0.2",
2150
+ "is-nan": "^1.3.2",
2151
+ "object-is": "^1.1.5",
2152
+ "object.assign": "^4.1.4",
2153
+ "util": "^0.12.5"
2010
2154
  }
2011
2155
  },
2012
2156
  "node_modules/async": {
@@ -2454,59 +2598,15 @@
2454
2598
  }
2455
2599
  },
2456
2600
  "node_modules/chalk": {
2457
- "version": "2.4.2",
2458
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
2459
- "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ= sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
2460
- "dependencies": {
2461
- "ansi-styles": "^3.2.1",
2462
- "escape-string-regexp": "^1.0.5",
2463
- "supports-color": "^5.3.0"
2464
- },
2465
- "engines": {
2466
- "node": ">=4"
2467
- }
2468
- },
2469
- "node_modules/chalk/node_modules/ansi-styles": {
2470
- "version": "3.2.1",
2471
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
2472
- "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0= sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
2473
- "dependencies": {
2474
- "color-convert": "^1.9.0"
2475
- },
2476
- "engines": {
2477
- "node": ">=4"
2478
- }
2479
- },
2480
- "node_modules/chalk/node_modules/color-convert": {
2481
- "version": "1.9.3",
2482
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
2483
- "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg= sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
2484
- "dependencies": {
2485
- "color-name": "1.1.3"
2486
- }
2487
- },
2488
- "node_modules/chalk/node_modules/color-name": {
2489
- "version": "1.1.3",
2490
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
2491
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
2492
- },
2493
- "node_modules/chalk/node_modules/has-flag": {
2494
- "version": "3.0.0",
2495
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
2496
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
2497
- "engines": {
2498
- "node": ">=4"
2499
- }
2500
- },
2501
- "node_modules/chalk/node_modules/supports-color": {
2502
- "version": "5.5.0",
2503
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
2504
- "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8= sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
2601
+ "version": "4.1.2",
2602
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
2603
+ "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE= sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
2505
2604
  "dependencies": {
2506
- "has-flag": "^3.0.0"
2605
+ "ansi-styles": "^4.1.0",
2606
+ "supports-color": "^7.1.0"
2507
2607
  },
2508
2608
  "engines": {
2509
- "node": ">=4"
2609
+ "node": ">=10"
2510
2610
  }
2511
2611
  },
2512
2612
  "node_modules/chardet": {
@@ -3701,11 +3801,6 @@
3701
3801
  "es6-symbol": "^3.1.1"
3702
3802
  }
3703
3803
  },
3704
- "node_modules/es6-object-assign": {
3705
- "version": "1.1.0",
3706
- "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
3707
- "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw= sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw=="
3708
- },
3709
3804
  "node_modules/es6-symbol": {
3710
3805
  "version": "3.1.3",
3711
3806
  "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -4210,9 +4305,9 @@
4210
4305
  }
4211
4306
  },
4212
4307
  "node_modules/form-data": {
4213
- "version": "3.0.1",
4214
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
4215
- "integrity": "sha1-69U3kbeDVqma+aMA1CgsTV65dV8= sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
4308
+ "version": "4.0.0",
4309
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
4310
+ "integrity": "sha1-k5Gdrq82HuUpWEubMWZNwSyfpFI= sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
4216
4311
  "dependencies": {
4217
4312
  "asynckit": "^0.4.0",
4218
4313
  "combined-stream": "^1.0.8",
@@ -4574,6 +4669,19 @@
4574
4669
  "node-fetch": "2.6.1"
4575
4670
  }
4576
4671
  },
4672
+ "node_modules/graphql-request/node_modules/form-data": {
4673
+ "version": "3.0.1",
4674
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
4675
+ "integrity": "sha1-69U3kbeDVqma+aMA1CgsTV65dV8= sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
4676
+ "dependencies": {
4677
+ "asynckit": "^0.4.0",
4678
+ "combined-stream": "^1.0.8",
4679
+ "mime-types": "^2.1.12"
4680
+ },
4681
+ "engines": {
4682
+ "node": ">= 6"
4683
+ }
4684
+ },
4577
4685
  "node_modules/graphql-request/node_modules/node-fetch": {
4578
4686
  "version": "2.6.1",
4579
4687
  "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
@@ -5036,18 +5144,6 @@
5036
5144
  "node": ">=12.0.0"
5037
5145
  }
5038
5146
  },
5039
- "node_modules/inquirer/node_modules/chalk": {
5040
- "version": "4.1.2",
5041
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
5042
- "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE= sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
5043
- "dependencies": {
5044
- "ansi-styles": "^4.1.0",
5045
- "supports-color": "^7.1.0"
5046
- },
5047
- "engines": {
5048
- "node": ">=10"
5049
- }
5050
- },
5051
5147
  "node_modules/inquirer/node_modules/ora": {
5052
5148
  "version": "5.4.1",
5053
5149
  "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
@@ -5868,18 +5964,6 @@
5868
5964
  "node": ">=10"
5869
5965
  }
5870
5966
  },
5871
- "node_modules/log-symbols/node_modules/chalk": {
5872
- "version": "4.1.2",
5873
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
5874
- "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE= sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
5875
- "dependencies": {
5876
- "ansi-styles": "^4.1.0",
5877
- "supports-color": "^7.1.0"
5878
- },
5879
- "engines": {
5880
- "node": ">=10"
5881
- }
5882
- },
5883
5967
  "node_modules/lower-case": {
5884
5968
  "version": "2.0.2",
5885
5969
  "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
@@ -8266,18 +8350,6 @@
8266
8350
  "webpack": "^5.0.0"
8267
8351
  }
8268
8352
  },
8269
- "node_modules/ts-loader/node_modules/chalk": {
8270
- "version": "4.1.2",
8271
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
8272
- "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE= sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
8273
- "dependencies": {
8274
- "ansi-styles": "^4.1.0",
8275
- "supports-color": "^7.1.0"
8276
- },
8277
- "engines": {
8278
- "node": ">=10"
8279
- }
8280
- },
8281
8353
  "node_modules/ts-node": {
8282
8354
  "version": "10.9.1",
8283
8355
  "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
@@ -8437,9 +8509,9 @@
8437
8509
  }
8438
8510
  },
8439
8511
  "node_modules/typescript-json-schema": {
8440
- "version": "0.60.0",
8441
- "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.60.0.tgz",
8442
- "integrity": "sha1-jJzTS+YBRB2YjZPY+D7iD9oAmmc= sha512-pgSsm0K4jN2BMVPRVe8aCsct0hGAdmFIU3P8LtuUuwqzZnJh9oEabz82RuVhIWcKAA/yVyHYBKXWkkDid8/R9Q==",
8512
+ "version": "0.61.0",
8513
+ "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.61.0.tgz",
8514
+ "integrity": "sha1-bwnySUabKou2QleN4IAeHh0i+Wk= sha512-sYKnLJjvh9ljdSQkh91LM9PEzgzrgnYfvU226IauISFd+379VCti/VtAFXd00Z9euLkVffh5LRTAO8eamsxUlw==",
8443
8515
  "dependencies": {
8444
8516
  "@types/json-schema": "^7.0.9",
8445
8517
  "@types/node": "^16.9.2",
@@ -8535,12 +8607,12 @@
8535
8607
  "integrity": "sha1-IEsNa2Ba6AvqVL6jkoDNt8n5I8w= sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
8536
8608
  },
8537
8609
  "node_modules/url": {
8538
- "version": "0.11.1",
8539
- "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
8540
- "integrity": "sha1-JvkPYVQn7KG59NaigojBR+IwKjI= sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
8610
+ "version": "0.11.2",
8611
+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.2.tgz",
8612
+ "integrity": "sha1-AvJQpuDZkreBgozUVtRPSb8uGd0= sha512-7yIgNnrST44S7PJ5+jXbdIupfU1nWUdQJBFBeJRclPXiWgCvrSq5Frw8lr/i//n5sqDfzoKmBymMS81l4U/7cg==",
8541
8613
  "dependencies": {
8542
8614
  "punycode": "^1.4.1",
8543
- "qs": "^6.11.0"
8615
+ "qs": "^6.11.2"
8544
8616
  }
8545
8617
  },
8546
8618
  "node_modules/url-parse": {
package/out/service/tunnel-service.d.ts CHANGED
@@ -30,25 +30,23 @@ export declare class InProcessTunnelService implements TunnelService {
30
30
  constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, analyticsService: TunnelAnalyticsService);
31
31
  run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
32
32
  }
33
+ interface EnvironmentVariable {
34
+ key: string;
35
+ value: string;
36
+ }
33
37
  declare abstract class TunnelServiceBase implements TunnelService {
34
38
  protected readonly configFilePortFindingService: ConfigFilePortFindingService;
35
39
  constructor(configFilePortFindingService: ConfigFilePortFindingService);
36
40
  abstract run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
37
- protected getDockerOptions(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials): Promise<string[]>;
38
- protected getPortOptions(port: number, resourcePorts: Record<string, number>, cspReporterPort: number | undefined): string[];
39
- protected getResourcePortEnvVarOption(resourcePorts: Record<string, number>): string[];
40
- protected getUserEnvironmentVariablesOptions(): string[];
41
- protected addEnvVarsForLocalTunnel(env: {
42
- [key: string]: string;
43
- }): Record<string, string>;
44
- protected transformDockerOptionsToEnvVars(options: string[]): {
45
- [key: string]: string;
46
- };
47
- protected getInteractiveOptions(): string[];
48
- protected getVolumeOptions(): string[];
41
+ getTunnelProcessEnvironment(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials, port: number, cspReporterPort: number | undefined, resourcePorts: Record<string, number>): Promise<EnvironmentVariable[]>;
42
+ private getInspectorPortEnvironment;
43
+ private getCspReporterPortEnvironment;
44
+ private getResourcePortEnvironment;
45
+ private getUserEnvironmentVariables;
49
46
  }
50
47
  export declare class LocalTunnelService extends TunnelServiceBase {
51
48
  run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
49
+ private formatEnvForLocalTunnel;
52
50
  }
53
51
  export declare class DockerTunnelService extends TunnelServiceBase {
54
52
  private readonly dockerService;
@@ -57,6 +55,11 @@ export declare class DockerTunnelService extends TunnelServiceBase {
57
55
  run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
58
56
  bootstrapDocker(): Promise<ReturnType<typeof spawn>>;
59
57
  private validateDockerVersion;
58
+ private getDockerPortOptions;
59
+ private formatEnvForDocker;
60
+ private getInteractiveOptions;
61
+ private getVolumeOptions;
62
+ private getDockerOptions;
60
63
  }
61
64
  export {};
62
65
  //# sourceMappingURL=tunnel-service.d.ts.map
package/out/service/tunnel-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC,OAAO,EAIL,WAAW,EAEX,sBAAsB,EACtB,+BAA+B,EAG/B,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAID,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAcpD,eAAO,MAAM,UAAU,QAEuB,CAAC;AAE/C,qBAAa,uBAAwB,SAAQ,WAAW;IAEpD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,OAAO,EACnC,OAAO,CAAC,EAAE,MAAM;IAKX,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,CACD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,SAAS;;CAIpD;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAJhB,EAAE,EAAE,EAAE,EACN,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B,EAC1D,gBAAgB,EAAE,sBAAsB;IAG9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CA2BjB;AAED,uBAAe,iBAAkB,YAAW,aAAa;IAC3C,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B;gBAA1D,4BAA4B,EAAE,4BAA4B;aAEzE,GAAG,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;cAEA,gBAAgB,CAC9B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,OAAO,EACrB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,sBAAsB,GACvC,OAAO,CAAC,MAAM,EAAE,CAAC;IAiCpB,SAAS,CAAC,cAAc,CACtB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,eAAe,EAAE,MAAM,GAAG,SAAS,GAClC,MAAM,EAAE;IAwBX,SAAS,CAAC,2BAA2B,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE;IAItF,SAAS,CAAC,kCAAkC,IAAI,MAAM,EAAE;IAUxD,SAAS,CAAC,wBAAwB,CAAC,GAAG,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ1F,SAAS,CAAC,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAYvF,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAQ3C,SAAS,CAAC,gBAAgB,IAAI,MAAM,EAAE;CAkBvC;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IAC1C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CA6BjB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IAGtD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFjC,4BAA4B,EAAE,4BAA4B,EACzC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,sBAAsB;IAK9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;IA6CH,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;YAKnD,qBAAqB;CASpC"}
1
+ {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
package/out/service/tunnel-service.js CHANGED
@@ -81,120 +81,59 @@ class TunnelServiceBase {
81
81
  constructor(configFilePortFindingService) {
82
82
  this.configFilePortFindingService = configFilePortFindingService;
83
83
  }
84
- async getDockerOptions(tunnelOptions, debugEnabled, { email, token }) {
84
+ async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
85
+ var _a;
85
86
  try {
86
87
  const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
87
88
  return [
88
- '--rm',
89
- `--name`,
90
- exports.CONTAINER_NAME,
91
- '--platform',
92
- 'linux/amd64',
93
- `--env`,
94
- `APP_FOLDER=/app`,
95
- `--env`,
96
- `FORGE_EMAIL=${email}`,
97
- `--env`,
98
- `FORGE_API_TOKEN=${token}`,
99
- `--env`,
100
- `ENVIRONMENT_KEY=${tunnelOptions.environment || 'default'}`,
101
- `--env`,
102
- `TUNNEL_INSPECTOR_ENABLED=${!!tunnelOptions.debug}`,
103
- `--env`,
104
- `FORGE_GRAPHQL_GATEWAY=${graphqlGateway}`,
105
- `--env`,
106
- `VERBOSE_MODE=${debugEnabled}`,
107
- `--env`,
108
- `CLI_DETAILS=${JSON.stringify(cliDetails)}`,
109
- `${exports.IMAGE_NAME}`
89
+ { key: 'APP_FOLDER', value: '/app' },
90
+ { key: 'FORGE_EMAIL', value: email },
91
+ { key: 'FORGE_API_TOKEN', value: token },
92
+ { key: 'ENVIRONMENT_KEY', value: (_a = tunnelOptions.environment) !== null && _a !== void 0 ? _a : 'default' },
93
+ { key: 'TUNNEL_INSPECTOR_ENABLED', value: (!!tunnelOptions.debug).toString() },
94
+ { key: 'FORGE_GRAPHQL_GATEWAY', value: graphqlGateway },
95
+ { key: 'VERBOSE_MODE', value: `${debugEnabled}` },
96
+ { key: 'CLI_DETAILS', value: JSON.stringify(cliDetails) },
97
+ ...this.getInspectorPortEnvironment(port),
98
+ ...this.getCspReporterPortEnvironment(cspReporterPort),
99
+ ...this.getResourcePortEnvironment(resourcePorts),
100
+ ...this.getUserEnvironmentVariables()
110
101
  ];
111
102
  }
112
103
  catch (e) {
113
104
  throw new HiddenDockerTunnelError(false, "Couldn't populate docker options for tunneling");
114
105
  }
115
106
  }
116
- getPortOptions(port, resourcePorts, cspReporterPort) {
117
- const resourcePortOptions = (0, cli_shared_1.flatMap)(Object.values(resourcePorts), (resourcePort) => [
118
- '-p',
119
- `${resourcePort}:${resourcePort}`
120
- ]);
121
- const cspReporterPortOption = cspReporterPort
122
- ? ['-p', `${cspReporterPort}:${cspReporterPort}`, '--env', `CSP_REPORTER_PORT=${cspReporterPort}`]
123
- : [];
124
- const addHostOption = os_1.default.platform() === 'linux' ? ['--add-host', 'host.docker.internal:host-gateway'] : [];
125
- return [
126
- `-p`,
127
- `${port}:${port}`,
128
- ...resourcePortOptions,
129
- ...addHostOption,
130
- ...cspReporterPortOption,
131
- `--env`,
132
- `TUNNEL_INSPECTOR_PORT=${port}`
133
- ];
107
+ getInspectorPortEnvironment(port) {
108
+ return [{ key: 'TUNNEL_INSPECTOR_PORT', value: port.toString() }];
109
+ }
110
+ getCspReporterPortEnvironment(cspReporterPort) {
111
+ if (cspReporterPort) {
112
+ return [{ key: 'CSP_REPORTER_PORT', value: cspReporterPort.toString() }];
113
+ }
114
+ return [];
134
115
  }
135
- getResourcePortEnvVarOption(resourcePorts) {
136
- return ['--env', `RESOURCE_PORT_MAP=${JSON.stringify(resourcePorts)}`];
116
+ getResourcePortEnvironment(resourcePorts) {
117
+ return [{ key: `RESOURCE_PORT_MAP`, value: JSON.stringify(resourcePorts) }];
137
118
  }
138
- getUserEnvironmentVariablesOptions() {
139
- const options = [];
119
+ getUserEnvironmentVariables() {
120
+ const vars = [];
140
121
  Object.keys(process.env)
141
122
  .filter((variable) => variable.startsWith('FORGE_USER_VAR_'))
142
123
  .forEach((name) => {
143
- options.push('--env', `${name}=${process.env[name]}`);
144
- });
145
- return options;
146
- }
147
- addEnvVarsForLocalTunnel(env) {
148
- return Object.assign(Object.assign({}, env), { PATH: process.env.PATH || '', FORCE_COLOR: '1' });
149
- }
150
- transformDockerOptionsToEnvVars(options) {
151
- const envVarRegex = new RegExp('^(\\w+)=(.+)$', 'g');
152
- const envVars = options.filter((opt) => envVarRegex.test(opt));
153
- const envVarObj = {};
154
- envVars.forEach((envVar) => {
155
- envVarRegex.lastIndex = 0;
156
- const [, key, val] = envVarRegex.exec(envVar);
157
- envVarObj[key] = val;
124
+ var _a;
125
+ vars.push({ key: name, value: (_a = process.env[name]) !== null && _a !== void 0 ? _a : 'undefined' });
158
126
  });
159
- return envVarObj;
160
- }
161
- getInteractiveOptions() {
162
- if (DISABLE_TTY) {
163
- return [`-i`];
164
- }
165
- return [`-it`];
166
- }
167
- getVolumeOptions() {
168
- const options = [`-v=${process.cwd()}:/app:cached`];
169
- if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
170
- const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
171
- options.push(`-v=${monorepoRoot}:/monorepo:cached`);
172
- options.push(`-v=${monorepoRoot}/node_modules/ngrok/docker-bin:/monorepo/node_modules/ngrok/bin`);
173
- }
174
- if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
175
- const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');
176
- mounts.forEach((mount) => {
177
- options.push(`-v=${mount}:cached`);
178
- });
179
- }
180
- return options;
127
+ return vars;
181
128
  }
182
129
  }
183
130
  class LocalTunnelService extends TunnelServiceBase {
184
131
  async run(tunnelOptions, creds, debugEnabled, onError) {
185
- const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
186
132
  const port = await (0, portfinder_1.getPortPromise)();
187
133
  const resourcePorts = await this.configFilePortFindingService.findPorts();
188
134
  const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
189
- const portOptions = this.getPortOptions(port, resourcePorts, cspReporterPort);
190
- const envVariablesOptions = this.getUserEnvironmentVariablesOptions();
191
- const resourcePortEnvVarOption = this.getResourcePortEnvVarOption(resourcePorts);
192
- const env = this.addEnvVarsForLocalTunnel(this.transformDockerOptionsToEnvVars([
193
- ...dockerOptions,
194
- ...portOptions,
195
- ...envVariablesOptions,
196
- ...resourcePortEnvVarOption
197
- ]));
135
+ const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
136
+ const env = this.formatEnvForLocalTunnel(environment);
198
137
  const process = (0, cross_spawn_1.spawn)('forge-tunnel', [], {
199
138
  stdio: 'inherit',
200
139
  env: Object.assign(Object.assign({}, env), { FORGE_DEV_TUNNEL: 'true' })
@@ -203,6 +142,12 @@ class LocalTunnelService extends TunnelServiceBase {
203
142
  process.on('error', onError);
204
143
  }
205
144
  }
145
+ formatEnvForLocalTunnel(environment) {
146
+ return Object.assign({}, {
147
+ PATH: process.env.PATH || '',
148
+ FORCE_COLOR: '1'
149
+ }, ...environment.map(({ key, value }) => ({ [key]: value })));
150
+ }
206
151
  }
207
152
  exports.LocalTunnelService = LocalTunnelService;
208
153
  class DockerTunnelService extends TunnelServiceBase {
@@ -214,22 +159,22 @@ class DockerTunnelService extends TunnelServiceBase {
214
159
  async run(tunnelOptions, creds, debugEnabled) {
215
160
  var _a;
216
161
  await this.validateDockerVersion(creds, debugEnabled);
217
- const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
162
+ const dockerOptions = await this.getDockerOptions();
218
163
  const port = await (0, portfinder_1.getPortPromise)();
219
164
  const resourcePorts = await this.configFilePortFindingService.findPorts(port);
220
165
  const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
221
- const portOptions = this.getPortOptions(port, resourcePorts, cspReporterPort);
166
+ const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
167
+ const portOptions = this.getDockerPortOptions(port, resourcePorts, cspReporterPort);
222
168
  const interactiveOptions = this.getInteractiveOptions();
223
169
  const volumeOptions = this.getVolumeOptions();
224
- const envVariablesOptions = this.getUserEnvironmentVariablesOptions();
225
- const resourcePortEnvVarOption = this.getResourcePortEnvVarOption(resourcePorts);
170
+ const env = this.formatEnvForDocker(environment);
226
171
  const docker = this.dockerService.runContainer([
227
172
  ...interactiveOptions,
228
173
  ...volumeOptions,
229
174
  ...portOptions,
230
- ...envVariablesOptions,
231
- ...resourcePortEnvVarOption,
232
- ...dockerOptions
175
+ ...dockerOptions,
176
+ ...env,
177
+ exports.IMAGE_NAME
233
178
  ]);
234
179
  docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
235
180
  (_a = docker.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (error) => {
@@ -262,5 +207,49 @@ class DockerTunnelService extends TunnelServiceBase {
262
207
  throw new HiddenDockerTunnelError(true);
263
208
  }
264
209
  }
210
+ getDockerPortOptions(port, resourcePorts, cspReporterPort) {
211
+ const resourcePortOptions = (0, cli_shared_1.flatMap)(Object.values(resourcePorts), (resourcePort) => [
212
+ '-p',
213
+ `${resourcePort}:${resourcePort}`
214
+ ]);
215
+ const cspReporterPortOption = [];
216
+ if (cspReporterPort) {
217
+ cspReporterPortOption.push('-p', `${cspReporterPort}:${cspReporterPort}`);
218
+ }
219
+ const addHostOption = os_1.default.platform() === 'linux' ? ['--add-host', 'host.docker.internal:host-gateway'] : [];
220
+ return [`-p`, `${port}:${port}`, ...resourcePortOptions, ...addHostOption, ...cspReporterPortOption];
221
+ }
222
+ formatEnvForDocker(environment) {
223
+ return (0, cli_shared_1.flatMap)(environment, ({ key, value }) => ['--env', `${key}=${value}`]);
224
+ }
225
+ getInteractiveOptions() {
226
+ if (DISABLE_TTY) {
227
+ return [`-i`];
228
+ }
229
+ return [`-it`];
230
+ }
231
+ getVolumeOptions() {
232
+ const options = [`-v=${process.cwd()}:/app:cached`];
233
+ if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
234
+ const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
235
+ options.push(`-v=${monorepoRoot}:/monorepo:cached`);
236
+ options.push(`-v=${monorepoRoot}/node_modules/ngrok/docker-bin:/monorepo/node_modules/ngrok/bin`);
237
+ }
238
+ if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
239
+ const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');
240
+ mounts.forEach((mount) => {
241
+ options.push(`-v=${mount}:cached`);
242
+ });
243
+ }
244
+ return options;
245
+ }
246
+ async getDockerOptions() {
247
+ try {
248
+ return ['--rm', `--name`, exports.CONTAINER_NAME, '--platform', 'linux/amd64'];
249
+ }
250
+ catch (e) {
251
+ throw new HiddenDockerTunnelError(false, "Couldn't populate docker options for tunneling");
252
+ }
253
+ }
265
254
  }
266
255
  exports.DockerTunnelService = DockerTunnelService;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.17.0",
3
+ "version": "6.17.1-next.8",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "UNLICENSED",
@@ -18,20 +18,20 @@
18
18
  "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
19
19
  },
20
20
  "dependencies": {
21
- "@forge/bundler": "4.12.0",
22
- "@forge/cli-shared": "3.18.0",
23
- "@forge/egress": "1.2.4",
24
- "@forge/lint": "3.6.6",
25
- "@forge/manifest": "4.20.0",
26
- "@forge/node-runtime": "0.1.2",
27
- "@forge/runtime": "5.0.1",
28
- "@forge/tunnel": "3.7.0",
21
+ "@forge/bundler": "4.12.1-next.6",
22
+ "@forge/cli-shared": "3.18.1-next.4",
23
+ "@forge/egress": "1.2.5-next.0",
24
+ "@forge/lint": "3.6.7-next.4",
25
+ "@forge/manifest": "4.20.1-next.1",
26
+ "@forge/node-runtime": "0.1.3-next.0",
27
+ "@forge/runtime": "5.0.2-next.0",
28
+ "@forge/tunnel": "3.7.1-next.6",
29
29
  "@forge/util": "1.3.1",
30
- "@sentry/node": "^7.66.0",
30
+ "@sentry/node": "^7.68.0",
31
31
  "ajv": "^8.12.0",
32
32
  "archiver": "^6.0.1",
33
33
  "case": "^1.6.3",
34
- "chalk": "^2.4.2",
34
+ "chalk": "^4.1.2",
35
35
  "cheerio": "^0.22.0",
36
36
  "cli-table3": "^0.6.3",
37
37
  "command-exists": "^1.2.9",
@@ -40,7 +40,7 @@
40
40
  "dayjs": "^1.11.9",
41
41
  "didyoumean": "^1.2.2",
42
42
  "env-paths": "^2.2.1",
43
- "form-data": "^3.0.1",
43
+ "form-data": "^4.0.0",
44
44
  "fs-extra": "^8.1.0",
45
45
  "hidefile": "^3.0.0",
46
46
  "latest-version": "^6.0.0",
@@ -70,7 +70,7 @@
70
70
  "@types/js-yaml": "^3.12.7",
71
71
  "@types/minimatch": "^3.0.5",
72
72
  "@types/mkdirp": "^1.0.2",
73
- "@types/node": "14.18.58",
73
+ "@types/node": "14.18.59",
74
74
  "@types/node-fetch": "^2.6.4",
75
75
  "@types/omelette": "^0.4.2",
76
76
  "@types/semver": "^7.5.1",