@forge/cli 6.13.0-next.7 → 6.13.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 (19) hide show
  1. package/CHANGELOG.md +41 -0
  2. package/npm-shrinkwrap.json +79 -79
  3. package/out/analytics-client/analytics-client.d.ts +1 -1
  4. package/out/analytics-client/analytics-client.d.ts.map +1 -1
  5. package/out/analytics-client/analytics-client.js +3 -1
  6. package/out/command-line/command.d.ts.map +1 -1
  7. package/out/command-line/command.js +1 -4
  8. package/out/command-line/dependency-injection.d.ts.map +1 -1
  9. package/out/command-line/dependency-injection.js +2 -2
  10. package/out/service/docker-service.d.ts +2 -1
  11. package/out/service/docker-service.d.ts.map +1 -1
  12. package/out/service/docker-service.js +2 -2
  13. package/out/service/tunnel-analytics-service.d.ts +6 -2
  14. package/out/service/tunnel-analytics-service.d.ts.map +1 -1
  15. package/out/service/tunnel-analytics-service.js +11 -1
  16. package/out/service/tunnel-service.d.ts +7 -3
  17. package/out/service/tunnel-service.d.ts.map +1 -1
  18. package/out/service/tunnel-service.js +30 -3
  19. package/package.json +6 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,46 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 6.13.0
4
+
5
+ ### Minor Changes
6
+
7
+ - 85bf4a85: Refactor and cleanup usages of environmentToOption
8
+ - fb00b34f: CLI selects bundler based on runtime type specified in manifest
9
+ - 2afc2fea: Add tunnel analytic events on errors
10
+ - f00b7492: Show additional message when using forge settings set
11
+ - 2c219665: Added pre deployment prompt and post deployment message if custom entities reindexing is in progress, improved storage index command and increased index limit from 5 to 7
12
+
13
+ ### Patch Changes
14
+
15
+ - 0b2835ad: Run E2E tests in parallel
16
+ - Updated dependencies [85bf4a85]
17
+ - Updated dependencies [fb00b34f]
18
+ - Updated dependencies [2afc2fea]
19
+ - Updated dependencies [2517649d]
20
+ - Updated dependencies [f00b7492]
21
+ - Updated dependencies [91b77cb7]
22
+ - Updated dependencies [7cab7f9c]
23
+ - Updated dependencies [2c219665]
24
+ - @forge/cli-shared@3.14.0
25
+ - @forge/tunnel@3.6.0
26
+ - @forge/bundler@4.10.0
27
+ - @forge/lint@3.5.2
28
+ - @forge/manifest@4.15.0
29
+
30
+ ## 6.13.0-next.8
31
+
32
+ ### Minor Changes
33
+
34
+ - 2afc2fea: Add tunnel analytic events on errors
35
+
36
+ ### Patch Changes
37
+
38
+ - Updated dependencies [2afc2fea]
39
+ - @forge/cli-shared@3.14.0-next.6
40
+ - @forge/tunnel@3.6.0-next.7
41
+ - @forge/bundler@4.10.0-next.7
42
+ - @forge/lint@3.5.2-next.6
43
+
3
44
  ## 6.13.0-next.7
4
45
 
5
46
  ### Patch Changes
package/npm-shrinkwrap.json CHANGED
@@ -1,22 +1,22 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.13.0-next.7",
3
+ "version": "6.13.0",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "6.13.0-next.7",
9
+ "version": "6.13.0",
10
10
  "hasInstallScript": true,
11
11
  "license": "UNLICENSED",
12
12
  "dependencies": {
13
- "@forge/bundler": "4.10.0-next.6",
14
- "@forge/cli-shared": "3.14.0-next.5",
13
+ "@forge/bundler": "4.10.0",
14
+ "@forge/cli-shared": "3.14.0",
15
15
  "@forge/egress": "1.2.1",
16
- "@forge/lint": "3.5.2-next.5",
17
- "@forge/manifest": "4.15.0-next.0",
16
+ "@forge/lint": "3.5.2",
17
+ "@forge/manifest": "4.15.0",
18
18
  "@forge/runtime": "4.4.1",
19
- "@forge/tunnel": "3.5.2-next.6",
19
+ "@forge/tunnel": "3.6.0",
20
20
  "@forge/util": "1.2.3",
21
21
  "@sentry/node": "^7.29.0",
22
22
  "ajv": "^6.12.6",
@@ -651,6 +651,18 @@
651
651
  "node": ">=10.0.0"
652
652
  }
653
653
  },
654
+ "node_modules/@forge/api": {
655
+ "version": "2.18.0",
656
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.18.0.tgz",
657
+ "integrity": "sha512-C2SO/0Z9k8EL6RVwxaMDBd/p5gVjvOA8As8/CUl/HgPy4B1cLjT/xrLqvRiUZRSlikXuQzBzIXh3vKAEB30aHw==",
658
+ "dependencies": {
659
+ "@forge/auth": "0.0.1",
660
+ "@forge/egress": "1.2.1",
661
+ "@forge/storage": "1.5.3",
662
+ "@types/node-fetch": "^2.6.4",
663
+ "node-fetch": "2.6.11"
664
+ }
665
+ },
654
666
  "node_modules/@forge/auth": {
655
667
  "version": "0.0.1",
656
668
  "resolved": "https://registry.npmjs.org/@forge/auth/-/auth-0.0.1.tgz",
@@ -670,9 +682,9 @@
670
682
  "integrity": "sha512-n2eXc/shPwx0ahD3NNfsmeiFoBCukeglt2htePaNnJBDt0VpC6R4Njsjc/wnL5OMgrGl5/GXzN+mymngXrw9qQ=="
671
683
  },
672
684
  "node_modules/@forge/bundler": {
673
- "version": "4.10.0-next.6",
674
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.0-next.6.tgz",
675
- "integrity": "sha512-rBYI0p4Td/+pbNVMgVZHEZ5WuLS6VlWxexyru10HR6/qjxIi08B4kaodL3qqtppBijSjC8Ajq1scsTBdKwMu/g==",
685
+ "version": "4.10.0",
686
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.0.tgz",
687
+ "integrity": "sha512-6DtFEk2TqJlSjqlHxReDMKZaaC+CxtN+L7GSJ2zvZPkLrFEmmr/jPXocF9iKF4X1eb0gHK5ki7Hvz/2hgYHKJg==",
676
688
  "dependencies": {
677
689
  "@babel/core": "^7.16.7",
678
690
  "@babel/plugin-proposal-class-properties": "^7.16.7",
@@ -680,10 +692,10 @@
680
692
  "@babel/plugin-proposal-optional-chaining": "^7.16.7",
681
693
  "@babel/plugin-transform-react-jsx": "^7.16.7",
682
694
  "@babel/preset-typescript": "^7.16.7",
683
- "@forge/api": "2.18.0-next.0",
695
+ "@forge/api": "2.18.0",
684
696
  "@forge/babel-plugin-transform-ui": "1.1.2",
685
- "@forge/cli-shared": "3.14.0-next.5",
686
- "@forge/lint": "3.5.2-next.5",
697
+ "@forge/cli-shared": "3.14.0",
698
+ "@forge/lint": "3.5.2",
687
699
  "@forge/runtime": "4.4.1",
688
700
  "@forge/util": "1.2.3",
689
701
  "assert": "^1.1.1",
@@ -719,24 +731,12 @@
719
731
  "node": ">=12.13.1"
720
732
  }
721
733
  },
722
- "node_modules/@forge/bundler/node_modules/@forge/api": {
723
- "version": "2.18.0-next.0",
724
- "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.18.0-next.0.tgz",
725
- "integrity": "sha512-4XoQG/QoZxr4XF+8NAvjFTpwxAIb6DQXfphzdEpRS7gxgvp6kDOtFDMqYQaax1POfSE1aqh9rRmdZRTVgeL30Q==",
726
- "dependencies": {
727
- "@forge/auth": "0.0.1",
728
- "@forge/egress": "1.2.1",
729
- "@forge/storage": "1.5.3",
730
- "@types/node-fetch": "^2.6.4",
731
- "node-fetch": "2.6.11"
732
- }
733
- },
734
734
  "node_modules/@forge/cli-shared": {
735
- "version": "3.14.0-next.5",
736
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.14.0-next.5.tgz",
737
- "integrity": "sha512-Z/WFEUm/qRGF2ANWZEwzCIgWdlS4wgjt1szOvm1wkw0XR0Gp1O6vi0l9bOxZ6u2fr6+C9qB8gui9PklcWzY7iw==",
735
+ "version": "3.14.0",
736
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.14.0.tgz",
737
+ "integrity": "sha512-nk+5wOgtJUzT8nUTZbLJYokH3ByAXo2w56cWdmML1Q1YbWLnXzTXj0/xOCAwNVtvgdno9P4TGdpdKfwbDF7x9w==",
738
738
  "dependencies": {
739
- "@forge/manifest": "4.15.0-next.0",
739
+ "@forge/manifest": "4.15.0",
740
740
  "@forge/util": "1.2.3",
741
741
  "@sentry/node": "^7.29.0",
742
742
  "array.prototype.flatmap": "^1.2.3",
@@ -762,6 +762,7 @@
762
762
  "node-fetch": "2.6.11",
763
763
  "ora": "^4.0.3",
764
764
  "recursive-readdir": "^2.2.3",
765
+ "semver": "^6.3.0",
765
766
  "terminal-link": "^2.1.1",
766
767
  "tmp": "^0.1.0",
767
768
  "typescript": "^4.8.4",
@@ -787,13 +788,13 @@
787
788
  }
788
789
  },
789
790
  "node_modules/@forge/lint": {
790
- "version": "3.5.2-next.5",
791
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.2-next.5.tgz",
792
- "integrity": "sha512-YpsM67WZpIYCB3K5/7X1ohmBSdwVTcC5uSc9ErMUlG5OTbwbO3LioD83v3zkp+h17rBPZljV/N1dl+4YV7Ja3w==",
791
+ "version": "3.5.2",
792
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.2.tgz",
793
+ "integrity": "sha512-FwmsOeHLk5IREEMPuI8/J9TGXxPS8+6gZe0ez20GcU+vK6i88HitX2HKInddHndiEfVtvtMfTCDjQvLfCI0/wQ==",
793
794
  "dependencies": {
794
- "@forge/cli-shared": "3.14.0-next.5",
795
+ "@forge/cli-shared": "3.14.0",
795
796
  "@forge/egress": "1.2.1",
796
- "@forge/manifest": "4.15.0-next.0",
797
+ "@forge/manifest": "4.15.0",
797
798
  "@typescript-eslint/typescript-estree": "^5.40.0",
798
799
  "array.prototype.flatmap": "^1.2.3",
799
800
  "atlassian-openapi": "^1.0.17",
@@ -802,9 +803,9 @@
802
803
  }
803
804
  },
804
805
  "node_modules/@forge/manifest": {
805
- "version": "4.15.0-next.0",
806
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.15.0-next.0.tgz",
807
- "integrity": "sha512-DZCi5aMdZkPO3Ebb+2pGfr81q9UC1ozKqUv9wHuw35uVKKNmNwrNvzXeGFaZJTLxBjD3mNWQE5OhgHqIps55sQ==",
806
+ "version": "4.15.0",
807
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.15.0.tgz",
808
+ "integrity": "sha512-tRgozQE22t8dgacTmIlwBhO0E09m+8K++sPxckbIO96EEvcEbrCbc6BlQcuVZBCmZnv87DfD3or+7PFcy2UkVQ==",
808
809
  "dependencies": {
809
810
  "@forge/util": "1.2.3",
810
811
  "ajv": "^6.12.6",
@@ -841,12 +842,12 @@
841
842
  "integrity": "sha512-RyLf1GI0r+56oRk0bLNR9kUhBc3uH3zi4NRo2w5YfBvOjUqWe6/pi/a1bBsNz6z9gP8eyb+Y0VVxpgYiV895+A=="
842
843
  },
843
844
  "node_modules/@forge/tunnel": {
844
- "version": "3.5.2-next.6",
845
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.5.2-next.6.tgz",
846
- "integrity": "sha512-pFtY/imo+Idj5iQDm1IJHZIc3BA0lGEE3QlvZforT/4BdyLODdbufhr/XsMFGSqA7UBP5hL8FU/D0+t8pv2Y4Q==",
845
+ "version": "3.6.0",
846
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.6.0.tgz",
847
+ "integrity": "sha512-xyvqhGfG4hzBm5MxjpoD1Y9Ohh/CoSE15y7K/oJPRO9Fcq1opWAeSsO8z2o5y5EfJJkwBMv9cVh+SOLI7+w5tg==",
847
848
  "dependencies": {
848
- "@forge/bundler": "4.10.0-next.6",
849
- "@forge/cli-shared": "3.14.0-next.5",
849
+ "@forge/bundler": "4.10.0",
850
+ "@forge/cli-shared": "3.14.0",
850
851
  "@forge/csp": "2.1.3",
851
852
  "@forge/runtime": "4.4.1",
852
853
  "express": "^4.17.1",
@@ -10073,6 +10074,18 @@
10073
10074
  "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
10074
10075
  "integrity": "sha1-HVcr+74Ut3BOC6Dzm3SBW4SHDXA= sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
10075
10076
  },
10077
+ "@forge/api": {
10078
+ "version": "2.18.0",
10079
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.18.0.tgz",
10080
+ "integrity": "sha512-C2SO/0Z9k8EL6RVwxaMDBd/p5gVjvOA8As8/CUl/HgPy4B1cLjT/xrLqvRiUZRSlikXuQzBzIXh3vKAEB30aHw==",
10081
+ "requires": {
10082
+ "@forge/auth": "0.0.1",
10083
+ "@forge/egress": "1.2.1",
10084
+ "@forge/storage": "1.5.3",
10085
+ "@types/node-fetch": "^2.6.4",
10086
+ "node-fetch": "2.6.11"
10087
+ }
10088
+ },
10076
10089
  "@forge/auth": {
10077
10090
  "version": "0.0.1",
10078
10091
  "resolved": "https://registry.npmjs.org/@forge/auth/-/auth-0.0.1.tgz",
@@ -10094,9 +10107,9 @@
10094
10107
  "integrity": "sha512-n2eXc/shPwx0ahD3NNfsmeiFoBCukeglt2htePaNnJBDt0VpC6R4Njsjc/wnL5OMgrGl5/GXzN+mymngXrw9qQ=="
10095
10108
  },
10096
10109
  "@forge/bundler": {
10097
- "version": "4.10.0-next.6",
10098
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.0-next.6.tgz",
10099
- "integrity": "sha512-rBYI0p4Td/+pbNVMgVZHEZ5WuLS6VlWxexyru10HR6/qjxIi08B4kaodL3qqtppBijSjC8Ajq1scsTBdKwMu/g==",
10110
+ "version": "4.10.0",
10111
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.0.tgz",
10112
+ "integrity": "sha512-6DtFEk2TqJlSjqlHxReDMKZaaC+CxtN+L7GSJ2zvZPkLrFEmmr/jPXocF9iKF4X1eb0gHK5ki7Hvz/2hgYHKJg==",
10100
10113
  "requires": {
10101
10114
  "@babel/core": "^7.16.7",
10102
10115
  "@babel/plugin-proposal-class-properties": "^7.16.7",
@@ -10104,10 +10117,10 @@
10104
10117
  "@babel/plugin-proposal-optional-chaining": "^7.16.7",
10105
10118
  "@babel/plugin-transform-react-jsx": "^7.16.7",
10106
10119
  "@babel/preset-typescript": "^7.16.7",
10107
- "@forge/api": "2.18.0-next.0",
10120
+ "@forge/api": "2.18.0",
10108
10121
  "@forge/babel-plugin-transform-ui": "1.1.2",
10109
- "@forge/cli-shared": "3.14.0-next.5",
10110
- "@forge/lint": "3.5.2-next.5",
10122
+ "@forge/cli-shared": "3.14.0",
10123
+ "@forge/lint": "3.5.2",
10111
10124
  "@forge/runtime": "4.4.1",
10112
10125
  "@forge/util": "1.2.3",
10113
10126
  "assert": "^1.1.1",
@@ -10138,28 +10151,14 @@
10138
10151
  "webpack": "5.78.0",
10139
10152
  "webpack-bundle-analyzer": "^4.8.0",
10140
10153
  "whatwg-url": "^7.0.0"
10141
- },
10142
- "dependencies": {
10143
- "@forge/api": {
10144
- "version": "2.18.0-next.0",
10145
- "resolved": "https://registry.npmjs.org/@forge/api/-/api-2.18.0-next.0.tgz",
10146
- "integrity": "sha512-4XoQG/QoZxr4XF+8NAvjFTpwxAIb6DQXfphzdEpRS7gxgvp6kDOtFDMqYQaax1POfSE1aqh9rRmdZRTVgeL30Q==",
10147
- "requires": {
10148
- "@forge/auth": "0.0.1",
10149
- "@forge/egress": "1.2.1",
10150
- "@forge/storage": "1.5.3",
10151
- "@types/node-fetch": "^2.6.4",
10152
- "node-fetch": "2.6.11"
10153
- }
10154
- }
10155
10154
  }
10156
10155
  },
10157
10156
  "@forge/cli-shared": {
10158
- "version": "3.14.0-next.5",
10159
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.14.0-next.5.tgz",
10160
- "integrity": "sha512-Z/WFEUm/qRGF2ANWZEwzCIgWdlS4wgjt1szOvm1wkw0XR0Gp1O6vi0l9bOxZ6u2fr6+C9qB8gui9PklcWzY7iw==",
10157
+ "version": "3.14.0",
10158
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.14.0.tgz",
10159
+ "integrity": "sha512-nk+5wOgtJUzT8nUTZbLJYokH3ByAXo2w56cWdmML1Q1YbWLnXzTXj0/xOCAwNVtvgdno9P4TGdpdKfwbDF7x9w==",
10161
10160
  "requires": {
10162
- "@forge/manifest": "4.15.0-next.0",
10161
+ "@forge/manifest": "4.15.0",
10163
10162
  "@forge/util": "1.2.3",
10164
10163
  "@sentry/node": "^7.29.0",
10165
10164
  "array.prototype.flatmap": "^1.2.3",
@@ -10185,6 +10184,7 @@
10185
10184
  "node-fetch": "2.6.11",
10186
10185
  "ora": "^4.0.3",
10187
10186
  "recursive-readdir": "^2.2.3",
10187
+ "semver": "^6.3.0",
10188
10188
  "terminal-link": "^2.1.1",
10189
10189
  "tmp": "^0.1.0",
10190
10190
  "typescript": "^4.8.4",
@@ -10210,13 +10210,13 @@
10210
10210
  }
10211
10211
  },
10212
10212
  "@forge/lint": {
10213
- "version": "3.5.2-next.5",
10214
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.2-next.5.tgz",
10215
- "integrity": "sha512-YpsM67WZpIYCB3K5/7X1ohmBSdwVTcC5uSc9ErMUlG5OTbwbO3LioD83v3zkp+h17rBPZljV/N1dl+4YV7Ja3w==",
10213
+ "version": "3.5.2",
10214
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.5.2.tgz",
10215
+ "integrity": "sha512-FwmsOeHLk5IREEMPuI8/J9TGXxPS8+6gZe0ez20GcU+vK6i88HitX2HKInddHndiEfVtvtMfTCDjQvLfCI0/wQ==",
10216
10216
  "requires": {
10217
- "@forge/cli-shared": "3.14.0-next.5",
10217
+ "@forge/cli-shared": "3.14.0",
10218
10218
  "@forge/egress": "1.2.1",
10219
- "@forge/manifest": "4.15.0-next.0",
10219
+ "@forge/manifest": "4.15.0",
10220
10220
  "@typescript-eslint/typescript-estree": "^5.40.0",
10221
10221
  "array.prototype.flatmap": "^1.2.3",
10222
10222
  "atlassian-openapi": "^1.0.17",
@@ -10225,9 +10225,9 @@
10225
10225
  }
10226
10226
  },
10227
10227
  "@forge/manifest": {
10228
- "version": "4.15.0-next.0",
10229
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.15.0-next.0.tgz",
10230
- "integrity": "sha512-DZCi5aMdZkPO3Ebb+2pGfr81q9UC1ozKqUv9wHuw35uVKKNmNwrNvzXeGFaZJTLxBjD3mNWQE5OhgHqIps55sQ==",
10228
+ "version": "4.15.0",
10229
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.15.0.tgz",
10230
+ "integrity": "sha512-tRgozQE22t8dgacTmIlwBhO0E09m+8K++sPxckbIO96EEvcEbrCbc6BlQcuVZBCmZnv87DfD3or+7PFcy2UkVQ==",
10231
10231
  "requires": {
10232
10232
  "@forge/util": "1.2.3",
10233
10233
  "ajv": "^6.12.6",
@@ -10261,12 +10261,12 @@
10261
10261
  "integrity": "sha512-RyLf1GI0r+56oRk0bLNR9kUhBc3uH3zi4NRo2w5YfBvOjUqWe6/pi/a1bBsNz6z9gP8eyb+Y0VVxpgYiV895+A=="
10262
10262
  },
10263
10263
  "@forge/tunnel": {
10264
- "version": "3.5.2-next.6",
10265
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.5.2-next.6.tgz",
10266
- "integrity": "sha512-pFtY/imo+Idj5iQDm1IJHZIc3BA0lGEE3QlvZforT/4BdyLODdbufhr/XsMFGSqA7UBP5hL8FU/D0+t8pv2Y4Q==",
10264
+ "version": "3.6.0",
10265
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.6.0.tgz",
10266
+ "integrity": "sha512-xyvqhGfG4hzBm5MxjpoD1Y9Ohh/CoSE15y7K/oJPRO9Fcq1opWAeSsO8z2o5y5EfJJkwBMv9cVh+SOLI7+w5tg==",
10267
10267
  "requires": {
10268
- "@forge/bundler": "4.10.0-next.6",
10269
- "@forge/cli-shared": "3.14.0-next.5",
10268
+ "@forge/bundler": "4.10.0",
10269
+ "@forge/cli-shared": "3.14.0",
10270
10270
  "@forge/csp": "2.1.3",
10271
10271
  "@forge/runtime": "4.4.1",
10272
10272
  "express": "^4.17.1",
package/out/analytics-client/analytics-client.d.ts CHANGED
@@ -20,7 +20,7 @@ export declare class AnalyticsClientReporter {
20
20
  }): void;
21
21
  reportInvokeFailure(cmdName: string, cred: string | PersonalApiCredentialsValidated, attributes: {
22
22
  [key: string]: any;
23
- }, e: Error | DeferredErrors): void;
23
+ }, e?: Error | DeferredErrors): void;
24
24
  private reportOperationalEvent;
25
25
  private processAnalyticsEvent;
26
26
  private _getUserId;
package/out/analytics-client/analytics-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-client.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,oBAAY,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AAW3D,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,mBAAmB;IAGrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAEvC,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,+BAA+B,GAAG,MAAM,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAsBA,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,EAAE,KAAK,GACP,IAAI;IAQA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAIA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,EAAE,KAAK,GAAG,cAAc,GACxB,IAAI;IAQP,OAAO,CAAC,sBAAsB;IA6B9B,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;CAOtB"}
1
+ {"version":3,"file":"analytics-client.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,oBAAY,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AAW3D,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,mBAAmB;IAGrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAEvC,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,+BAA+B,GAAG,MAAM,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAsBA,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,EAAE,KAAK,GACP,IAAI;IAQA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAIA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,CAAC,EAAE,KAAK,GAAG,cAAc,GACzB,IAAI;IAQP,OAAO,CAAC,sBAAsB;IA6B9B,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;CAOtB"}
package/out/analytics-client/analytics-client.js CHANGED
@@ -50,7 +50,9 @@ class AnalyticsClientReporter {
50
50
  this.reportOperationalEvent('cmdInvoked', cmdName, cred, attributes);
51
51
  }
52
52
  reportInvokeFailure(cmdName, cred, attributes, e) {
53
- attributes = Object.assign(Object.assign({}, attributes), this._getErrorListDetails(e));
53
+ if (e) {
54
+ attributes = Object.assign(Object.assign({}, attributes), this._getErrorListDetails(e));
55
+ }
54
56
  this.reportOperationalEvent('cmdInvokeFailed', cmdName, cred, attributes);
55
57
  }
56
58
  reportOperationalEvent(action, actionSubject, cred, attributes) {
package/out/command-line/command.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
package/out/command-line/command.js CHANGED
@@ -19,9 +19,6 @@ class WrapperError extends commander_1.CommanderError {
19
19
  }
20
20
  }
21
21
  exports.WrapperError = WrapperError;
22
- const isErrorWithAnalytics = (e) => {
23
- return e.getAttributes !== undefined;
24
- };
25
22
  function last(arg) {
26
23
  return arg[arg.length - 1];
27
24
  }
@@ -101,7 +98,7 @@ class Command {
101
98
  this.analyticsClient.reportSuccess(analyticsName, cred, attributes);
102
99
  }
103
100
  catch (e) {
104
- if (isErrorWithAnalytics(e)) {
101
+ if ((0, cli_shared_1.isErrorWithAnalytics)(e)) {
105
102
  attributes = Object.assign(Object.assign({}, e.getAttributes()), attributes);
106
103
  }
107
104
  if (attributes.isUserError === undefined) {
package/out/command-line/dependency-injection.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAEhF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkWvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAEhF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoWvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
package/out/command-line/dependency-injection.js CHANGED
@@ -179,11 +179,11 @@ const getDependencies = async (cliDetails) => {
179
179
  const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile), new tunnel_1.NgrokCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
180
180
  const tunnelInteractor = new tunnel_1.TunnelInteractor(ui);
181
181
  const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
182
- const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService);
182
+ const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter, cliDetails);
183
+ const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, tunnelAnalyticsService);
183
184
  const tunnelView = new tunnel_view_1.TunnelView(ui);
184
185
  const localTunnelService = new tunnel_service_1.LocalTunnelService(configFilePortFindingService);
185
186
  const dockerService = new docker_service_1.DockerService();
186
- const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter);
187
187
  const dockerTunnelService = new tunnel_service_1.DockerTunnelService(configFilePortFindingService, dockerService, tunnelAnalyticsService);
188
188
  const tunnelController = new tunnel_controller_1.TunnelController(tunnelAnalyticsService, nodeTunnelService, localTunnelService, dockerTunnelService, tunnelView, configFile);
189
189
  const stubController = new stubController_1.StubController();
package/out/service/docker-service.d.ts CHANGED
@@ -1,5 +1,6 @@
1
+ import { UserError } from '@forge/cli-shared';
1
2
  import { spawn } from 'cross-spawn';
2
- export declare class DockerError extends Error {
3
+ export declare class DockerError extends UserError {
3
4
  readonly code: DockerErrorCode;
4
5
  constructor(message: string, code: DockerErrorCode);
5
6
  }
package/out/service/docker-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAWpC,qBAAa,WAAY,SAAQ,KAAK;aACS,IAAI,EAAE,eAAe;gBAAtD,OAAO,EAAE,MAAM,EAAkB,IAAI,EAAE,eAAe;CAGnE;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAIhD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAwB/D,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAI1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IActE,OAAO,CAAC,WAAW;CAWpB"}
1
+ {"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAWpC,qBAAa,WAAY,SAAQ,SAAS;aACK,IAAI,EAAE,eAAe;gBAAtD,OAAO,EAAE,MAAM,EAAkB,IAAI,EAAE,eAAe;CAGnE;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAIhD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAwB/D,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAI1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IActE,OAAO,CAAC,WAAW;CAWpB"}
package/out/service/docker-service.js CHANGED
@@ -7,7 +7,7 @@ const command_exists_1 = tslib_1.__importDefault(require("command-exists"));
7
7
  const child_process_1 = require("child_process");
8
8
  const cross_spawn_1 = require("cross-spawn");
9
9
  const path_1 = tslib_1.__importDefault(require("path"));
10
- class DockerError extends Error {
10
+ class DockerError extends cli_shared_1.UserError {
11
11
  constructor(message, code) {
12
12
  super(message);
13
13
  this.code = code;
@@ -22,7 +22,7 @@ var DockerErrorCode;
22
22
  })(DockerErrorCode = exports.DockerErrorCode || (exports.DockerErrorCode = {}));
23
23
  class DockerService {
24
24
  runContainer(args) {
25
- return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: 'inherit' });
25
+ return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: ['inherit', 'inherit', 'pipe'] });
26
26
  }
27
27
  async getDockerVersion(debugEnabled) {
28
28
  if (!command_exists_1.default.sync('docker')) {
package/out/service/tunnel-analytics-service.d.ts CHANGED
@@ -1,11 +1,15 @@
1
- import { PersonalApiCredentialsValidated } from '@forge/cli-shared';
1
+ import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
2
2
  import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
3
3
  import { DownloadProgressCallbacks } from '../command-line/view/tunnel-view';
4
4
  export declare class TunnelAnalyticsService {
5
5
  private readonly analyticsClientReporter;
6
- constructor(analyticsClientReporter: AnalyticsClientReporter);
6
+ private readonly cliDetails;
7
+ constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
7
8
  reportDockerVersion(creds: PersonalApiCredentialsValidated, dockerVersion: string | null): void;
8
9
  reportTunnelClosed(creds: PersonalApiCredentialsValidated): void;
10
+ reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
11
+ [key: string]: any;
12
+ }): void;
9
13
  getImageDownloadReporters(creds: PersonalApiCredentialsValidated): DownloadProgressCallbacks;
10
14
  }
11
15
  //# sourceMappingURL=tunnel-analytics-service.d.ts.map
package/out/service/tunnel-analytics-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAAvB,uBAAuB,EAAE,uBAAuB;IAEtE,mBAAmB,CAAC,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAM/F,kBAAkB,CAAC,KAAK,EAAE,+BAA+B,GAAG,IAAI;IAIhE,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}
1
+ {"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAG9C,mBAAmB,CAAC,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAM/F,kBAAkB,CAAC,KAAK,EAAE,+BAA+B,GAAG,IAAI;IAIhE,mBAAmB,CACxB,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAgB7B,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}
package/out/service/tunnel-analytics-service.js CHANGED
@@ -1,9 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TunnelAnalyticsService = void 0;
4
+ const cli_shared_1 = require("@forge/cli-shared");
4
5
  class TunnelAnalyticsService {
5
- constructor(analyticsClientReporter) {
6
+ constructor(analyticsClientReporter, cliDetails) {
6
7
  this.analyticsClientReporter = analyticsClientReporter;
8
+ this.cliDetails = cliDetails;
7
9
  }
8
10
  reportDockerVersion(creds, dockerVersion) {
9
11
  this.analyticsClientReporter.reportSuccess('docker version check', creds, {
@@ -13,6 +15,14 @@ class TunnelAnalyticsService {
13
15
  reportTunnelClosed(creds) {
14
16
  this.analyticsClientReporter.reportSuccess('close tunnel', creds, {});
15
17
  }
18
+ reportTunnelFailure(creds, errorName, attributes) {
19
+ var _a, _b;
20
+ attributes = Object.assign({ error: errorName, version: (_a = this.cliDetails) === null || _a === void 0 ? void 0 : _a.version, latest: (_b = this.cliDetails) === null || _b === void 0 ? void 0 : _b.latest, isLatest: (0, cli_shared_1.isLatestCLIVersion)(this.cliDetails) }, attributes);
21
+ if (attributes.isUserError === undefined) {
22
+ attributes = Object.assign(Object.assign({}, attributes), { isUserError: false });
23
+ }
24
+ this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
25
+ }
16
26
  getImageDownloadReporters(creds) {
17
27
  return {
18
28
  onStart: () => this.analyticsClientReporter.reportSuccess('image download started', creds, {}),
package/out/service/tunnel-service.d.ts CHANGED
@@ -11,6 +11,9 @@ export interface TunnelOptions {
11
11
  export declare const CONTAINER_NAME = "forge-tunnel-docker";
12
12
  export declare const IMAGE_NAME: string;
13
13
  export declare class HiddenDockerTunnelError extends HiddenError {
14
+ private readonly userError;
15
+ constructor(userError: boolean, message?: string);
16
+ isUserError(): boolean;
14
17
  }
15
18
  export declare type TunnelService = {
16
19
  run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
@@ -23,8 +26,9 @@ export declare class InProcessTunnelService implements TunnelService {
23
26
  private readonly startTunnelCommand;
24
27
  private readonly tunnelInteractor;
25
28
  private readonly configFilePortFindingService;
26
- constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService);
27
- run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentials, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
29
+ private readonly analyticsService;
30
+ constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, analyticsService: TunnelAnalyticsService);
31
+ run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
28
32
  }
29
33
  declare abstract class TunnelServiceBase implements TunnelService {
30
34
  protected readonly configFilePortFindingService: ConfigFilePortFindingService;
@@ -44,7 +48,7 @@ declare abstract class TunnelServiceBase implements TunnelService {
44
48
  protected getVolumeOptions(): string[];
45
49
  }
46
50
  export declare class LocalTunnelService extends TunnelServiceBase {
47
- run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentials, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
51
+ run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
48
52
  }
49
53
  export declare class DockerTunnelService extends TunnelServiceBase {
50
54
  private readonly dockerService;
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":"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"}
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
@@ -28,6 +28,13 @@ exports.IMAGE_NAME = process.env.FORGE_DEV_DOCKER_TUNNEL
28
28
  ? 'local/forge-tunnel:test'
29
29
  : `atlassian/forge-tunnel:${versionTags[0]}`;
30
30
  class HiddenDockerTunnelError extends cli_shared_1.HiddenError {
31
+ constructor(userError, message) {
32
+ super(message);
33
+ this.userError = userError;
34
+ }
35
+ isUserError() {
36
+ return this.userError;
37
+ }
31
38
  }
32
39
  exports.HiddenDockerTunnelError = HiddenDockerTunnelError;
33
40
  class DebugNotSupportedError extends cli_shared_1.UserError {
@@ -37,11 +44,12 @@ class DebugNotSupportedError extends cli_shared_1.UserError {
37
44
  }
38
45
  exports.DebugNotSupportedError = DebugNotSupportedError;
39
46
  class InProcessTunnelService {
40
- constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService) {
47
+ constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, analyticsService) {
41
48
  this.ui = ui;
42
49
  this.startTunnelCommand = startTunnelCommand;
43
50
  this.tunnelInteractor = tunnelInteractor;
44
51
  this.configFilePortFindingService = configFilePortFindingService;
52
+ this.analyticsService = analyticsService;
45
53
  }
46
54
  async run(tunnelOptions, creds, debugEnabled, onError) {
47
55
  try {
@@ -58,6 +66,7 @@ class InProcessTunnelService {
58
66
  await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor);
59
67
  }
60
68
  catch (e) {
69
+ this.analyticsService.reportTunnelFailure(creds, e.constructor.name, (0, cli_shared_1.isErrorWithAnalytics)(e) ? e.getAttributes() : {});
61
70
  if (onError) {
62
71
  await onError(e);
63
72
  }
@@ -101,7 +110,7 @@ class TunnelServiceBase {
101
110
  ];
102
111
  }
103
112
  catch (e) {
104
- throw new HiddenDockerTunnelError("Couldn't populate docker options for tunneling");
113
+ throw new HiddenDockerTunnelError(false, "Couldn't populate docker options for tunneling");
105
114
  }
106
115
  }
107
116
  getPortOptions(port, resourcePorts, cspReporterPort) {
@@ -203,6 +212,7 @@ class DockerTunnelService extends TunnelServiceBase {
203
212
  this.analyticsService = analyticsService;
204
213
  }
205
214
  async run(tunnelOptions, creds, debugEnabled) {
215
+ var _a;
206
216
  await this.validateDockerVersion(creds, debugEnabled);
207
217
  const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
208
218
  const port = await (0, portfinder_1.getPortPromise)();
@@ -222,6 +232,23 @@ class DockerTunnelService extends TunnelServiceBase {
222
232
  ...dockerOptions
223
233
  ]);
224
234
  docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
235
+ (_a = docker.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (error) => {
236
+ var _a;
237
+ const errorMessage = error;
238
+ let errorJson;
239
+ try {
240
+ errorJson = JSON.parse(errorMessage);
241
+ }
242
+ catch (e) {
243
+ }
244
+ if (errorJson && errorJson.__tunnel_error__) {
245
+ const tunnelErrorDetails = errorJson;
246
+ this.analyticsService.reportTunnelFailure(creds, tunnelErrorDetails.name, tunnelErrorDetails.attributes);
247
+ }
248
+ else {
249
+ (_a = process.stderr) === null || _a === void 0 ? void 0 : _a.write(errorMessage);
250
+ }
251
+ });
225
252
  this.dockerService.startCleanupWorker([docker.pid], exports.CONTAINER_NAME);
226
253
  }
227
254
  async bootstrapDocker() {
@@ -232,7 +259,7 @@ class DockerTunnelService extends TunnelServiceBase {
232
259
  const { major, minor, full } = await this.dockerService.getDockerVersion(debugEnabled);
233
260
  this.analyticsService.reportDockerVersion(creds, full);
234
261
  if (major < 17 || (major === 17 && minor < 3)) {
235
- throw new HiddenDockerTunnelError();
262
+ throw new HiddenDockerTunnelError(true);
236
263
  }
237
264
  }
238
265
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.13.0-next.7",
3
+ "version": "6.13.0",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "UNLICENSED",
@@ -18,13 +18,13 @@
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.10.0-next.6",
22
- "@forge/cli-shared": "3.14.0-next.5",
21
+ "@forge/bundler": "4.10.0",
22
+ "@forge/cli-shared": "3.14.0",
23
23
  "@forge/egress": "1.2.1",
24
- "@forge/lint": "3.5.2-next.5",
25
- "@forge/manifest": "4.15.0-next.0",
24
+ "@forge/lint": "3.5.2",
25
+ "@forge/manifest": "4.15.0",
26
26
  "@forge/runtime": "4.4.1",
27
- "@forge/tunnel": "3.5.2-next.6",
27
+ "@forge/tunnel": "3.6.0",
28
28
  "@forge/util": "1.2.3",
29
29
  "@sentry/node": "^7.29.0",
30
30
  "ajv": "^6.12.6",