@forge/cli 7.1.0 → 8.0.0-next.6
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.
- package/CHANGELOG.md +73 -0
- package/npm-shrinkwrap.json +61 -35
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +1 -8
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +4 -9
- package/out/command-line/view/tunnel-view.d.ts +2 -2
- package/out/command-line/view/tunnel-view.d.ts.map +1 -1
- package/out/command-line/view/tunnel-view.js +18 -11
- package/out/service/docker-service.d.ts.map +1 -1
- package/out/service/docker-service.js +3 -1
- package/package.json +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,78 @@
|
|
|
1
1
|
# @forge/cli
|
|
2
2
|
|
|
3
|
+
## 8.0.0-next.6
|
|
4
|
+
|
|
5
|
+
### Major Changes
|
|
6
|
+
|
|
7
|
+
- 0f02d7e: Update UI options for forge create in the Forge CLI to
|
|
8
|
+
- rename and preference UI Kit 2
|
|
9
|
+
- remove the option to select UI Kit 1
|
|
10
|
+
|
|
11
|
+
## 7.1.1-next.5
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- Updated dependencies [996dc06]
|
|
16
|
+
- Updated dependencies [fece970]
|
|
17
|
+
- @forge/manifest@6.3.0-next.2
|
|
18
|
+
- @forge/cli-shared@3.25.1-next.4
|
|
19
|
+
- @forge/lint@4.0.9-next.4
|
|
20
|
+
- @forge/tunnel@4.0.7-next.5
|
|
21
|
+
- @forge/bundler@4.15.7-next.5
|
|
22
|
+
|
|
23
|
+
## 7.1.1-next.4
|
|
24
|
+
|
|
25
|
+
### Patch Changes
|
|
26
|
+
|
|
27
|
+
- Updated dependencies [7852a7b]
|
|
28
|
+
- @forge/manifest@6.2.1-next.1
|
|
29
|
+
- @forge/cli-shared@3.25.1-next.3
|
|
30
|
+
- @forge/lint@4.0.9-next.3
|
|
31
|
+
- @forge/tunnel@4.0.7-next.4
|
|
32
|
+
- @forge/bundler@4.15.7-next.4
|
|
33
|
+
|
|
34
|
+
## 7.1.1-next.3
|
|
35
|
+
|
|
36
|
+
### Patch Changes
|
|
37
|
+
|
|
38
|
+
- Updated dependencies [9bf0ff6]
|
|
39
|
+
- @forge/manifest@6.2.1-next.0
|
|
40
|
+
- @forge/cli-shared@3.25.1-next.2
|
|
41
|
+
- @forge/lint@4.0.9-next.2
|
|
42
|
+
- @forge/tunnel@4.0.7-next.3
|
|
43
|
+
- @forge/bundler@4.15.7-next.3
|
|
44
|
+
|
|
45
|
+
## 7.1.1-next.2
|
|
46
|
+
|
|
47
|
+
### Patch Changes
|
|
48
|
+
|
|
49
|
+
- Updated dependencies [a3c27c9]
|
|
50
|
+
- @forge/node-runtime@0.9.0-next.0
|
|
51
|
+
- @forge/bundler@4.15.7-next.2
|
|
52
|
+
- @forge/tunnel@4.0.7-next.2
|
|
53
|
+
|
|
54
|
+
## 7.1.1-next.1
|
|
55
|
+
|
|
56
|
+
### Patch Changes
|
|
57
|
+
|
|
58
|
+
- 23a32d6: Fix Docker error reporting when ngrok not configured
|
|
59
|
+
- Updated dependencies [23a32d6]
|
|
60
|
+
- @forge/cli-shared@3.25.1-next.1
|
|
61
|
+
- @forge/bundler@4.15.7-next.1
|
|
62
|
+
- @forge/lint@4.0.9-next.1
|
|
63
|
+
- @forge/tunnel@4.0.7-next.1
|
|
64
|
+
|
|
65
|
+
## 7.1.1-next.0
|
|
66
|
+
|
|
67
|
+
### Patch Changes
|
|
68
|
+
|
|
69
|
+
- 629f31a: Increase maximum app name length
|
|
70
|
+
- Updated dependencies [629f31a]
|
|
71
|
+
- @forge/cli-shared@3.25.1-next.0
|
|
72
|
+
- @forge/bundler@4.15.7-next.0
|
|
73
|
+
- @forge/lint@4.0.9-next.0
|
|
74
|
+
- @forge/tunnel@4.0.7-next.0
|
|
75
|
+
|
|
3
76
|
## 7.1.0
|
|
4
77
|
|
|
5
78
|
### Minor Changes
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0-next.6",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@forge/cli",
|
|
9
|
-
"version": "
|
|
9
|
+
"version": "8.0.0-next.6",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "UNLICENSED",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@forge/bundler": "4.15.
|
|
14
|
-
"@forge/cli-shared": "3.25.
|
|
13
|
+
"@forge/bundler": "4.15.7-next.5",
|
|
14
|
+
"@forge/cli-shared": "3.25.1-next.4",
|
|
15
15
|
"@forge/egress": "1.2.13",
|
|
16
|
-
"@forge/lint": "4.0.
|
|
17
|
-
"@forge/manifest": "6.
|
|
18
|
-
"@forge/node-runtime": "0.
|
|
16
|
+
"@forge/lint": "4.0.9-next.4",
|
|
17
|
+
"@forge/manifest": "6.3.0-next.2",
|
|
18
|
+
"@forge/node-runtime": "0.9.0-next.0",
|
|
19
19
|
"@forge/runtime": "5.5.0",
|
|
20
|
-
"@forge/tunnel": "4.0.
|
|
20
|
+
"@forge/tunnel": "4.0.7-next.5",
|
|
21
21
|
"@forge/util": "1.4.2",
|
|
22
22
|
"@sentry/node": "7.100.1",
|
|
23
23
|
"ajv": "^8.12.0",
|
|
@@ -878,9 +878,9 @@
|
|
|
878
878
|
"integrity": "sha512-zG50ZRzbKyWHVb/XjI6iCIyyDNmSHdlclvehMjFZ/A3qpHExjSCjaszeY6gBDJKD2GORKKjQ3LS1UyRpiVVvkA=="
|
|
879
879
|
},
|
|
880
880
|
"node_modules/@forge/bundler": {
|
|
881
|
-
"version": "4.15.
|
|
882
|
-
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.
|
|
883
|
-
"integrity": "sha512-
|
|
881
|
+
"version": "4.15.7-next.5",
|
|
882
|
+
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.7-next.5.tgz",
|
|
883
|
+
"integrity": "sha512-Bcf9tqxsvJlnXUnuMKs/ZT0g4meqCNiw5aWEaaDL8RyyHe92IsbkIB05+vv/EL6GvWeNi+ZyIcXqi8Miuww85g==",
|
|
884
884
|
"dependencies": {
|
|
885
885
|
"@babel/core": "^7.24.0",
|
|
886
886
|
"@babel/plugin-transform-class-properties": "^7.23.3",
|
|
@@ -891,9 +891,9 @@
|
|
|
891
891
|
"@babel/preset-typescript": "^7.23.3",
|
|
892
892
|
"@forge/api": "3.3.0",
|
|
893
893
|
"@forge/babel-plugin-transform-ui": "1.1.18",
|
|
894
|
-
"@forge/cli-shared": "3.25.
|
|
895
|
-
"@forge/lint": "4.0.
|
|
896
|
-
"@forge/node-runtime": "0.
|
|
894
|
+
"@forge/cli-shared": "3.25.1-next.4",
|
|
895
|
+
"@forge/lint": "4.0.9-next.4",
|
|
896
|
+
"@forge/node-runtime": "0.9.0-next.0",
|
|
897
897
|
"@forge/util": "1.4.2",
|
|
898
898
|
"assert": "^2.1.0",
|
|
899
899
|
"babel-loader": "^8.3.0",
|
|
@@ -950,11 +950,11 @@
|
|
|
950
950
|
"integrity": "sha512-n4AWXkzMA4Pv4nam+dTu7PHgDQtMwaAF2MalOWF323zGvYKS/gZJY+7efJq0DLP783iTfjvYT879EHhCrfvEXA=="
|
|
951
951
|
},
|
|
952
952
|
"node_modules/@forge/cli-shared": {
|
|
953
|
-
"version": "3.25.
|
|
954
|
-
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.25.
|
|
955
|
-
"integrity": "sha512-
|
|
953
|
+
"version": "3.25.1-next.4",
|
|
954
|
+
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.25.1-next.4.tgz",
|
|
955
|
+
"integrity": "sha512-hpNREU6bqsJjuhYq/th46vsqeKBKOj0PuHNmy4/65ZfODZ0Ll6vhK+DLUBNsfF32m4mxkFezh1pZAySNtghsdg==",
|
|
956
956
|
"dependencies": {
|
|
957
|
-
"@forge/manifest": "6.
|
|
957
|
+
"@forge/manifest": "6.3.0-next.2",
|
|
958
958
|
"@forge/util": "1.4.2",
|
|
959
959
|
"@sentry/node": "7.100.1",
|
|
960
960
|
"adm-zip": "^0.5.10",
|
|
@@ -1005,13 +1005,13 @@
|
|
|
1005
1005
|
}
|
|
1006
1006
|
},
|
|
1007
1007
|
"node_modules/@forge/lint": {
|
|
1008
|
-
"version": "4.0.
|
|
1009
|
-
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-4.0.
|
|
1010
|
-
"integrity": "sha512
|
|
1008
|
+
"version": "4.0.9-next.4",
|
|
1009
|
+
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-4.0.9-next.4.tgz",
|
|
1010
|
+
"integrity": "sha512-/ymQXqGLRwT9lR46Qw/hWA0cWJtUncbOP8HqJQmRMp44rR7orlUFxvizXWlkySIUcQE2QULxhXL378pichzj+g==",
|
|
1011
1011
|
"dependencies": {
|
|
1012
|
-
"@forge/cli-shared": "3.25.
|
|
1012
|
+
"@forge/cli-shared": "3.25.1-next.4",
|
|
1013
1013
|
"@forge/egress": "1.2.13",
|
|
1014
|
-
"@forge/manifest": "6.
|
|
1014
|
+
"@forge/manifest": "6.3.0-next.2",
|
|
1015
1015
|
"@typescript-eslint/typescript-estree": "^5.62.0",
|
|
1016
1016
|
"array.prototype.flatmap": "^1.3.2",
|
|
1017
1017
|
"atlassian-openapi": "^1.0.18",
|
|
@@ -1020,9 +1020,9 @@
|
|
|
1020
1020
|
}
|
|
1021
1021
|
},
|
|
1022
1022
|
"node_modules/@forge/manifest": {
|
|
1023
|
-
"version": "6.
|
|
1024
|
-
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-6.
|
|
1025
|
-
"integrity": "sha512-
|
|
1023
|
+
"version": "6.3.0-next.2",
|
|
1024
|
+
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-6.3.0-next.2.tgz",
|
|
1025
|
+
"integrity": "sha512-xtoIHpuI0KFqRGQ6j3lQFhTjQhylJNN4kB79YraAE3s3I2Eb8BeX3H+5Mnr1aFiUkmI01i90jFuz7StKLphQ6A==",
|
|
1026
1026
|
"dependencies": {
|
|
1027
1027
|
"@forge/util": "1.4.2",
|
|
1028
1028
|
"ajv": "^8.12.0",
|
|
@@ -1037,12 +1037,13 @@
|
|
|
1037
1037
|
}
|
|
1038
1038
|
},
|
|
1039
1039
|
"node_modules/@forge/node-runtime": {
|
|
1040
|
-
"version": "0.
|
|
1041
|
-
"resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.
|
|
1042
|
-
"integrity": "sha512-
|
|
1040
|
+
"version": "0.9.0-next.0",
|
|
1041
|
+
"resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.9.0-next.0.tgz",
|
|
1042
|
+
"integrity": "sha512-4BdOLzam0SWHIr+IB659zLcbCco2TGozVuFE64Vei0jge+iAFu8rV+C72yEe6chRe08XjjzXCN9UrYoXTbg88g==",
|
|
1043
1043
|
"dependencies": {
|
|
1044
1044
|
"@forge/api": "3.3.0",
|
|
1045
1045
|
"@forge/runtime": "5.5.0",
|
|
1046
|
+
"agentkeepalive": "^4.5.0",
|
|
1046
1047
|
"uuid": "^9.0.1"
|
|
1047
1048
|
}
|
|
1048
1049
|
},
|
|
@@ -1080,12 +1081,12 @@
|
|
|
1080
1081
|
}
|
|
1081
1082
|
},
|
|
1082
1083
|
"node_modules/@forge/tunnel": {
|
|
1083
|
-
"version": "4.0.
|
|
1084
|
-
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-4.0.
|
|
1085
|
-
"integrity": "sha512-
|
|
1084
|
+
"version": "4.0.7-next.5",
|
|
1085
|
+
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-4.0.7-next.5.tgz",
|
|
1086
|
+
"integrity": "sha512-U7BvVbKuoPo6o+jHXM0vo1ZtPZyad4v/B6yjtDB0Bl9Es17eItCBYceDjnQGHJKoQ4JS/LA1Lno6GcC5ksVEig==",
|
|
1086
1087
|
"dependencies": {
|
|
1087
|
-
"@forge/bundler": "4.15.
|
|
1088
|
-
"@forge/cli-shared": "3.25.
|
|
1088
|
+
"@forge/bundler": "4.15.7-next.5",
|
|
1089
|
+
"@forge/cli-shared": "3.25.1-next.4",
|
|
1089
1090
|
"@forge/csp": "3.2.0",
|
|
1090
1091
|
"@forge/runtime": "5.5.0",
|
|
1091
1092
|
"express": "^4.18.3",
|
|
@@ -1139,6 +1140,9 @@
|
|
|
1139
1140
|
"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
|
|
1140
1141
|
"engines": {
|
|
1141
1142
|
"node": ">=12"
|
|
1143
|
+
},
|
|
1144
|
+
"funding": {
|
|
1145
|
+
"url": "https://github.com/chalk/ansi-regex?sponsor=1"
|
|
1142
1146
|
}
|
|
1143
1147
|
},
|
|
1144
1148
|
"node_modules/@isaacs/cliui/node_modules/ansi-styles": {
|
|
@@ -2040,6 +2044,17 @@
|
|
|
2040
2044
|
"node": ">=6.0"
|
|
2041
2045
|
}
|
|
2042
2046
|
},
|
|
2047
|
+
"node_modules/agentkeepalive": {
|
|
2048
|
+
"version": "4.5.0",
|
|
2049
|
+
"resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
|
|
2050
|
+
"integrity": "sha1-JnOtE4mzxBjFogxdc2T5PKBL6SM= sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
|
|
2051
|
+
"dependencies": {
|
|
2052
|
+
"humanize-ms": "^1.2.1"
|
|
2053
|
+
},
|
|
2054
|
+
"engines": {
|
|
2055
|
+
"node": ">= 8.0.0"
|
|
2056
|
+
}
|
|
2057
|
+
},
|
|
2043
2058
|
"node_modules/ajv": {
|
|
2044
2059
|
"version": "8.12.0",
|
|
2045
2060
|
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
|
|
@@ -5355,6 +5370,14 @@
|
|
|
5355
5370
|
"node": ">=10.17.0"
|
|
5356
5371
|
}
|
|
5357
5372
|
},
|
|
5373
|
+
"node_modules/humanize-ms": {
|
|
5374
|
+
"version": "1.2.1",
|
|
5375
|
+
"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
|
|
5376
|
+
"integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
|
|
5377
|
+
"dependencies": {
|
|
5378
|
+
"ms": "^2.0.0"
|
|
5379
|
+
}
|
|
5380
|
+
},
|
|
5358
5381
|
"node_modules/hyperdyperid": {
|
|
5359
5382
|
"version": "1.2.0",
|
|
5360
5383
|
"resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
|
|
@@ -9277,7 +9300,7 @@
|
|
|
9277
9300
|
"node_modules/webpack": {
|
|
9278
9301
|
"version": "5.90.3",
|
|
9279
9302
|
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
|
|
9280
|
-
"integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==",
|
|
9303
|
+
"integrity": "sha1-N7j3TT3tBhunibsisx6C7tdb2aw= sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==",
|
|
9281
9304
|
"dependencies": {
|
|
9282
9305
|
"@types/eslint-scope": "^3.7.3",
|
|
9283
9306
|
"@types/estree": "^1.0.5",
|
|
@@ -9752,6 +9775,9 @@
|
|
|
9752
9775
|
},
|
|
9753
9776
|
"engines": {
|
|
9754
9777
|
"node": ">=10"
|
|
9778
|
+
},
|
|
9779
|
+
"funding": {
|
|
9780
|
+
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
|
9755
9781
|
}
|
|
9756
9782
|
},
|
|
9757
9783
|
"node_modules/wrappy": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,
|
|
1
|
+
{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EAGV,+BAA+B,EAEhC,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBALV,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,aAAa,EAChC,kBAAkB,EAAE,aAAa,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IAG5B,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnE,eAAe,CAC1B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
|
|
@@ -35,14 +35,7 @@ class TunnelController {
|
|
|
35
35
|
throw err;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
|
|
39
|
-
await this.dockerTunnelService.run(tunnelOptions, creds, debugEnabled);
|
|
40
|
-
}
|
|
41
|
-
catch (err) {
|
|
42
|
-
if (err instanceof cli_shared_1.HiddenError) {
|
|
43
|
-
throw err;
|
|
44
|
-
}
|
|
45
|
-
}
|
|
38
|
+
await this.dockerTunnelService.run(tunnelOptions, creds, debugEnabled);
|
|
46
39
|
}
|
|
47
40
|
}
|
|
48
41
|
exports.TunnelController = TunnelController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AActD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AAyCD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAC1B,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CA6FjC;AA6CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
|
|
@@ -8,12 +8,12 @@ const cli_shared_1 = require("@forge/cli-shared");
|
|
|
8
8
|
var TemplateCategory;
|
|
9
9
|
(function (TemplateCategory) {
|
|
10
10
|
TemplateCategory["SHOW_ALL"] = "Show All";
|
|
11
|
+
TemplateCategory["UI_KIT_2"] = "UI Kit";
|
|
11
12
|
TemplateCategory["CUSTOM_UI"] = "Custom UI";
|
|
12
13
|
TemplateCategory["BACKEND"] = "Triggers and Validators";
|
|
13
|
-
TemplateCategory["UI_KIT"] = "UI kit";
|
|
14
|
-
TemplateCategory["UI_KIT_2"] = "UI kit 2 (Preview)";
|
|
15
14
|
})(TemplateCategory || (TemplateCategory = {}));
|
|
16
15
|
const PRODUCT_OPTIONS = ['show-all', 'bitbucket', 'compass', 'confluence', 'jira', 'jira-service-management'];
|
|
16
|
+
const MAX_NAME_LENGTH = 60;
|
|
17
17
|
function formatProduct(product) {
|
|
18
18
|
return product
|
|
19
19
|
.split('-')
|
|
@@ -27,8 +27,8 @@ function ensureDirectoryDoesntExist(directory) {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
function ensureValidNameLength(name) {
|
|
30
|
-
if (name.length <= 0 || name.length >
|
|
31
|
-
throw new cli_shared_1.ValidationError(cli_shared_1.Text.create.error.name.tooLong());
|
|
30
|
+
if (name.length <= 0 || name.length > MAX_NAME_LENGTH) {
|
|
31
|
+
throw new cli_shared_1.ValidationError(cli_shared_1.Text.create.error.name.tooLong(MAX_NAME_LENGTH));
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
async function selectedTemplate(filteredTemplates, type, ui) {
|
|
@@ -109,8 +109,6 @@ async function createCommandHandler(ui, createAppCommand, featureFlagService, na
|
|
|
109
109
|
name !== 'blank');
|
|
110
110
|
case TemplateCategory.CUSTOM_UI:
|
|
111
111
|
return name.includes('custom-ui');
|
|
112
|
-
case TemplateCategory.UI_KIT:
|
|
113
|
-
return name.includes('ui-kit');
|
|
114
112
|
case TemplateCategory.UI_KIT_2:
|
|
115
113
|
return name.includes('csuik');
|
|
116
114
|
}
|
|
@@ -118,9 +116,6 @@ async function createCommandHandler(ui, createAppCommand, featureFlagService, na
|
|
|
118
116
|
.map((name) => name.replace('-ui-kit', '').replace('-custom-ui', '').replace('-csuik', ''));
|
|
119
117
|
template = await selectedTemplate(filteredTemplates, type, ui);
|
|
120
118
|
switch (type) {
|
|
121
|
-
case TemplateCategory.UI_KIT:
|
|
122
|
-
template = `${template}-ui-kit`;
|
|
123
|
-
break;
|
|
124
119
|
case TemplateCategory.UI_KIT_2:
|
|
125
120
|
template = `${template}-csuik`;
|
|
126
121
|
break;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import {
|
|
2
|
+
import { exitOnError, UI, UserError } from '@forge/cli-shared';
|
|
3
3
|
import { spawn } from 'cross-spawn';
|
|
4
4
|
export interface DownloadProgressCallbacks {
|
|
5
5
|
onStart: () => void;
|
|
@@ -11,7 +11,7 @@ export declare class TunnelViewError extends UserError {
|
|
|
11
11
|
export declare class TunnelView {
|
|
12
12
|
private readonly ui;
|
|
13
13
|
private readonly FAILED_DOCKER_CONNECTION_MESSAGE;
|
|
14
|
-
constructor(ui:
|
|
14
|
+
constructor(ui: UI);
|
|
15
15
|
dockerPreamble(environmentKey?: string): void;
|
|
16
16
|
getTunnelErrorHandler(exitFn: typeof exitOnError): (err: Error) => Promise<void>;
|
|
17
17
|
updatePullPercent(dataBuffer: Buffer, dockerPullPercent: number): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EAIX,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IAET,OAAO,CAAC,QAAQ,CAAC,EAAE;IAD/B,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAyC;gBAC7D,EAAE,EAAE,EAAE;IAE5B,cAAc,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAW7C,qBAAqB,CAAC,MAAM,EAAE,OAAO,WAAW,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC;IAQhF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM;IA+BxE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQpG,sBAAsB,CAC3B,yBAAyB,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,EACnD,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,yBAAyB,GAC3D,OAAO,CAAC,IAAI,CAAC;CAoDjB"}
|
|
@@ -76,19 +76,26 @@ class TunnelView {
|
|
|
76
76
|
dockerPullPercent = this.updatePullPercent(data, dockerPullPercent);
|
|
77
77
|
spinner.prefixText = cli_shared_1.Text.tunnel.pullDockerProgress(dockerPullPercent);
|
|
78
78
|
});
|
|
79
|
+
let stderr = '';
|
|
79
80
|
(_b = imageDownloadChildProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
|
|
80
|
-
|
|
81
|
-
spinner.stopAndPersist();
|
|
82
|
-
this.ui.warn(cli_shared_1.Text.tunnel.error.dockerPullFailed(''));
|
|
83
|
-
if (data.toString().startsWith(this.FAILED_DOCKER_CONNECTION_MESSAGE)) {
|
|
84
|
-
this.ui.warn(cli_shared_1.Text.tunnel.error.dockerDaemonNotRunning(data.toString(), this.ui.debugEnabled));
|
|
85
|
-
}
|
|
86
|
-
this.ui.emptyLine();
|
|
87
|
-
imageDownloadChildProcess.removeAllListeners();
|
|
88
|
-
onFailure();
|
|
89
|
-
reject(data.toString());
|
|
81
|
+
stderr += data.toString();
|
|
90
82
|
});
|
|
91
|
-
imageDownloadChildProcess.on('exit', () => {
|
|
83
|
+
imageDownloadChildProcess.on('exit', (code) => {
|
|
84
|
+
if (code !== 0) {
|
|
85
|
+
spinner.prefixText = cli_shared_1.Text.tunnel.error.pullDocker;
|
|
86
|
+
spinner.stopAndPersist();
|
|
87
|
+
this.ui.warn(cli_shared_1.Text.tunnel.error.dockerPullFailed);
|
|
88
|
+
stderr = stderr.trim();
|
|
89
|
+
if (stderr.includes(this.FAILED_DOCKER_CONNECTION_MESSAGE)) {
|
|
90
|
+
this.ui.warn(cli_shared_1.Text.tunnel.error.dockerDaemonNotRunning(stderr, this.ui.debugEnabled));
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
this.ui.warn(stderr);
|
|
94
|
+
}
|
|
95
|
+
onFailure();
|
|
96
|
+
reject(new TunnelViewError(cli_shared_1.Text.tunnel.error.dockerPullFailed));
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
92
99
|
spinner.prefixText = cli_shared_1.Text.tunnel.pullDockerProgress(100);
|
|
93
100
|
spinner.stopAndPersist();
|
|
94
101
|
this.ui.info(cli_shared_1.LogColor.trace(cli_shared_1.Text.tunnel.pullDockerSuccess));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAUpD,qBAAa,WAAY,SAAQ,SAAS;aAGtB,IAAI,EAAE,eAAe;gBADrC,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,eAAe;CAIxC;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,eAAe,IAAI,IAAI;IAMvB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAKhD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAexD,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAUpD,qBAAa,WAAY,SAAQ,SAAS;aAGtB,IAAI,EAAE,eAAe;gBADrC,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,eAAe;CAIxC;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,eAAe,IAAI,IAAI;IAMvB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAKhD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAexD,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAW1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IActE,OAAO,CAAC,WAAW;CAWpB"}
|
|
@@ -45,7 +45,9 @@ class DockerService {
|
|
|
45
45
|
}
|
|
46
46
|
downloadImage(imageName) {
|
|
47
47
|
this.verifyInstalled();
|
|
48
|
-
return (0, cross_spawn_1.spawn)('docker', ['pull', imageName]
|
|
48
|
+
return (0, cross_spawn_1.spawn)('docker', ['pull', imageName], {
|
|
49
|
+
env: Object.assign(Object.assign({}, process.env), { DOCKER_CLI_HINTS: '0' })
|
|
50
|
+
});
|
|
49
51
|
}
|
|
50
52
|
startCleanupWorker(pids, containerName) {
|
|
51
53
|
const dockerCleanUp = (0, cross_spawn_1.spawn)(process.env.NODE_ENV === 'development' ? 'ts-node' : 'node', [path_1.default.join(__dirname, '../workers/tunnel-cleanup-worker')], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0-next.6",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
"postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@forge/bundler": "4.15.
|
|
22
|
-
"@forge/cli-shared": "3.25.
|
|
21
|
+
"@forge/bundler": "4.15.7-next.5",
|
|
22
|
+
"@forge/cli-shared": "3.25.1-next.4",
|
|
23
23
|
"@forge/egress": "1.2.13",
|
|
24
|
-
"@forge/lint": "4.0.
|
|
25
|
-
"@forge/manifest": "6.
|
|
26
|
-
"@forge/node-runtime": "0.
|
|
24
|
+
"@forge/lint": "4.0.9-next.4",
|
|
25
|
+
"@forge/manifest": "6.3.0-next.2",
|
|
26
|
+
"@forge/node-runtime": "0.9.0-next.0",
|
|
27
27
|
"@forge/runtime": "5.5.0",
|
|
28
|
-
"@forge/tunnel": "4.0.
|
|
28
|
+
"@forge/tunnel": "4.0.7-next.5",
|
|
29
29
|
"@forge/util": "1.4.2",
|
|
30
30
|
"@sentry/node": "7.100.1",
|
|
31
31
|
"ajv": "^8.12.0",
|