@forge/cli 12.20.1-next.1 → 12.20.1-next.2

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 CHANGED
@@ -1,5 +1,15 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 12.20.1-next.2
4
+
5
+ ### Patch Changes
6
+
7
+ - efff3f1: Remove uuid dependency
8
+ - Updated dependencies [efff3f1]
9
+ - Updated dependencies [7d660c1]
10
+ - @forge/tunnel@6.3.17-next.2
11
+ - @forge/runtime@6.1.3-next.0
12
+
3
13
  ## 12.20.1-next.1
4
14
 
5
15
  ### Patch Changes
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "12.20.1-next.1",
3
+ "version": "12.20.1-next.2",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "12.20.1-next.1",
9
+ "version": "12.20.1-next.2",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
@@ -16,8 +16,8 @@
16
16
  "@forge/i18n": "0.0.7",
17
17
  "@forge/lint": "5.19.0-next.1",
18
18
  "@forge/manifest": "12.7.0-next.1",
19
- "@forge/runtime": "6.1.2",
20
- "@forge/tunnel": "6.3.17-next.1",
19
+ "@forge/runtime": "6.1.3-next.0",
20
+ "@forge/tunnel": "6.3.17-next.2",
21
21
  "@forge/util": "2.0.1",
22
22
  "@sentry/node": "7.106.0",
23
23
  "ajv": "^8.18.0",
@@ -50,7 +50,6 @@
50
50
  "semver": "^7.6.0",
51
51
  "tmp": "^0.2.3",
52
52
  "tslib": "^2.6.2",
53
- "uuid": "^9.0.1",
54
53
  "v8-compile-cache": "^2.4.0"
55
54
  },
56
55
  "bin": {
@@ -72,7 +71,6 @@
72
71
  "@types/omelette": "^0.4.5",
73
72
  "@types/semver": "^7.5.8",
74
73
  "@types/tmp": "^0.2.6",
75
- "@types/uuid": "^9.0.8",
76
74
  "chokidar": "^3.6.0",
77
75
  "jest": "^29.7.0",
78
76
  "jest-fixtures": "^0.6.0",
@@ -693,21 +691,21 @@
693
691
  }
694
692
  },
695
693
  "node_modules/@forge/runtime": {
696
- "version": "6.1.2",
697
- "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.1.2.tgz",
698
- "integrity": "sha512-c18iHovJO4pqGf1PR/P2zNo2F6iajLMIrzSOLbui2Uw7KSPUAjddEsTMDhEj+DdNdXyQBYQJeiGXuxFyBkIUHA==",
694
+ "version": "6.1.3-next.0",
695
+ "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.1.3-next.0.tgz",
696
+ "integrity": "sha512-yscSzMp10geOFkeGtEZ0/shDutNjUHfvPzVgeKZWH2AyppBQRCLTaCIB8bwP+eqcnYuFl9AijrOXuumJlF/9TA==",
699
697
  "license": "SEE LICENSE IN LICENSE.txt"
700
698
  },
701
699
  "node_modules/@forge/tunnel": {
702
- "version": "6.3.17-next.1",
703
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.3.17-next.1.tgz",
704
- "integrity": "sha512-Y3g+Escfg+Q5HNFbAsH3xpE5H9OB1C4NM3QMGEBbhrQPBK1DoeizkkFgKAVcwQ8Z1YR5ItDbAGjl2/MvpPJigA==",
700
+ "version": "6.3.17-next.2",
701
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.3.17-next.2.tgz",
702
+ "integrity": "sha512-me1chgrRTfWkNl75J48XqUEH3saIZ7DZU+G7SQYARL/Fs5PMcXwKtF8mMls9JA/pOx1CUE98hbwg8W7dwPwsmg==",
705
703
  "license": "SEE LICENSE IN LICENSE.txt",
706
704
  "dependencies": {
707
705
  "@forge/bundler": "6.1.26-next.1",
708
706
  "@forge/cli-shared": "8.21.1-next.1",
709
707
  "@forge/csp": "5.8.0",
710
- "@forge/runtime": "6.1.2",
708
+ "@forge/runtime": "6.1.3-next.0",
711
709
  "@forge/util": "^2.0.1",
712
710
  "cheerio": "^1.1.0",
713
711
  "chokidar": "^3.6.0",
@@ -720,7 +718,6 @@
720
718
  "portfinder": "^1.0.37",
721
719
  "tmp": "^0.2.3",
722
720
  "tslib": "^2.6.2",
723
- "uuid": "^9.0.1",
724
721
  "webpack-dev-server": "^5.2.2",
725
722
  "which": "^3.0.1"
726
723
  }
@@ -8335,19 +8332,6 @@
8335
8332
  "node": ">= 0.4.0"
8336
8333
  }
8337
8334
  },
8338
- "node_modules/uuid": {
8339
- "version": "9.0.1",
8340
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
8341
- "integrity": "sha1-4YjUyIU8xyIiA5LEJM1jfzIpPzA= sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
8342
- "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
8343
- "funding": [
8344
- "https://github.com/sponsors/broofa",
8345
- "https://github.com/sponsors/ctavan"
8346
- ],
8347
- "bin": {
8348
- "uuid": "dist/bin/uuid"
8349
- }
8350
- },
8351
8335
  "node_modules/v8-compile-cache": {
8352
8336
  "version": "2.4.0",
8353
8337
  "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
@@ -4,7 +4,7 @@ exports.AnalyticsClientReporter = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const os = tslib_1.__importStar(require("os"));
6
6
  const url_1 = require("url");
7
- const uuid_1 = require("uuid");
7
+ const crypto_1 = require("crypto");
8
8
  const analytics_node_client_1 = require("@forge/util/packages/analytics-node-client");
9
9
  const ari_1 = require("@forge/util/packages/ari");
10
10
  const cli_shared_1 = require("@forge/cli-shared");
@@ -33,7 +33,7 @@ class AnalyticsClientReporter {
33
33
  source = 'forge/cli';
34
34
  async reportSuccess(cmdName, attributes) {
35
35
  this.processAnalyticsEvent({
36
- id: (0, uuid_1.v4)(),
36
+ id: (0, crypto_1.randomUUID)(),
37
37
  eventType: analytics_message_handler_1.EventType.TRACK,
38
38
  event: {
39
39
  timestamp: new Date(),
@@ -88,7 +88,7 @@ class AnalyticsClientReporter {
88
88
  }
89
89
  async reportTrackEvent(action, actionSubject, attributes) {
90
90
  this.processAnalyticsEvent({
91
- id: (0, uuid_1.v4)(),
91
+ id: (0, crypto_1.randomUUID)(),
92
92
  eventType: analytics_message_handler_1.EventType.TRACK,
93
93
  event: {
94
94
  timestamp: new Date(),
@@ -109,7 +109,7 @@ class AnalyticsClientReporter {
109
109
  }
110
110
  async reportOperationalEvent(action, actionSubject, attributes) {
111
111
  this.processAnalyticsEvent({
112
- id: (0, uuid_1.v4)(),
112
+ id: (0, crypto_1.randomUUID)(),
113
113
  eventType: analytics_message_handler_1.EventType.OPERATIONAL,
114
114
  event: {
115
115
  timestamp: new Date(),
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-client.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,6BAA0B;AAC1B,+BAAkC;AAElC,sFAAqG;AACrG,kDAA2D;AAC3D,kDAA2E;AAI3E,+DAAyD;AACzD,mDAAwD;AACxD,yEAAiE;AAEjE,2EAA0E;AAG1E,MAAM,QAAQ,GAAyB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;AAExD,SAAS,iBAAiB,CAAC,MAAc;IACvC,IAAI;QACF,OAAO,qBAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;KAC5C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAgBD,MAAa,uBAAuB;IAEf;IACA;IACA;IAHnB,YACmB,OAAgB,EAChB,aAAkC,EAClC,eAAiC;QAFjC,YAAO,GAAP,OAAO,CAAS;QAChB,kBAAa,GAAb,aAAa,CAAqB;QAClC,oBAAe,GAAf,eAAe,CAAkB;IACjD,CAAC;IAEa,MAAM,GAAW,WAAW,CAAC;IAEvC,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,UAAkC;QAC5E,IAAI,CAAC,qBAAqB,CAAC;YACzB,EAAE,EAAE,IAAA,SAAI,GAAE;YACV,SAAS,EAAE,qCAAS,CAAC,KAAK;YAC1B,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,EAAE,EAAE;oBACF,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE;oBACnB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;iBACtB;gBACD,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC5B,UAAU,EAAE;oBACV,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM,EAAE,SAAS;oBACjB,aAAa,EAAE,OAAO;oBACtB,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;oBAC3C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;iBAC3C;aACY;SAChB,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,UAAkC,EAAE,CAAQ;QACtF,UAAU,GAAG;YACX,GAAG,UAAU;YACb,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAC5B,CAAC;QACF,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAe,EAAE,UAAkC;QAClF,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACvE,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,OAAe,EACf,UAAkC,EAClC,CAA0B;QAE1B,IAAI,CAAC,EAAE;YACL,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE;QAED,MAAM,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,UAAiC;QAC9D,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,UAIlC;QACC,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,EAAE;YACvD,GAAG,UAAU;SACd,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,UAGvC;QACC,MAAM,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,gBAAgB,EAAE;YACpE,GAAG,UAAU;SACd,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,UAMjC;QACC,MAAM,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,aAAa,EAAE;YAClE,GAAG,UAAU;SACd,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,MAAc,EACd,aAAqB,EACrB,UAAkC;QAElC,IAAI,CAAC,qBAAqB,CAAC;YACzB,EAAE,EAAE,IAAA,SAAI,GAAE;YACV,SAAS,EAAE,qCAAS,CAAC,KAAK;YAC1B,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,EAAE,EAAE;oBACF,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE;oBACnB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;iBACtB;gBACD,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC5B,UAAU,EAAE;oBACV,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM,EAAE,MAAM;oBACd,aAAa,EAAE,aAAa;oBAC5B,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;oBAC3C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;iBAC3C;aACY;SAChB,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,MAAc,EACd,aAAqB,EACrB,UAAkC;QAElC,IAAI,CAAC,qBAAqB,CAAC;YACzB,EAAE,EAAE,IAAA,SAAI,GAAE;YACV,SAAS,EAAE,qCAAS,CAAC,WAAW;YAChC,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,EAAE,EAAE;oBACF,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE;oBACnB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;iBACtB;gBACD,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC5B,gBAAgB,EAAE;oBAChB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM;oBACN,aAAa;oBACb,UAAU,EAAE;wBACV,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;qBACnC;oBACD,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;iBAC3C;aACkB;SACtB,CAAC,CAAC;IACL,CAAC;IAEO,qBAAqB,CAAC,cAAgC;QAC5D,IAAI,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,KAAK,KAAK,EAAE;YAC1D,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC;YAC1E,OAAO;gBACL,UAAU,EAAE,iCAAS,CAAC,iBAAiB;gBACvC,MAAM;aACP,CAAC;SACH;QAAC,MAAM;YACN,OAAO;gBACL,WAAW,EAAE,IAAA,wBAAS,GAAE;aACzB,CAAC;SACH;IACH,CAAC;IAEO,gBAAgB,CAAC,CAAQ;QAC/B,IAAI,CAAC,YAAY,iCAAoB,EAAE;YACrC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;SAC/B;QACD,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC;IAEO,oBAAoB,CAAC,CAAyB;QACpD,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,CAAC,YAAY,uBAAc,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,KAAK,YAAY,iCAAoB,EAAE;gBACzC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACjC;iBAAM;gBACL,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,CAAC;IAEO,YAAY,CAAI,SAAY,EAAE,aAAqB,EAAE,IAAY,EAAE,SAA6B,QAAQ;QAC9G,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,OAAO,WAAW;YAChB,CAAC,CAAC;gBACE,CAAC,aAAa,CAAC,EAAE;oBACf,EAAE,EAAE,WAAW;oBACf,IAAI;iBACL;aACF;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAEO,YAAY;QAClB,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAEO,UAAU;QAChB,OAAO,EAAE,SAAS,EAAE,IAAA,gCAAY,GAAE,EAAE,CAAC;IACvC,CAAC;IAEO,YAAY,CAAI,SAAY,EAAE,IAAY,EAAE,SAA6B,QAAQ;QACvF,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,CAAC;IAEO,cAAc,CAAC,UAAe;QACpC,OAAO;YACL,GAAG,UAAU;YACb,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,iBAAiB,CAAC;YAClE,GAAG,IAAI,CAAC,YAAY,EAAE;YACtB,GAAG,IAAI,CAAC,UAAU,EAAE;SACrB,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,UAAkC;QACtD,OAAO;YACL,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,CAAC;YACzE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC;YAChE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC;SAC/D,CAAC;IACJ,CAAC;IACM,MAAM,CAAC,WAAW,CAAC,KAAU;QAClC,OAAO,KAAK,YAAY,SAAG;YACzB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvB,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ;gBACzB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK,KAAK,SAAS;oBACnB,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF;AA5OD,0DA4OC"}
1
+ {"version":3,"file":"analytics-client.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getAnonId = void 0;
4
- const uuid_1 = require("uuid");
4
+ const crypto_1 = require("crypto");
5
5
  const cli_shared_1 = require("@forge/cli-shared");
6
6
  const ANON_ID_CACHE_KEY = 'anonId';
7
7
  function getAnonId(createNew = false) {
@@ -10,7 +10,7 @@ function getAnonId(createNew = false) {
10
10
  if (!createNew) {
11
11
  return undefined;
12
12
  }
13
- return (0, uuid_1.v4)();
13
+ return (0, crypto_1.randomUUID)();
14
14
  });
15
15
  }
16
16
  exports.getAnonId = getAnonId;
@@ -1 +1 @@
1
- {"version":3,"file":"anon-user-id.js","sourceRoot":"","sources":["../../src/command-line/anon-user-id.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAElC,kDAAoE;AAEpE,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAMnC,SAAgB,SAAS,CAAC,SAAS,GAAG,KAAK;IACzC,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC;IAE5D,OAAO,UAAU,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,IAAA,SAAI,GAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AATD,8BASC"}
1
+ {"version":3,"file":"anon-user-id.js","sourceRoot":"","sources":["../../src/command-line/anon-user-id.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAEpC,kDAAoE;AAEpE,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAMnC,SAAgB,SAAS,CAAC,SAAS,GAAG,KAAK;IACzC,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC;IAE5D,OAAO,UAAU,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,IAAA,mBAAU,GAAE,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC;AATD,8BASC"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getMachineId = void 0;
4
- const uuid_1 = require("uuid");
4
+ const crypto_1 = require("crypto");
5
5
  const node_machine_id_1 = require("node-machine-id");
6
6
  const cli_shared_1 = require("@forge/cli-shared");
7
7
  const MACHINE_ID_CACHE_KEY = 'machineId';
@@ -10,7 +10,7 @@ const generateMachineId = () => {
10
10
  return (0, node_machine_id_1.machineIdSync)();
11
11
  }
12
12
  catch (e) {
13
- return (0, uuid_1.v4)();
13
+ return (0, crypto_1.randomUUID)();
14
14
  }
15
15
  };
16
16
  const getMachineId = () => cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME).cached(MACHINE_ID_CACHE_KEY, generateMachineId);
@@ -1 +1 @@
1
- {"version":3,"file":"unique-machine-id.js","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAClC,qDAAgD;AAChD,kDAAoE;AAEpE,MAAM,oBAAoB,GAAG,WAAW,CAAC;AAEzC,MAAM,iBAAiB,GAAG,GAAW,EAAE;IACrC,IAAI;QACF,OAAO,IAAA,+BAAa,GAAE,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAA,SAAI,GAAE,CAAC;KACf;AACH,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,GAAW,EAAE,CACvC,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC,MAAM,CAAS,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;AADtF,QAAA,YAAY,gBAC0E"}
1
+ {"version":3,"file":"unique-machine-id.js","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,qDAAgD;AAChD,kDAAoE;AAEpE,MAAM,oBAAoB,GAAG,WAAW,CAAC;AAEzC,MAAM,iBAAiB,GAAG,GAAW,EAAE;IACrC,IAAI;QACF,OAAO,IAAA,+BAAa,GAAE,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAA,mBAAU,GAAE,CAAC;KACrB;AACH,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,GAAW,EAAE,CACvC,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC,MAAM,CAAS,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;AADtF,QAAA,YAAY,gBAC0E"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "12.20.1-next.1",
3
+ "version": "12.20.1-next.2",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -27,8 +27,8 @@
27
27
  "@forge/lint": "5.19.0-next.1",
28
28
  "@forge/manifest": "12.7.0-next.1",
29
29
  "@forge/i18n": "0.0.7",
30
- "@forge/runtime": "6.1.2",
31
- "@forge/tunnel": "6.3.17-next.1",
30
+ "@forge/runtime": "6.1.3-next.0",
31
+ "@forge/tunnel": "6.3.17-next.2",
32
32
  "@forge/util": "2.0.1",
33
33
  "@sentry/node": "7.106.0",
34
34
  "ajv": "^8.18.0",
@@ -61,7 +61,6 @@
61
61
  "semver": "^7.6.0",
62
62
  "tmp": "^0.2.3",
63
63
  "tslib": "^2.6.2",
64
- "uuid": "^9.0.1",
65
64
  "v8-compile-cache": "^2.4.0"
66
65
  },
67
66
  "devDependencies": {
@@ -80,7 +79,6 @@
80
79
  "@types/omelette": "^0.4.5",
81
80
  "@types/semver": "^7.5.8",
82
81
  "@types/tmp": "^0.2.6",
83
- "@types/uuid": "^9.0.8",
84
82
  "chokidar": "^3.6.0",
85
83
  "jest": "^29.7.0",
86
84
  "jest-fixtures": "^0.6.0",