@forge/cli 4.1.1 → 4.2.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 (14) hide show
  1. package/CHANGELOG.md +96 -0
  2. package/npm-shrinkwrap.json +77 -72
  3. package/out/bin/postinstall.js +1 -1
  4. package/out/command-line/anon-user-id.js +6 -10
  5. package/out/command-line/cli-prerequisites.d.ts +0 -1
  6. package/out/command-line/cli-prerequisites.d.ts.map +1 -1
  7. package/out/command-line/cli-prerequisites.js +1 -24
  8. package/out/command-line/unique-machine-id.d.ts.map +1 -1
  9. package/out/command-line/unique-machine-id.js +1 -10
  10. package/out/workers/forge-cli-workers.js +1 -1
  11. package/package.json +7 -7
  12. package/out/bin/preinstall.d.ts +0 -3
  13. package/out/bin/preinstall.d.ts.map +0 -1
  14. package/out/bin/preinstall.js +0 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,101 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 4.2.0-next.8
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [3d82376]
8
+ - @forge/manifest@3.5.0-next.7
9
+ - @forge/cli-shared@2.4.0-next.8
10
+ - @forge/lint@3.0.4-next.8
11
+ - @forge/bundler@3.0.3-next.8
12
+
13
+ ## 4.2.0-next.7
14
+
15
+ ### Patch Changes
16
+
17
+ - Updated dependencies [f3ac287]
18
+ - Updated dependencies [0accde8]
19
+ - Updated dependencies [ffb508a]
20
+ - @forge/manifest@3.5.0-next.6
21
+ - @forge/cli-shared@2.4.0-next.7
22
+ - @forge/lint@3.0.4-next.7
23
+ - @forge/bundler@3.0.3-next.7
24
+
25
+ ## 4.2.0-next.6
26
+
27
+ ### Patch Changes
28
+
29
+ - Updated dependencies [d196b41]
30
+ - @forge/manifest@3.5.0-next.5
31
+ - @forge/cli-shared@2.4.0-next.6
32
+ - @forge/lint@3.0.4-next.6
33
+ - @forge/bundler@3.0.3-next.6
34
+
35
+ ## 4.2.0-next.5
36
+
37
+ ### Patch Changes
38
+
39
+ - Updated dependencies [e411a29]
40
+ - @forge/manifest@3.5.0-next.4
41
+ - @forge/cli-shared@2.4.0-next.5
42
+ - @forge/lint@3.0.4-next.5
43
+ - @forge/bundler@3.0.3-next.5
44
+
45
+ ## 4.2.0-next.4
46
+
47
+ ### Patch Changes
48
+
49
+ - Updated dependencies [d094c69]
50
+ - @forge/manifest@3.5.0-next.3
51
+ - @forge/cli-shared@2.4.0-next.4
52
+ - @forge/lint@3.0.4-next.4
53
+ - @forge/bundler@3.0.3-next.4
54
+
55
+ ## 4.2.0-next.3
56
+
57
+ ### Minor Changes
58
+
59
+ - f33aada8: Fix vulnerability dependencies
60
+
61
+ ### Patch Changes
62
+
63
+ - Updated dependencies [f33aada8]
64
+ - Updated dependencies [726ef79d]
65
+ - @forge/cli-shared@2.4.0-next.3
66
+ - @forge/bundler@3.0.3-next.3
67
+ - @forge/lint@3.0.4-next.3
68
+
69
+ ## 4.1.2-next.2
70
+
71
+ ### Patch Changes
72
+
73
+ - Updated dependencies [02839be]
74
+ - @forge/manifest@3.5.0-next.2
75
+ - @forge/cli-shared@2.3.2-next.2
76
+ - @forge/lint@3.0.4-next.2
77
+ - @forge/bundler@3.0.3-next.2
78
+
79
+ ## 4.1.2-next.1
80
+
81
+ ### Patch Changes
82
+
83
+ - Updated dependencies [a3bfe81]
84
+ - @forge/manifest@3.5.0-next.1
85
+ - @forge/cli-shared@2.3.2-next.1
86
+ - @forge/lint@3.0.4-next.1
87
+ - @forge/bundler@3.0.3-next.1
88
+
89
+ ## 4.1.2-next.0
90
+
91
+ ### Patch Changes
92
+
93
+ - Updated dependencies [ba674590]
94
+ - @forge/manifest@3.5.0-next.0
95
+ - @forge/cli-shared@2.3.2-next.0
96
+ - @forge/lint@3.0.4-next.0
97
+ - @forge/bundler@3.0.3-next.0
98
+
3
99
  ## 4.1.1
4
100
 
5
101
  ### Patch Changes
package/npm-shrinkwrap.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "4.1.1",
3
+ "version": "4.2.0-next.8",
4
4
  "lockfileVersion": 1,
5
5
  "requires": true,
6
6
  "dependencies": {
@@ -431,9 +431,9 @@
431
431
  "integrity": "sha512-+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA=="
432
432
  },
433
433
  "@forge/bundler": {
434
- "version": "3.0.2",
435
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-3.0.2.tgz",
436
- "integrity": "sha512-C5eP4Sxu6eoaUdP6VaUcpbfjKplN26YsxQoU4zazT4PukreBvyaTT1BpN4vp9Nb5nwpLOcGqzFDRukstUNqpMg==",
434
+ "version": "3.0.3-next.8",
435
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-3.0.3-next.8.tgz",
436
+ "integrity": "sha512-UU27LTUqAKMlOV0C8MZ2C8QQZ3dKBaSnOW4qQqO0kcQzIkk4t7tCbdkvb3Y9DNLqcVQHuw6uL8kF2PTpoaJNYw==",
437
437
  "requires": {
438
438
  "@babel/core": "^7.16.7",
439
439
  "@babel/plugin-proposal-class-properties": "^7.16.7",
@@ -443,8 +443,8 @@
443
443
  "@babel/preset-typescript": "^7.16.7",
444
444
  "@forge/api": "2.6.1",
445
445
  "@forge/babel-plugin-transform-ui": "1.1.0",
446
- "@forge/cli-shared": "2.3.1",
447
- "@forge/lint": "3.0.3",
446
+ "@forge/cli-shared": "2.4.0-next.8",
447
+ "@forge/lint": "3.0.4-next.8",
448
448
  "assert": "^1.1.1",
449
449
  "babel-loader": "^8.2.3",
450
450
  "browserify-zlib": "^0.2.0",
@@ -472,17 +472,17 @@
472
472
  }
473
473
  },
474
474
  "@forge/cli-shared": {
475
- "version": "2.3.1",
476
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-2.3.1.tgz",
477
- "integrity": "sha512-6XoIEWAKInmisS2s62z4yj7xpj8jAlrYQ0MXjg5mk9MVF1mAjwOylAVylz/deE4MngLBDadA6m1wz7KuV59e8Q==",
475
+ "version": "2.4.0-next.8",
476
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-2.4.0-next.8.tgz",
477
+ "integrity": "sha512-gwIkNW3rtwxYdideSe+hAOno3PoMjfiFH3X+V2vAF8Qauw059l0xauqtGFD8bPwXrBoMEqW40mkNalXWAqJjwA==",
478
478
  "requires": {
479
- "@forge/manifest": "3.4.0",
479
+ "@forge/manifest": "3.5.0-next.7",
480
480
  "@forge/util": "1.2.0",
481
481
  "array.prototype.flatmap": "^1.2.3",
482
482
  "case": "^1.6.2",
483
483
  "chalk": "^2.4.2",
484
484
  "cheerio": "^0.22.0",
485
- "cli-table3": "^0.5.1",
485
+ "cli-table3": "^0.6.1",
486
486
  "conf": "^6.2.0",
487
487
  "cross-spawn": "^7.0.1",
488
488
  "figures": "^3.2.0",
@@ -516,13 +516,13 @@
516
516
  }
517
517
  },
518
518
  "@forge/lint": {
519
- "version": "3.0.3",
520
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.0.3.tgz",
521
- "integrity": "sha512-IHBWHkR/8PAyoHhvIepiCRXA9GNmDt+xrw26cZQWO9+/1Suq22Jd9jGAGY52NBM/0FGCbmdnvpexMdmNcrywAg==",
519
+ "version": "3.0.4-next.8",
520
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-3.0.4-next.8.tgz",
521
+ "integrity": "sha512-9AMhjiAj761qdsVpJNApZcER3aiOTQid8EoLN8YSc/zeMcDOd2us4b6zhlYC+aiykpOe40i0wSlXatwA95mVXw==",
522
522
  "requires": {
523
- "@forge/cli-shared": "2.3.1",
523
+ "@forge/cli-shared": "2.4.0-next.8",
524
524
  "@forge/csp": "1.10.0",
525
- "@forge/manifest": "3.4.0",
525
+ "@forge/manifest": "3.5.0-next.7",
526
526
  "@typescript-eslint/typescript-estree": "^3.5.0",
527
527
  "atlassian-openapi": "^1.0.13",
528
528
  "cross-spawn": "^7.0.1",
@@ -530,9 +530,9 @@
530
530
  }
531
531
  },
532
532
  "@forge/manifest": {
533
- "version": "3.4.0",
534
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-3.4.0.tgz",
535
- "integrity": "sha512-FnCInpqrjXSK3rFTjofh2oPGvrJX5l4DvmiEM0dl/QosgaFcIC7gmub4y0uHsY1Ie9MMfhmUSPc5DteCATkupA==",
533
+ "version": "3.5.0-next.7",
534
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-3.5.0-next.7.tgz",
535
+ "integrity": "sha512-y9zIoIjHBigqh0H9G8ZXEqyHAL3ue+bSwrkUp2OH+x8rM97P8I+AHselGvVdt+lfzoV0IFvnmHCD+nt9JtTA/A==",
536
536
  "requires": {
537
537
  "@forge/util": "1.2.0",
538
538
  "ajv": "^6.12.5",
@@ -815,6 +815,13 @@
815
815
  "readdir-glob": "^1.0.0",
816
816
  "tar-stream": "^2.2.0",
817
817
  "zip-stream": "^4.1.0"
818
+ },
819
+ "dependencies": {
820
+ "async": {
821
+ "version": "3.2.3",
822
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
823
+ "integrity": "sha1-rFPa/T9HIO6eihYGKPGOqR3xlsk= sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
824
+ }
818
825
  }
819
826
  },
820
827
  "archiver-utils": {
@@ -917,9 +924,12 @@
917
924
  }
918
925
  },
919
926
  "async": {
920
- "version": "3.2.3",
921
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
922
- "integrity": "sha1-rFPa/T9HIO6eihYGKPGOqR3xlsk= sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
927
+ "version": "2.6.3",
928
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
929
+ "integrity": "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8= sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
930
+ "requires": {
931
+ "lodash": "^4.17.14"
932
+ }
923
933
  },
924
934
  "asynckit": {
925
935
  "version": "0.4.0",
@@ -1344,41 +1354,11 @@
1344
1354
  "integrity": "sha1-rclU6+KBw3pjGb+kAebdJIj/tw0= sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="
1345
1355
  },
1346
1356
  "cli-table3": {
1347
- "version": "0.5.1",
1348
- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
1349
- "integrity": "sha1-AlI3LZTfxA29jfBgBfSPMfZW8gI= sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
1357
+ "version": "0.6.1",
1358
+ "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
1359
+ "integrity": "sha1-Ns6bevSEfyiNPN0IH70Jv3vSN7g= sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
1350
1360
  "requires": {
1351
- "object-assign": "^4.1.0",
1352
- "string-width": "^2.1.1"
1353
- },
1354
- "dependencies": {
1355
- "ansi-regex": {
1356
- "version": "3.0.0",
1357
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
1358
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
1359
- },
1360
- "is-fullwidth-code-point": {
1361
- "version": "2.0.0",
1362
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
1363
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
1364
- },
1365
- "string-width": {
1366
- "version": "2.1.1",
1367
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
1368
- "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4= sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
1369
- "requires": {
1370
- "is-fullwidth-code-point": "^2.0.0",
1371
- "strip-ansi": "^4.0.0"
1372
- }
1373
- },
1374
- "strip-ansi": {
1375
- "version": "4.0.0",
1376
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
1377
- "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
1378
- "requires": {
1379
- "ansi-regex": "^3.0.0"
1380
- }
1381
- }
1361
+ "string-width": "^4.2.0"
1382
1362
  }
1383
1363
  },
1384
1364
  "cli-width": {
@@ -2897,14 +2877,6 @@
2897
2877
  "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
2898
2878
  "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg="
2899
2879
  },
2900
- "log-symbols": {
2901
- "version": "3.0.0",
2902
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
2903
- "integrity": "sha1-86CFFqXeqJMzan3uFNGKHP2rd8Q= sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
2904
- "requires": {
2905
- "chalk": "^2.4.2"
2906
- }
2907
- },
2908
2880
  "lru-cache": {
2909
2881
  "version": "6.0.0",
2910
2882
  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -3202,6 +3174,47 @@
3202
3174
  "ansi-styles": "^4.1.0",
3203
3175
  "supports-color": "^7.1.0"
3204
3176
  }
3177
+ },
3178
+ "has-flag": {
3179
+ "version": "3.0.0",
3180
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
3181
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
3182
+ },
3183
+ "log-symbols": {
3184
+ "version": "3.0.0",
3185
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
3186
+ "integrity": "sha1-86CFFqXeqJMzan3uFNGKHP2rd8Q= sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
3187
+ "requires": {
3188
+ "chalk": "^2.4.2"
3189
+ },
3190
+ "dependencies": {
3191
+ "ansi-styles": {
3192
+ "version": "3.2.1",
3193
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
3194
+ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0= sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
3195
+ "requires": {
3196
+ "color-convert": "^1.9.0"
3197
+ }
3198
+ },
3199
+ "chalk": {
3200
+ "version": "2.4.2",
3201
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
3202
+ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ= sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
3203
+ "requires": {
3204
+ "ansi-styles": "^3.2.1",
3205
+ "escape-string-regexp": "^1.0.5",
3206
+ "supports-color": "^5.3.0"
3207
+ }
3208
+ },
3209
+ "supports-color": {
3210
+ "version": "5.5.0",
3211
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
3212
+ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8= sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
3213
+ "requires": {
3214
+ "has-flag": "^3.0.0"
3215
+ }
3216
+ }
3217
+ }
3205
3218
  }
3206
3219
  }
3207
3220
  },
@@ -3493,14 +3506,6 @@
3493
3506
  "mkdirp": "^0.5.5"
3494
3507
  },
3495
3508
  "dependencies": {
3496
- "async": {
3497
- "version": "2.6.3",
3498
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
3499
- "integrity": "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8= sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
3500
- "requires": {
3501
- "lodash": "^4.17.14"
3502
- }
3503
- },
3504
3509
  "debug": {
3505
3510
  "version": "3.2.7",
3506
3511
  "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
package/out/bin/postinstall.js CHANGED
@@ -10,7 +10,7 @@ const isSupportedShell_1 = require("../autocomplete/isSupportedShell");
10
10
  const unique_machine_id_1 = require("../command-line/unique-machine-id");
11
11
  const cached_config_service_1 = require("../service/cached-config-service");
12
12
  const ui = new cli_shared_1.CommandLineUI(() => true);
13
- const cachedConf = new cli_shared_1.CachedConf(unique_machine_id_1.FORGE_CLI_PACKAGE);
13
+ const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
14
14
  const configService = new cached_config_service_1.CachedConfigService(cachedConf);
15
15
  const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, configService);
16
16
  const cliDetails = version_info_1.getCLIDetails();
package/out/command-line/anon-user-id.js CHANGED
@@ -7,15 +7,11 @@ const cli_shared_1 = require("@forge/cli-shared");
7
7
  const ANON_ID_CACHE_KEY = 'anonId';
8
8
  function getAnonId(createNew = false) {
9
9
  const cachedConf = cli_shared_1.CachedConf.getCache('@forge/cli');
10
- const storedAnonId = cachedConf.get(ANON_ID_CACHE_KEY);
11
- if (storedAnonId) {
12
- return storedAnonId;
13
- }
14
- if (!createNew) {
15
- return undefined;
16
- }
17
- const generatedAnonId = uuid_1.default();
18
- cachedConf.set(ANON_ID_CACHE_KEY, generatedAnonId);
19
- return generatedAnonId;
10
+ return cachedConf.cached(ANON_ID_CACHE_KEY, () => {
11
+ if (!createNew) {
12
+ return undefined;
13
+ }
14
+ return uuid_1.default();
15
+ });
20
16
  }
21
17
  exports.getAnonId = getAnonId;
package/out/command-line/cli-prerequisites.d.ts CHANGED
@@ -1,3 +1,2 @@
1
1
  export declare function checkNodeVersion(): void;
2
- export declare function checkPythonVersion(): Promise<void>;
3
2
  //# sourceMappingURL=cli-prerequisites.d.ts.map
package/out/command-line/cli-prerequisites.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli-prerequisites.d.ts","sourceRoot":"","sources":["../../src/command-line/cli-prerequisites.ts"],"names":[],"mappings":"AAMA,wBAAgB,gBAAgB,IAAI,IAAI,CAYvC;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAyBlD"}
1
+ {"version":3,"file":"cli-prerequisites.d.ts","sourceRoot":"","sources":["../../src/command-line/cli-prerequisites.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,IAAI,IAAI,CAYvC"}
package/out/command-line/cli-prerequisites.js CHANGED
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.checkPythonVersion = exports.checkNodeVersion = void 0;
4
- const child_process_1 = require("child_process");
3
+ exports.checkNodeVersion = void 0;
5
4
  const semver_1 = require("semver");
6
5
  const version_info_1 = require("./version-info");
7
6
  const cli_shared_1 = require("@forge/cli-shared");
@@ -18,25 +17,3 @@ function checkNodeVersion() {
18
17
  }
19
18
  }
20
19
  exports.checkNodeVersion = checkNodeVersion;
21
- function checkPythonVersion() {
22
- return new Promise((resolve) => {
23
- const opts = `-c "import platform; print(platform.python_version())"`;
24
- let command = `python ${opts} || python2.7 ${opts}`;
25
- if (process.env.PYTHON) {
26
- command = `${process.env.PYTHON} ${opts}`;
27
- }
28
- child_process_1.exec(command, (err, stdout) => {
29
- if (err) {
30
- console.error(cli_shared_1.Text.error.failedGettingPythonVersion(err));
31
- process.exit(1);
32
- }
33
- const pythonVersion = stdout.trim();
34
- if (!pythonVersion.startsWith('2.')) {
35
- console.error(cli_shared_1.Text.error.invalidPythonVersion(pythonVersion));
36
- process.exit(1);
37
- }
38
- resolve();
39
- });
40
- });
41
- }
42
- exports.checkPythonVersion = checkPythonVersion;
package/out/command-line/unique-machine-id.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unique-machine-id.d.ts","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAW9C,eAAO,MAAM,YAAY,QAAO,MAS/B,CAAC"}
1
+ {"version":3,"file":"unique-machine-id.d.ts","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAW9C,eAAO,MAAM,YAAY,QAAO,MACgE,CAAC"}
package/out/command-line/unique-machine-id.js CHANGED
@@ -15,13 +15,4 @@ const generateMachineId = () => {
15
15
  return uuid_1.default();
16
16
  }
17
17
  };
18
- exports.getMachineId = () => {
19
- const cachedConf = cli_shared_1.CachedConf.getCache(exports.FORGE_CLI_PACKAGE);
20
- const storedMachineId = cachedConf.get(MACHINE_ID_CACHE_KEY);
21
- if (storedMachineId) {
22
- return storedMachineId;
23
- }
24
- const newMachineId = generateMachineId();
25
- cachedConf.set(MACHINE_ID_CACHE_KEY, newMachineId);
26
- return newMachineId;
27
- };
18
+ exports.getMachineId = () => cli_shared_1.CachedConf.getCache(exports.FORGE_CLI_PACKAGE).cached(MACHINE_ID_CACHE_KEY, generateMachineId);
package/out/workers/forge-cli-workers.js CHANGED
@@ -9,7 +9,7 @@ const cached_config_service_1 = require("../service/cached-config-service");
9
9
  const cli_shared_1 = require("@forge/cli-shared");
10
10
  const unique_machine_id_1 = require("../command-line/unique-machine-id");
11
11
  const workerInfo = JSON.parse(process.argv[2]);
12
- const cachedConf = new cli_shared_1.CachedConf(unique_machine_id_1.FORGE_CLI_PACKAGE);
12
+ const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
13
13
  const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
14
14
  const ALL_WORKERS = [
15
15
  new analytics_message_worker_1.AnalyticsMessageWorker(new local_file_storage_1.LocalFileStorage(), new analytics_message_handler_1.AnalyticsMessageHandler(workerInfo ? workerInfo.environment : undefined), cachedConfigService),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "4.1.1",
3
+ "version": "4.2.0-next.8",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "UNLICENSED",
@@ -18,17 +18,17 @@
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": "3.0.2",
22
- "@forge/cli-shared": "2.3.1",
21
+ "@forge/bundler": "3.0.3-next.8",
22
+ "@forge/cli-shared": "2.4.0-next.8",
23
23
  "@forge/csp": "^1.10.0",
24
- "@forge/lint": "3.0.3",
25
- "@forge/manifest": "3.4.0",
24
+ "@forge/lint": "3.0.4-next.8",
25
+ "@forge/manifest": "3.5.0-next.7",
26
26
  "@forge/util": "1.2.0",
27
27
  "ajv": "^6.12.5",
28
28
  "archiver": "^5.2.0",
29
29
  "case": "^1.6.2",
30
30
  "cheerio": "^0.22.0",
31
- "cli-table3": "^0.5.1",
31
+ "cli-table3": "^0.6.1",
32
32
  "command-exists": "^1.2.8",
33
33
  "commander": "^7.0.0",
34
34
  "cross-spawn": "^7.0.1",
@@ -76,7 +76,7 @@
76
76
  "memfs": "^3.4.1"
77
77
  },
78
78
  "optionalDependencies": {
79
- "keytar": "^5.0.0"
79
+ "keytar": "^7.0.0"
80
80
  },
81
81
  "engines": {
82
82
  "node": ">=12.13.1"
package/out/bin/preinstall.d.ts DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env node
2
- export {};
3
- //# sourceMappingURL=preinstall.d.ts.map
package/out/bin/preinstall.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"preinstall.d.ts","sourceRoot":"","sources":["../../src/bin/preinstall.ts"],"names":[],"mappings":""}
package/out/bin/preinstall.js DELETED
@@ -1,9 +0,0 @@
1
- #!/usr/bin/env node
2
- "use strict";
3
- Object.defineProperty(exports, "__esModule", { value: true });
4
- const cli_prerequisites_1 = require("../command-line/cli-prerequisites");
5
- async function main() {
6
- cli_prerequisites_1.checkNodeVersion();
7
- await cli_prerequisites_1.checkPythonVersion();
8
- }
9
- main();