@forge/cli 6.19.1 → 6.20.0-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 (12) hide show
  1. package/CHANGELOG.md +101 -0
  2. package/npm-shrinkwrap.json +155 -95
  3. package/out/analytics-client/analytics-client.js +3 -3
  4. package/out/command-line/anon-user-id.d.ts.map +1 -1
  5. package/out/command-line/anon-user-id.js +2 -3
  6. package/out/command-line/unique-machine-id.js +2 -3
  7. package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
  8. package/out/deploy/packager/runtime-bundler.js +7 -1
  9. package/out/service/tunnel-service.d.ts +1 -0
  10. package/out/service/tunnel-service.d.ts.map +1 -1
  11. package/out/service/tunnel-service.js +8 -1
  12. package/package.json +13 -13
package/CHANGELOG.md CHANGED
@@ -1,5 +1,106 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 6.20.0-next.8
4
+
5
+ ### Patch Changes
6
+
7
+ - 6adec4c7: Use bind mount for --ngrok-config option
8
+
9
+ ## 6.20.0-next.7
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies [add9c54]
14
+ - @forge/manifest@4.20.3-next.1
15
+ - @forge/cli-shared@3.20.2-next.1
16
+ - @forge/lint@3.7.2-next.1
17
+ - @forge/tunnel@3.8.3-next.6
18
+ - @forge/bundler@4.13.0-next.6
19
+
20
+ ## 6.20.0-next.6
21
+
22
+ ### Minor Changes
23
+
24
+ - 1d4baff: Track node-runtime version
25
+
26
+ ### Patch Changes
27
+
28
+ - Updated dependencies [1d4baff]
29
+ - @forge/node-runtime@0.4.0-next.3
30
+ - @forge/bundler@4.13.0-next.5
31
+ - @forge/tunnel@3.8.3-next.5
32
+
33
+ ## 6.19.2-next.5
34
+
35
+ ### Patch Changes
36
+
37
+ - 7169010: Bumping dependencies via Renovate:
38
+
39
+ - uuid
40
+ - @types/uuid
41
+
42
+ - Updated dependencies [7169010]
43
+ - Updated dependencies [691d952]
44
+ - @forge/node-runtime@0.3.1-next.2
45
+ - @forge/tunnel@3.8.3-next.4
46
+ - @forge/bundler@4.12.4-next.4
47
+
48
+ ## 6.19.2-next.4
49
+
50
+ ### Patch Changes
51
+
52
+ - b3fba81: Bumping dependencies via Renovate:
53
+
54
+ - uuid
55
+ - @types/uuid
56
+
57
+ - Updated dependencies [b3fba81]
58
+ - @forge/node-runtime@0.3.1-next.1
59
+ - @forge/tunnel@3.8.3-next.3
60
+ - @forge/bundler@4.12.4-next.3
61
+
62
+ ## 6.19.2-next.3
63
+
64
+ ### Patch Changes
65
+
66
+ - Updated dependencies [da7573f]
67
+ - @forge/bundler@4.12.4-next.2
68
+ - @forge/node-runtime@0.3.1-next.0
69
+ - @forge/runtime@5.1.2-next.0
70
+ - @forge/tunnel@3.8.3-next.2
71
+
72
+ ## 6.19.2-next.2
73
+
74
+ ### Patch Changes
75
+
76
+ - e2d41aa: Bumping dependencies via Renovate:
77
+
78
+ - memfs
79
+
80
+ - Updated dependencies [64ac4be]
81
+ - Updated dependencies [e2d41aa]
82
+ - @forge/manifest@4.20.3-next.0
83
+ - @forge/bundler@4.12.4-next.1
84
+ - @forge/cli-shared@3.20.2-next.0
85
+ - @forge/lint@3.7.2-next.0
86
+ - @forge/tunnel@3.8.3-next.1
87
+
88
+ ## 6.19.2-next.1
89
+
90
+ ### Patch Changes
91
+
92
+ - 085e478: Bumping dependencies via Renovate:
93
+
94
+ - type-fest
95
+
96
+ ## 6.19.2-next.0
97
+
98
+ ### Patch Changes
99
+
100
+ - Updated dependencies [b3e5cf01]
101
+ - @forge/bundler@4.12.4-next.0
102
+ - @forge/tunnel@3.8.3-next.0
103
+
3
104
  ## 6.19.1
4
105
 
5
106
  ### Patch Changes
package/npm-shrinkwrap.json CHANGED
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.19.1",
3
+ "version": "6.20.0-next.8",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "6.19.1",
9
+ "version": "6.20.0-next.8",
10
10
  "hasInstallScript": true,
11
11
  "license": "UNLICENSED",
12
12
  "dependencies": {
13
- "@forge/bundler": "4.12.3",
14
- "@forge/cli-shared": "3.20.1",
13
+ "@forge/bundler": "4.13.0-next.6",
14
+ "@forge/cli-shared": "3.20.2-next.1",
15
15
  "@forge/egress": "1.2.6",
16
- "@forge/lint": "3.7.1",
17
- "@forge/manifest": "4.20.2",
18
- "@forge/node-runtime": "0.3.0",
19
- "@forge/runtime": "5.1.1",
20
- "@forge/tunnel": "3.8.2",
16
+ "@forge/lint": "3.7.2-next.1",
17
+ "@forge/manifest": "4.20.3-next.1",
18
+ "@forge/node-runtime": "0.4.0-next.3",
19
+ "@forge/runtime": "5.1.2-next.0",
20
+ "@forge/tunnel": "3.8.3-next.6",
21
21
  "@forge/util": "1.3.1",
22
22
  "@sentry/node": "^7.73.0",
23
23
  "ajv": "^8.12.0",
@@ -46,7 +46,7 @@
46
46
  "semver": "^7.5.4",
47
47
  "tmp": "^0.2.1",
48
48
  "tslib": "^2.6.2",
49
- "uuid": "^3.4.0"
49
+ "uuid": "^9.0.1"
50
50
  },
51
51
  "bin": {
52
52
  "forge": "out/bin/cli.js"
@@ -67,14 +67,14 @@
67
67
  "@types/omelette": "^0.4.2",
68
68
  "@types/semver": "^7.5.3",
69
69
  "@types/tmp": "^0.2.4",
70
- "@types/uuid": "^3.4.11",
70
+ "@types/uuid": "^9.0.5",
71
71
  "jest": "^29.7.0",
72
72
  "jest-fixtures": "^0.6.0",
73
73
  "jest-matcher-specific-error": "^1.0.0",
74
74
  "jest-when": "^3.6.0",
75
- "memfs": "^4.5.0",
75
+ "memfs": "^4.6.0",
76
76
  "sentry-testkit": "^5.0.6",
77
- "type-fest": "4.3.3"
77
+ "type-fest": "4.4.0"
78
78
  },
79
79
  "engines": {
80
80
  "node": ">=12.13.1"
@@ -876,9 +876,9 @@
876
876
  "integrity": "sha512-Kl+YBTaxv8rldk1rPg+1RaUyS5RcfHVfYsCJ8XwpMQDlItMaO/kR1TxhVg1GprUQ3N8XQ8y03Rtwu2/w8PuPIA=="
877
877
  },
878
878
  "node_modules/@forge/bundler": {
879
- "version": "4.12.3",
880
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.12.3.tgz",
881
- "integrity": "sha512-ovROUd/vlNhXUeTgI7G9Ggt9+csFppFrh+PdbfyMfQwfhKBFtALOrUHS0V6kEKrq0FPp7wPGoOQpEekJ7S8Odw==",
879
+ "version": "4.13.0-next.6",
880
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.13.0-next.6.tgz",
881
+ "integrity": "sha512-kgstMhnxwKLYCOjkp1ih7HdB8xTQHksUbg4J2n/o3V24K4vw+RBR4TJOMwL6DXATQAC53M9ElbpJ9IpkdsiYAw==",
882
882
  "dependencies": {
883
883
  "@babel/core": "^7.23.0",
884
884
  "@babel/plugin-transform-class-properties": "^7.22.5",
@@ -889,9 +889,9 @@
889
889
  "@babel/preset-typescript": "^7.23.0",
890
890
  "@forge/api": "2.19.2",
891
891
  "@forge/babel-plugin-transform-ui": "1.1.9",
892
- "@forge/cli-shared": "3.20.1",
893
- "@forge/lint": "3.7.1",
894
- "@forge/node-runtime": "0.3.0",
892
+ "@forge/cli-shared": "3.20.2-next.1",
893
+ "@forge/lint": "3.7.2-next.1",
894
+ "@forge/node-runtime": "0.4.0-next.3",
895
895
  "@forge/util": "1.3.1",
896
896
  "assert": "^2.1.0",
897
897
  "babel-loader": "^8.3.0",
@@ -904,7 +904,7 @@
904
904
  "events": "^3.3.0",
905
905
  "html-webpack-plugin": "^5.5.3",
906
906
  "inherits": "^2.0.4",
907
- "memfs": "^4.5.0",
907
+ "memfs": "^4.6.0",
908
908
  "nock": "13.3.3",
909
909
  "node-fetch": "2.7.0",
910
910
  "os-browserify": "^0.3.0",
@@ -917,24 +917,24 @@
917
917
  "text-encoder-lite": "^2.0.0",
918
918
  "timers-browserify": "^2.0.12",
919
919
  "tmp": "^0.2.1",
920
- "ts-loader": "^9.4.4",
920
+ "ts-loader": "^9.5.0",
921
921
  "typescript": "^4.9.5",
922
922
  "url": "^0.11.3",
923
923
  "util": "^0.12.5",
924
924
  "webpack": "5.88.2",
925
925
  "webpack-bundle-analyzer": "^4.9.1",
926
- "whatwg-url": "^7.1.0"
926
+ "whatwg-url": "^12.0.1"
927
927
  },
928
928
  "engines": {
929
929
  "node": ">=12.13.1"
930
930
  }
931
931
  },
932
932
  "node_modules/@forge/cli-shared": {
933
- "version": "3.20.1",
934
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.20.1.tgz",
935
- "integrity": "sha512-KoDsf+C36yAh4X04jJs0dZMuLH53xJyoiooXIUjgihwfdqXISbC1CC073OkvtXih1cI2pfczBw66xffiBGxi+Q==",
933
+ "version": "3.20.2-next.1",
934
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.20.2-next.1.tgz",
935
+ "integrity": "sha512-2Q1Ab5306pd+oS/NYtuilDfbMgpDakZDNCzYzTe7iVCpRJ02Fwyvxt7u8AoBgWWq99kyqbWWEQx+JOEKAAINIg==",
936
936
  "dependencies": {
937
- "@forge/manifest": "4.20.2",
937
+ "@forge/manifest": "4.20.3-next.1",
938
938
  "@forge/util": "1.3.1",
939
939
  "@sentry/node": "^7.73.0",
940
940
  "adm-zip": "^0.5.10",
@@ -986,13 +986,13 @@
986
986
  }
987
987
  },
988
988
  "node_modules/@forge/lint": {
989
- "version": "3.7.1",
990
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.7.1.tgz",
991
- "integrity": "sha512-uYSGo3VKK3P3oLLMgGEXmnz01ldkA665/QJDZ2YVRwgQn9Z5pVwaIPR8u4OqFhMbmTRe4LEjRuqBZ8I3AiZxxg==",
989
+ "version": "3.7.2-next.1",
990
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.7.2-next.1.tgz",
991
+ "integrity": "sha512-1D/ykfoGWMb8lHhARkxcHGWrUWziXtDkEoqpJvXGi7BwkIeQLI3Bg3MEKYlyCrMNeUXpEAf1ON4MOvBlg0aB+w==",
992
992
  "dependencies": {
993
- "@forge/cli-shared": "3.20.1",
993
+ "@forge/cli-shared": "3.20.2-next.1",
994
994
  "@forge/egress": "1.2.6",
995
- "@forge/manifest": "4.20.2",
995
+ "@forge/manifest": "4.20.3-next.1",
996
996
  "@typescript-eslint/typescript-estree": "^5.62.0",
997
997
  "array.prototype.flatmap": "^1.3.2",
998
998
  "atlassian-openapi": "^1.0.17",
@@ -1001,9 +1001,9 @@
1001
1001
  }
1002
1002
  },
1003
1003
  "node_modules/@forge/manifest": {
1004
- "version": "4.20.2",
1005
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.20.2.tgz",
1006
- "integrity": "sha512-ITiESrN0PZVQcmIx/xocma2P143eu/IQDDacr4rGULbCfUX62737sSgrOE4znjNXhZPiKBfTkkSHRsq5C0/Iag==",
1004
+ "version": "4.20.3-next.1",
1005
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-4.20.3-next.1.tgz",
1006
+ "integrity": "sha512-PEhxnczDvYdRdjvao6fIeb238FhmKR5dKfNljEYgU1p2ISWxJqWkCBG0So1FOM55e7ZNZ6JVk02Jf14QAXc/9g==",
1007
1007
  "dependencies": {
1008
1008
  "@forge/util": "1.3.1",
1009
1009
  "ajv": "^8.12.0",
@@ -1011,26 +1011,26 @@
1011
1011
  "cheerio": "^0.22.0",
1012
1012
  "glob": "^10.3.10",
1013
1013
  "js-yaml": "^4.1.0",
1014
- "json-schema-to-typescript": "^9.1.1",
1014
+ "json-schema-to-typescript": "^10.1.5",
1015
1015
  "lodash": "^4.17.21",
1016
1016
  "node-fetch": "2.7.0",
1017
1017
  "typescript-json-schema": "^0.61.0"
1018
1018
  }
1019
1019
  },
1020
1020
  "node_modules/@forge/node-runtime": {
1021
- "version": "0.3.0",
1022
- "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.3.0.tgz",
1023
- "integrity": "sha512-c2sTTbnHJ2w/K8L5NDVtE78VtiKsG4gL9HeIFITDeGlOvfYwnbbWAKz7qqoWQ8OSvNwEw8SVRSWJ22zE9ZL3PA==",
1021
+ "version": "0.4.0-next.3",
1022
+ "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.4.0-next.3.tgz",
1023
+ "integrity": "sha512-4VQQVVP1s+zPsW1WCml5vJK7Fn8haZ2H0XK/G9BQ+J3FgzMWCK1/A1aT79xBQyCpZJmj4gWjhkvthCFnwuLKhw==",
1024
1024
  "dependencies": {
1025
1025
  "@forge/api": "2.19.2",
1026
- "@forge/runtime": "5.1.1",
1027
- "uuid": "^3.4.0"
1026
+ "@forge/runtime": "5.1.2-next.0",
1027
+ "uuid": "^9.0.1"
1028
1028
  }
1029
1029
  },
1030
1030
  "node_modules/@forge/runtime": {
1031
- "version": "5.1.1",
1032
- "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.1.1.tgz",
1033
- "integrity": "sha512-0RtNBMvyEXkgO1+CY8njt14TJDo8jvYdr93GoRFnVuEsvGFhOU53J6psdiCHiyvh3TP6b6aCwiMPF7KOevMXtA==",
1031
+ "version": "5.1.2-next.0",
1032
+ "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.1.2-next.0.tgz",
1033
+ "integrity": "sha512-c6EmXFJjYcEhvAtHbi8QxFAiWDh3Tu2S/XqOjaAc4NTLSBMvNQey8lIMKxSHo3HV69iCFCZ3CmiSOatQTRRsgQ==",
1034
1034
  "dependencies": {
1035
1035
  "@forge/util": "1.3.1",
1036
1036
  "fp-ts": "^2.16.1",
@@ -1048,14 +1048,14 @@
1048
1048
  "integrity": "sha512-fjbjNU6flX8xOfIHIUWn9F42oXxsnvKuIMlq+TmeHzRhQoVCWg2VpU+sGAQmwEofHCx/9GjJ95dnzA5Z03dTrw=="
1049
1049
  },
1050
1050
  "node_modules/@forge/tunnel": {
1051
- "version": "3.8.2",
1052
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.8.2.tgz",
1053
- "integrity": "sha512-ssGn0h7pwmBWcb+2uKfcUx+chEi9HL5JMoK9d+DVodz0NMokglKaju39+ZdwVdDN9Z6SPPzAKxknhoLt9tvy+w==",
1051
+ "version": "3.8.3-next.6",
1052
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.8.3-next.6.tgz",
1053
+ "integrity": "sha512-kQrouUnT4L/OacWsSarsWH71P48e9n39+Zw0c1WDKlgJc/qSTcBq8Vj20jYGczJmEpfUNz7Ph1HgxtdaWGxiQg==",
1054
1054
  "dependencies": {
1055
- "@forge/bundler": "4.12.3",
1056
- "@forge/cli-shared": "3.20.1",
1055
+ "@forge/bundler": "4.13.0-next.6",
1056
+ "@forge/cli-shared": "3.20.2-next.1",
1057
1057
  "@forge/csp": "3.0.0",
1058
- "@forge/runtime": "5.1.1",
1058
+ "@forge/runtime": "5.1.2-next.0",
1059
1059
  "express": "^4.18.2",
1060
1060
  "express-intercept": "^1.1.0",
1061
1061
  "http-proxy-middleware": "^2.0.6",
@@ -1063,7 +1063,7 @@
1063
1063
  "node-cache": "^5.1.2",
1064
1064
  "tmp": "^0.2.1",
1065
1065
  "tslib": "^2.6.2",
1066
- "uuid": "^3.4.0",
1066
+ "uuid": "^9.0.1",
1067
1067
  "webpack-dev-server": "^4.15.1"
1068
1068
  }
1069
1069
  },
@@ -1520,6 +1520,25 @@
1520
1520
  "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
1521
1521
  "integrity": "sha1-UNaAyKinj+MKvmkGRTshrYqwrXs= sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
1522
1522
  },
1523
+ "node_modules/@types/glob": {
1524
+ "version": "8.1.0",
1525
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz",
1526
+ "integrity": "sha1-tj5wFVORsFhNzkTn6iUZC7w48vw= sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==",
1527
+ "dependencies": {
1528
+ "@types/minimatch": "^5.1.2",
1529
+ "@types/node": "*"
1530
+ }
1531
+ },
1532
+ "node_modules/@types/glob/node_modules/@types/minimatch": {
1533
+ "version": "5.1.2",
1534
+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
1535
+ "integrity": "sha1-B1CLRXl8uB7D8nMBGwVM0HVe3co= sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
1536
+ },
1537
+ "node_modules/@types/glob/node_modules/@types/node": {
1538
+ "version": "17.0.8",
1539
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
1540
+ "integrity": "sha1-UNaAyKinj+MKvmkGRTshrYqwrXs= sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
1541
+ },
1523
1542
  "node_modules/@types/html-minifier-terser": {
1524
1543
  "version": "6.1.0",
1525
1544
  "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
@@ -1561,6 +1580,11 @@
1561
1580
  "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
1562
1581
  "integrity": "sha1-UNaAyKinj+MKvmkGRTshrYqwrXs= sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
1563
1582
  },
1583
+ "node_modules/@types/lodash": {
1584
+ "version": "4.14.199",
1585
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz",
1586
+ "integrity": "sha1-w+21ZQFJ2Eeid6iWGnrTYMR06b8= sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="
1587
+ },
1564
1588
  "node_modules/@types/mime": {
1565
1589
  "version": "1.3.2",
1566
1590
  "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -1585,6 +1609,11 @@
1585
1609
  "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
1586
1610
  "integrity": "sha1-UNaAyKinj+MKvmkGRTshrYqwrXs= sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
1587
1611
  },
1612
+ "node_modules/@types/prettier": {
1613
+ "version": "2.7.3",
1614
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
1615
+ "integrity": "sha1-PlGhfikdAdF9P8YUIgFakzr3oI8= sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA=="
1616
+ },
1588
1617
  "node_modules/@types/qs": {
1589
1618
  "version": "6.9.7",
1590
1619
  "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
@@ -4701,6 +4730,14 @@
4701
4730
  "has-symbols": "^1.0.3"
4702
4731
  }
4703
4732
  },
4733
+ "node_modules/get-stdin": {
4734
+ "version": "8.0.0",
4735
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
4736
+ "integrity": "sha1-y61qc/63X27rIrqeAfiaooqpelM= sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
4737
+ "engines": {
4738
+ "node": ">=10"
4739
+ }
4740
+ },
4704
4741
  "node_modules/get-stream": {
4705
4742
  "version": "6.0.1",
4706
4743
  "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -5845,22 +5882,25 @@
5845
5882
  }
5846
5883
  },
5847
5884
  "node_modules/json-schema-to-typescript": {
5848
- "version": "9.1.1",
5849
- "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.1.tgz",
5850
- "integrity": "sha1-VyweuLfKgtZTTAI8RlHz/pJRccA= sha512-VrdxmwQROjPBRlHxXwGUa2xzhOMPiNZIVsxZrZjMYtbI7suRFMiEktqaD/gqhfSya7Djy+x8dnJT+H0/0sZO0Q==",
5885
+ "version": "10.1.5",
5886
+ "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-10.1.5.tgz",
5887
+ "integrity": "sha1-msMoCOtNfBWGhOJwQ4rQclbAyxw= sha512-X8bNNksfCQo6LhEuqNxmZr4eZpPjXZajmimciuk8eWXzZlif9Brq7WuMGD/SOhBKcRKP2SGVDNZbC28WQqx9Rg==",
5851
5888
  "dependencies": {
5852
- "@types/json-schema": "^7.0.4",
5889
+ "@types/json-schema": "^7.0.6",
5890
+ "@types/lodash": "^4.14.168",
5891
+ "@types/prettier": "^2.1.5",
5853
5892
  "cli-color": "^2.0.0",
5893
+ "get-stdin": "^8.0.0",
5854
5894
  "glob": "^7.1.6",
5895
+ "glob-promise": "^3.4.0",
5855
5896
  "is-glob": "^4.0.1",
5856
- "json-schema-ref-parser": "^9.0.1",
5897
+ "json-schema-ref-parser": "^9.0.6",
5857
5898
  "json-stringify-safe": "^5.0.1",
5858
- "lodash": "^4.17.15",
5899
+ "lodash": "^4.17.20",
5859
5900
  "minimist": "^1.2.5",
5860
5901
  "mkdirp": "^1.0.4",
5861
5902
  "mz": "^2.7.0",
5862
- "prettier": "^2.0.5",
5863
- "stdin": "0.0.1"
5903
+ "prettier": "^2.2.0"
5864
5904
  },
5865
5905
  "bin": {
5866
5906
  "json2ts": "dist/src/cli.js"
@@ -5885,6 +5925,20 @@
5885
5925
  "node": "*"
5886
5926
  }
5887
5927
  },
5928
+ "node_modules/json-schema-to-typescript/node_modules/glob-promise": {
5929
+ "version": "3.4.0",
5930
+ "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-3.4.0.tgz",
5931
+ "integrity": "sha1-trjwhFBCFvcC3CzoybyayIZv2yA= sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==",
5932
+ "dependencies": {
5933
+ "@types/glob": "*"
5934
+ },
5935
+ "engines": {
5936
+ "node": ">=4"
5937
+ },
5938
+ "peerDependencies": {
5939
+ "glob": "*"
5940
+ }
5941
+ },
5888
5942
  "node_modules/json-schema-to-typescript/node_modules/minimatch": {
5889
5943
  "version": "3.1.2",
5890
5944
  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -6216,11 +6270,6 @@
6216
6270
  "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
6217
6271
  "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0="
6218
6272
  },
6219
- "node_modules/lodash.sortby": {
6220
- "version": "4.7.0",
6221
- "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
6222
- "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
6223
- },
6224
6273
  "node_modules/lodash.uniqby": {
6225
6274
  "version": "4.7.0",
6226
6275
  "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
@@ -6321,9 +6370,9 @@
6321
6370
  }
6322
6371
  },
6323
6372
  "node_modules/memfs": {
6324
- "version": "4.5.0",
6325
- "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.5.0.tgz",
6326
- "integrity": "sha1-AwgnCZh3YAIideDTvA8kVFt/4nk= sha512-8QePW5iXi/ZCySFTo39h3ujKGT0rYVnZywuSo5AzR7POAuy4uBEFZKziYkkrlGdWuxACUxKAJ0L/sry3DSG+TA==",
6373
+ "version": "4.6.0",
6374
+ "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.6.0.tgz",
6375
+ "integrity": "sha1-6BLUOPc0gqcRBCDRPTgccwuaTeU= sha512-I6mhA1//KEZfKRQT9LujyW6lRbX7RkC24xKododIDO3AGShcaFAMKElv1yFGWX8fD4UaSiwasr3NeQ5TdtHY1A==",
6327
6376
  "dependencies": {
6328
6377
  "json-joy": "^9.2.0",
6329
6378
  "thingies": "^1.11.1"
@@ -8384,11 +8433,6 @@
8384
8433
  "node": ">= 0.6"
8385
8434
  }
8386
8435
  },
8387
- "node_modules/stdin": {
8388
- "version": "0.0.1",
8389
- "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz",
8390
- "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4= sha512-2bacd1TXzqOEsqRa+eEWkRdOSznwptrs4gqFcpMq5tOtmJUGPZd10W5Lam6wQ4YQ/+qjQt4e9u35yXCF6mrlfQ=="
8391
- },
8392
8436
  "node_modules/streamx": {
8393
8437
  "version": "2.15.1",
8394
8438
  "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz",
@@ -8782,11 +8826,14 @@
8782
8826
  }
8783
8827
  },
8784
8828
  "node_modules/tr46": {
8785
- "version": "1.0.1",
8786
- "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
8787
- "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
8829
+ "version": "4.1.1",
8830
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
8831
+ "integrity": "sha1-KBp1jcyCrrT+OMff5NEaOVqshGk= sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
8788
8832
  "dependencies": {
8789
- "punycode": "^2.1.0"
8833
+ "punycode": "^2.3.0"
8834
+ },
8835
+ "engines": {
8836
+ "node": ">=14"
8790
8837
  }
8791
8838
  },
8792
8839
  "node_modules/truncate-utf8-bytes": {
@@ -8803,14 +8850,15 @@
8803
8850
  "integrity": "sha1-ulm0qdK8IrmdG6f0rz1esyBAjZU= sha512-cA5MPLWGWYXvnlJb4TamUUx858HVHBsxxdy8l7jxODOLDyGYnQOllob2A2jyDghGa5iJHs2gzFNHvwGJ0ZfR8g=="
8804
8851
  },
8805
8852
  "node_modules/ts-loader": {
8806
- "version": "9.4.4",
8807
- "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz",
8808
- "integrity": "sha1-bOr01Y3MaXn4QSUzWQSSCIS3zuQ= sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==",
8853
+ "version": "9.5.0",
8854
+ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.0.tgz",
8855
+ "integrity": "sha1-8KUd2jfMTY5D5ssU7eu8WZsMOqI= sha512-LLlB/pkB4q9mW2yLdFMnK3dEHbrBjeZTYguaaIfusyojBgAGf5kF+O6KcWqiGzWqHk0LBsoolrp4VftEURhybg==",
8809
8856
  "dependencies": {
8810
8857
  "chalk": "^4.1.0",
8811
8858
  "enhanced-resolve": "^5.0.0",
8812
8859
  "micromatch": "^4.0.0",
8813
- "semver": "^7.3.4"
8860
+ "semver": "^7.3.4",
8861
+ "source-map": "^0.7.4"
8814
8862
  },
8815
8863
  "engines": {
8816
8864
  "node": ">=12.0.0"
@@ -8820,6 +8868,14 @@
8820
8868
  "webpack": "^5.0.0"
8821
8869
  }
8822
8870
  },
8871
+ "node_modules/ts-loader/node_modules/source-map": {
8872
+ "version": "0.7.4",
8873
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
8874
+ "integrity": "sha1-qbvnBcnYhG9OCP9nZazw8bCJhlY= sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
8875
+ "engines": {
8876
+ "node": ">= 8"
8877
+ }
8878
+ },
8823
8879
  "node_modules/ts-node": {
8824
8880
  "version": "10.9.1",
8825
8881
  "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
@@ -9167,12 +9223,11 @@
9167
9223
  }
9168
9224
  },
9169
9225
  "node_modules/uuid": {
9170
- "version": "3.4.0",
9171
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
9172
- "integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4= sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
9173
- "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",
9226
+ "version": "9.0.1",
9227
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
9228
+ "integrity": "sha1-4YjUyIU8xyIiA5LEJM1jfzIpPzA= sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
9174
9229
  "bin": {
9175
- "uuid": "bin/uuid"
9230
+ "uuid": "dist/bin/uuid"
9176
9231
  }
9177
9232
  },
9178
9233
  "node_modules/v8-compile-cache-lib": {
@@ -9216,6 +9271,14 @@
9216
9271
  "defaults": "^1.0.3"
9217
9272
  }
9218
9273
  },
9274
+ "node_modules/webidl-conversions": {
9275
+ "version": "7.0.0",
9276
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
9277
+ "integrity": "sha1-JWtOGIK+feu/AdBfCqIDl3jqCAo= sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
9278
+ "engines": {
9279
+ "node": ">=12"
9280
+ }
9281
+ },
9219
9282
  "node_modules/webpack": {
9220
9283
  "version": "5.88.2",
9221
9284
  "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
@@ -9563,20 +9626,17 @@
9563
9626
  }
9564
9627
  },
9565
9628
  "node_modules/whatwg-url": {
9566
- "version": "7.1.0",
9567
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
9568
- "integrity": "sha1-wsSS8eymEpiO/T0iZr4bn8YXDQY= sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
9629
+ "version": "12.0.1",
9630
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
9631
+ "integrity": "sha1-/XvMcRkufDoql7mo1rCUhT7Ydzw= sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
9569
9632
  "dependencies": {
9570
- "lodash.sortby": "^4.7.0",
9571
- "tr46": "^1.0.1",
9572
- "webidl-conversions": "^4.0.2"
9633
+ "tr46": "^4.1.1",
9634
+ "webidl-conversions": "^7.0.0"
9635
+ },
9636
+ "engines": {
9637
+ "node": ">=14"
9573
9638
  }
9574
9639
  },
9575
- "node_modules/whatwg-url/node_modules/webidl-conversions": {
9576
- "version": "4.0.2",
9577
- "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
9578
- "integrity": "sha1-qFWYCx8LazWbodXZ+zmulB+qY60= sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
9579
- },
9580
9640
  "node_modules/which-boxed-primitive": {
9581
9641
  "version": "1.0.2",
9582
9642
  "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
package/out/analytics-client/analytics-client.js CHANGED
@@ -6,7 +6,7 @@ const analytics_node_client_1 = require("@forge/util/packages/analytics-node-cli
6
6
  const os = tslib_1.__importStar(require("os"));
7
7
  const cs_ari_1 = require("@forge/util/packages/cs-ari");
8
8
  const analytics_message_handler_1 = require("./analytics-message-handler");
9
- const uuid = require("uuid");
9
+ const uuid_1 = require("uuid");
10
10
  const cli_shared_1 = require("@forge/cli-shared");
11
11
  const unique_machine_id_1 = require("../command-line/unique-machine-id");
12
12
  const errors_1 = require("../command-line/errors");
@@ -28,7 +28,7 @@ class AnalyticsClientReporter {
28
28
  }
29
29
  reportSuccess(cmdName, cred, attributes) {
30
30
  this.processAnalyticsEvent({
31
- id: uuid(),
31
+ id: (0, uuid_1.v4)(),
32
32
  eventType: analytics_message_handler_1.EventType.TRACK,
33
33
  event: Object.assign(Object.assign({ timestamp: new Date(), os: {
34
34
  name: os.platform(),
@@ -57,7 +57,7 @@ class AnalyticsClientReporter {
57
57
  }
58
58
  reportOperationalEvent(action, actionSubject, cred, attributes) {
59
59
  this.processAnalyticsEvent({
60
- id: uuid(),
60
+ id: (0, uuid_1.v4)(),
61
61
  eventType: analytics_message_handler_1.EventType.OPERATIONAL,
62
62
  event: Object.assign(Object.assign({ timestamp: new Date(), os: {
63
63
  name: os.platform(),
package/out/command-line/anon-user-id.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"anon-user-id.d.ts","sourceRoot":"","sources":["../../src/command-line/anon-user-id.ts"],"names":[],"mappings":"AAOA,wBAAgB,SAAS,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC;AACnD,wBAAgB,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC"}
1
+ {"version":3,"file":"anon-user-id.d.ts","sourceRoot":"","sources":["../../src/command-line/anon-user-id.ts"],"names":[],"mappings":"AAQA,wBAAgB,SAAS,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC;AACnD,wBAAgB,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC"}
package/out/command-line/anon-user-id.js CHANGED
@@ -1,8 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getAnonId = void 0;
4
- const tslib_1 = require("tslib");
5
- const uuid_1 = tslib_1.__importDefault(require("uuid"));
4
+ const uuid_1 = require("uuid");
6
5
  const cli_shared_1 = require("@forge/cli-shared");
7
6
  const ANON_ID_CACHE_KEY = 'anonId';
8
7
  function getAnonId(createNew = false) {
@@ -11,7 +10,7 @@ function getAnonId(createNew = false) {
11
10
  if (!createNew) {
12
11
  return undefined;
13
12
  }
14
- return (0, uuid_1.default)();
13
+ return (0, uuid_1.v4)();
15
14
  });
16
15
  }
17
16
  exports.getAnonId = getAnonId;
package/out/command-line/unique-machine-id.js CHANGED
@@ -1,8 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getMachineId = void 0;
4
- const tslib_1 = require("tslib");
5
- const uuid_1 = tslib_1.__importDefault(require("uuid"));
4
+ const uuid_1 = require("uuid");
6
5
  const node_machine_id_1 = require("node-machine-id");
7
6
  const cli_shared_1 = require("@forge/cli-shared");
8
7
  const MACHINE_ID_CACHE_KEY = 'machineId';
@@ -11,7 +10,7 @@ const generateMachineId = () => {
11
10
  return (0, node_machine_id_1.machineIdSync)();
12
11
  }
13
12
  catch (e) {
14
- return (0, uuid_1.default)();
13
+ return (0, uuid_1.v4)();
15
14
  }
16
15
  };
17
16
  const getMachineId = () => cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME).cached(MACHINE_ID_CACHE_KEY, generateMachineId);
package/out/deploy/packager/runtime-bundler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAkB,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAuB,OAAO,EAAE,MAAM,EAA0B,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,CAAC,mBAAmB,CAAC;cAGxC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgCtF,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAQtD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC;IAUP,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAUvG;AAED,qBAAa,qBAAsB,SAAQ,cAAc;IAC1C,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAMvG;AAED,qBAAa,kBAAmB,SAAQ,cAAc;cACpC,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC;CASrB"}
1
+ {"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAkB,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAuB,OAAO,EAAE,MAAM,EAA0B,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,CAAC,mBAAmB,CAAC;cAGxC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAwCtF,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAQtD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC;IAUP,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAUvG;AAED,qBAAa,qBAAsB,SAAQ,cAAc;IAC1C,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAMvG;AAED,qBAAa,kBAAmB,SAAQ,cAAc;cACpC,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC;CASrB"}
package/out/deploy/packager/runtime-bundler.js CHANGED
@@ -5,6 +5,7 @@ const fs_1 = require("fs");
5
5
  const bundler_1 = require("@forge/bundler");
6
6
  const cli_shared_1 = require("@forge/cli-shared");
7
7
  const packager_1 = require("./packager");
8
+ const node_1 = require("@forge/bundler/out/config/node");
8
9
  class RuntimeBundler {
9
10
  constructor(archiverFactory, logger, bundler) {
10
11
  this.archiverFactory = archiverFactory;
@@ -23,7 +24,12 @@ class RuntimeBundler {
23
24
  }
24
25
  const { output, sourceMap, metadata } = bundlerResponse;
25
26
  if (metadata) {
26
- moduleList.push(...metadata.modules);
27
+ if (metadata.modules) {
28
+ moduleList.push(...metadata.modules);
29
+ }
30
+ if (metadata.nodeRuntimeVersion) {
31
+ archiver.addFile(node_1.NODE_RUNTIME_VERSION_FILE, Buffer.from(metadata.nodeRuntimeVersion));
32
+ }
27
33
  }
28
34
  this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
29
35
  for (const name in output) {
package/out/service/tunnel-service.d.ts CHANGED
@@ -61,6 +61,7 @@ export declare class DockerTunnelService extends TunnelServiceBase {
61
61
  private formatEnvForDocker;
62
62
  private getInteractiveOptions;
63
63
  private getVolumeOptions;
64
+ protected getNgrokConfigEnvironment(ngrokConfigPath: string | undefined): EnvironmentVariable[];
64
65
  private getDockerOptions;
65
66
  }
66
67
  export {};
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
@@ -11,6 +11,7 @@ const cli_shared_1 = require("@forge/cli-shared");
11
11
  const version_info_1 = require("../command-line/version-info");
12
12
  const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
13
13
  exports.CONTAINER_NAME = `forge-tunnel-docker-${process.pid}`;
14
+ const PATH_DOCKER_NGROK_CONFIG = '/opt/provided-ngrok-config.yml';
14
15
  const cliDetails = (0, version_info_1.getCLIDetails)();
15
16
  let versionTags;
16
17
  if ((cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version) !== undefined) {
@@ -250,10 +251,16 @@ class DockerTunnelService extends TunnelServiceBase {
250
251
  });
251
252
  }
252
253
  if (ngrokConfig) {
253
- options.push(`-v=${ngrokConfig}:${ngrokConfig}`);
254
+ options.push('--mount', `type=bind,source=${ngrokConfig},target=${PATH_DOCKER_NGROK_CONFIG}`);
254
255
  }
255
256
  return options;
256
257
  }
258
+ getNgrokConfigEnvironment(ngrokConfigPath) {
259
+ if (ngrokConfigPath) {
260
+ return [{ key: 'NGROK_CONFIG', value: PATH_DOCKER_NGROK_CONFIG }];
261
+ }
262
+ return [];
263
+ }
257
264
  async getDockerOptions() {
258
265
  try {
259
266
  return ['--rm', `--name`, exports.CONTAINER_NAME, '--platform', 'linux/amd64'];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.19.1",
3
+ "version": "6.20.0-next.8",
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.12.3",
22
- "@forge/cli-shared": "3.20.1",
21
+ "@forge/bundler": "4.13.0-next.6",
22
+ "@forge/cli-shared": "3.20.2-next.1",
23
23
  "@forge/egress": "1.2.6",
24
- "@forge/lint": "3.7.1",
25
- "@forge/manifest": "4.20.2",
26
- "@forge/node-runtime": "0.3.0",
27
- "@forge/runtime": "5.1.1",
28
- "@forge/tunnel": "3.8.2",
24
+ "@forge/lint": "3.7.2-next.1",
25
+ "@forge/manifest": "4.20.3-next.1",
26
+ "@forge/node-runtime": "0.4.0-next.3",
27
+ "@forge/runtime": "5.1.2-next.0",
28
+ "@forge/tunnel": "3.8.3-next.6",
29
29
  "@forge/util": "1.3.1",
30
30
  "@sentry/node": "^7.73.0",
31
31
  "ajv": "^8.12.0",
@@ -54,7 +54,7 @@
54
54
  "semver": "^7.5.4",
55
55
  "tmp": "^0.2.1",
56
56
  "tslib": "^2.6.2",
57
- "uuid": "^3.4.0"
57
+ "uuid": "^9.0.1"
58
58
  },
59
59
  "devDependencies": {
60
60
  "@types/archiver": "^5.3.3",
@@ -72,16 +72,16 @@
72
72
  "@types/omelette": "^0.4.2",
73
73
  "@types/semver": "^7.5.3",
74
74
  "@types/tmp": "^0.2.4",
75
- "@types/uuid": "^3.4.11",
75
+ "@types/uuid": "^9.0.5",
76
76
  "jest": "^29.7.0",
77
77
  "jest-fixtures": "^0.6.0",
78
78
  "jest-matcher-specific-error": "^1.0.0",
79
79
  "jest-when": "^3.6.0",
80
- "memfs": "^4.5.0",
80
+ "memfs": "^4.6.0",
81
81
  "sentry-testkit": "^5.0.6",
82
- "type-fest": "4.3.3"
82
+ "type-fest": "4.4.0"
83
83
  },
84
84
  "engines": {
85
85
  "node": ">=12.13.1"
86
86
  }
87
- }
87
+ }