@forge/cli 13.4.0-next.5-experimental-016ed9d → 13.4.0-next.5-experimental-c575574

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,6 +1,6 @@
1
1
  # @forge/cli
2
2
 
3
- ## 13.4.0-next.5-experimental-016ed9d
3
+ ## 13.4.0-next.5-experimental-c575574
4
4
 
5
5
  ### Minor Changes
6
6
 
@@ -11,18 +11,19 @@
11
11
  ### Patch Changes
12
12
 
13
13
  - 6866aae: Show container commands help
14
- - Updated dependencies [016ed9d]
14
+ - 9afd5c3: Add native Forge CLI proxy support for Node and Undici network clients.
15
15
  - Updated dependencies [71d0c4e]
16
16
  - Updated dependencies [f9fba62]
17
17
  - Updated dependencies [2b13c2e]
18
+ - Updated dependencies [9afd5c3]
18
19
  - Updated dependencies [ff4f2bf]
19
20
  - Updated dependencies [47fb0a1]
20
21
  - Updated dependencies [6c1371a]
21
- - @forge/cli-shared@9.4.0-next.4-experimental-016ed9d
22
- - @forge/bundler@7.2.0-next.5-experimental-016ed9d
23
- - @forge/lint@6.2.0-next.5-experimental-016ed9d
24
- - @forge/manifest@13.3.1-next.0-experimental-016ed9d
25
- - @forge/tunnel@7.1.1-next.5-experimental-016ed9d
22
+ - @forge/cli-shared@9.4.0-next.4-experimental-c575574
23
+ - @forge/bundler@7.2.0-next.5-experimental-c575574
24
+ - @forge/lint@6.2.0-next.5-experimental-c575574
25
+ - @forge/manifest@13.3.1-next.0-experimental-c575574
26
+ - @forge/tunnel@7.1.1-next.5-experimental-c575574
26
27
 
27
28
  ## 13.4.0-next.5
28
29
 
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "13.4.0-next.5-experimental-016ed9d",
3
+ "version": "13.4.0-next.5-experimental-c575574",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "13.4.0-next.5-experimental-016ed9d",
9
+ "version": "13.4.0-next.5-experimental-c575574",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
13
- "@forge/bundler": "7.2.0-next.5-experimental-016ed9d",
14
- "@forge/cli-shared": "9.4.0-next.4-experimental-016ed9d",
13
+ "@forge/bundler": "7.2.0-next.5-experimental-c575574",
14
+ "@forge/cli-shared": "9.4.0-next.4-experimental-c575574",
15
15
  "@forge/egress": "3.0.0",
16
16
  "@forge/i18n": "1.0.0",
17
- "@forge/lint": "6.2.0-next.5-experimental-016ed9d",
18
- "@forge/manifest": "13.3.1-next.0-experimental-016ed9d",
17
+ "@forge/lint": "6.2.0-next.5-experimental-c575574",
18
+ "@forge/manifest": "13.3.1-next.0-experimental-c575574",
19
19
  "@forge/runtime": "7.0.0",
20
- "@forge/tunnel": "7.1.1-next.5-experimental-016ed9d",
20
+ "@forge/tunnel": "7.1.1-next.5-experimental-c575574",
21
21
  "@forge/util": "3.0.0",
22
22
  "@sentry/node": "7.106.0",
23
23
  "ajv": "^8.18.0",
@@ -38,6 +38,7 @@
38
38
  "fs-extra": "^11.2.0",
39
39
  "hidefile": "^3.0.0",
40
40
  "http-proxy-agent": "^7.0.2",
41
+ "https-proxy-agent": "^7.0.6",
41
42
  "latest-version": "^7.0.0",
42
43
  "lodash": "^4.17.21",
43
44
  "node-machine-id": "^1.1.12",
@@ -48,6 +49,7 @@
48
49
  "semver": "^7.6.0",
49
50
  "tmp": "^0.2.3",
50
51
  "tslib": "^2.6.2",
52
+ "undici": "^7.19.0",
51
53
  "v8-compile-cache": "^2.4.0",
52
54
  "yaml": "^2.3.4"
53
55
  },
@@ -541,9 +543,9 @@
541
543
  }
542
544
  },
543
545
  "node_modules/@forge/bundler": {
544
- "version": "7.2.0-next.5-experimental-016ed9d",
545
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.2.0-next.5-experimental-016ed9d.tgz",
546
- "integrity": "sha512-lLFWzJouQE/Gg3EUmNs1Cgc5ecp/e0wvS/aRwE3R2UDDiw/dySNAm3IDMFWnxlmiArJ+wscM90it5K7AEw9PGQ==",
546
+ "version": "7.2.0-next.5-experimental-c575574",
547
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.2.0-next.5-experimental-c575574.tgz",
548
+ "integrity": "sha512-nciJcFfWOf59czOk9f1dxpXj19TtqOUo7utc4IVk0NgU7FepUOLT7m+NmBgNlv1dKQJ5P16b4NArtB4UHX2xNw==",
547
549
  "license": "SEE LICENSE IN LICENSE.txt",
548
550
  "dependencies": {
549
551
  "@babel/core": "^7.24.0",
@@ -555,10 +557,10 @@
555
557
  "@babel/plugin-transform-react-jsx": "^7.23.4",
556
558
  "@babel/traverse": "^7.24.0",
557
559
  "@babel/types": "^7.24.0",
558
- "@forge/cli-shared": "9.4.0-next.4-experimental-016ed9d",
560
+ "@forge/cli-shared": "9.4.0-next.4-experimental-c575574",
559
561
  "@forge/i18n": "1.0.0",
560
- "@forge/lint": "6.2.0-next.5-experimental-016ed9d",
561
- "@forge/manifest": "13.3.1-next.0-experimental-016ed9d",
562
+ "@forge/lint": "6.2.0-next.5-experimental-c575574",
563
+ "@forge/manifest": "13.3.1-next.0-experimental-c575574",
562
564
  "babel-loader": "^8.3.0",
563
565
  "cheerio": "^1.2.0",
564
566
  "chokidar": "^4.0.3",
@@ -587,13 +589,13 @@
587
589
  }
588
590
  },
589
591
  "node_modules/@forge/cli-shared": {
590
- "version": "9.4.0-next.4-experimental-016ed9d",
591
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.4.0-next.4-experimental-016ed9d.tgz",
592
- "integrity": "sha512-Db32Mo3zFTe/efK+4kngPvDLPPZIUPvLdnW2V2c8YCiFYy/QTm9q5ci0h6jCdYM/2VqK5e9ld2LqPP2ooC6Csg==",
592
+ "version": "9.4.0-next.4-experimental-c575574",
593
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.4.0-next.4-experimental-c575574.tgz",
594
+ "integrity": "sha512-qqc5GKwmwLa+SVI9Ywgu/l9qPEiM1LExGSvjXEdt9zO6MCLMQcahzjAgHbfrp2kk4R6PxS/nz7xgLyz3e2N9wg==",
593
595
  "license": "SEE LICENSE IN LICENSE.txt",
594
596
  "dependencies": {
595
597
  "@forge/i18n": "1.0.0",
596
- "@forge/manifest": "13.3.1-next.0-experimental-016ed9d",
598
+ "@forge/manifest": "13.3.1-next.0-experimental-c575574",
597
599
  "@forge/util": "3.0.0",
598
600
  "@sentry/node": "7.106.0",
599
601
  "@vercel/detect-agent": "^1.2.3",
@@ -614,7 +616,7 @@
614
616
  "get-folder-size": "^5.0.0",
615
617
  "glob": "^13.0.0",
616
618
  "graphql": "^16.8.1",
617
- "graphql-request": "7.4.0",
619
+ "graphql-request": "6.1.0",
618
620
  "inquirer": "^8.2.6",
619
621
  "inquirer-autocomplete-prompt": "^2.0.1",
620
622
  "io-ts": "^2.2.22",
@@ -638,9 +640,9 @@
638
640
  }
639
641
  },
640
642
  "node_modules/@forge/csp": {
641
- "version": "6.3.0-experimental-016ed9d",
642
- "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.3.0-experimental-016ed9d.tgz",
643
- "integrity": "sha512-/gGzFctcVCr3ZM2eEyMXTBvr/1BHdmEziX14GhkWD6doD1mW1KvvmjOoboBMWcaD2g6Mk+D7CeHD/LPKZA0UtA==",
643
+ "version": "6.3.0-experimental-c575574",
644
+ "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.3.0-experimental-c575574.tgz",
645
+ "integrity": "sha512-Kqw3ibfNb821YDjFzsC+EjzgXZ3kAMfug1LsP6hkYCivVUicO8I0bwYfl/5dy5LS9MdJgvl1TMyZqjGoGqaa6w==",
644
646
  "license": "SEE LICENSE IN LICENSE.txt",
645
647
  "dependencies": {
646
648
  "content-security-policy-parser": "^0.6.0"
@@ -690,16 +692,16 @@
690
692
  }
691
693
  },
692
694
  "node_modules/@forge/lint": {
693
- "version": "6.2.0-next.5-experimental-016ed9d",
694
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.2.0-next.5-experimental-016ed9d.tgz",
695
- "integrity": "sha512-xw3o9zuGH2XtloMi+pjc97DTfoMfzhVBukqGrEkwPtxJ/4/rRzRMwR94EB7ebyEe9Vn5l+hEhzzd+mYcM7ZvJw==",
695
+ "version": "6.2.0-next.5-experimental-c575574",
696
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.2.0-next.5-experimental-c575574.tgz",
697
+ "integrity": "sha512-3+D6D071apnMLbdsosclZ98G2wWSKmVk1wYwEUAB2lJ6c8vrT8eX5XwHZOhl/9ulquq8e8AdaOGgSpqssfbCIQ==",
696
698
  "license": "SEE LICENSE IN LICENSE.txt",
697
699
  "dependencies": {
698
700
  "@atlassian/atlassian-openapi": "^1.0.6",
699
- "@forge/cli-shared": "9.4.0-next.4-experimental-016ed9d",
700
- "@forge/csp": "6.3.0-experimental-016ed9d",
701
+ "@forge/cli-shared": "9.4.0-next.4-experimental-c575574",
702
+ "@forge/csp": "6.3.0-experimental-c575574",
701
703
  "@forge/egress": "3.0.0",
702
- "@forge/manifest": "13.3.1-next.0-experimental-016ed9d",
704
+ "@forge/manifest": "13.3.1-next.0-experimental-c575574",
703
705
  "@typescript-eslint/typescript-estree": "^5.62.0",
704
706
  "archiver": "^8.0.0",
705
707
  "array.prototype.flatmap": "^1.3.3",
@@ -717,9 +719,9 @@
717
719
  }
718
720
  },
719
721
  "node_modules/@forge/manifest": {
720
- "version": "13.3.1-next.0-experimental-016ed9d",
721
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.3.1-next.0-experimental-016ed9d.tgz",
722
- "integrity": "sha512-5Z4gABIqkZIZODjak9kmwxqtWnBx6kBTkrwrB7iIgAo11RZoOoDihV5x7zsjB7Ha7GEbub8UwPIcOdUCjG1rOg==",
722
+ "version": "13.3.1-next.0-experimental-c575574",
723
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.3.1-next.0-experimental-c575574.tgz",
724
+ "integrity": "sha512-UQ/B7lctO4Ojqe02fL4sa7vJqxv+CjLVDcwPf8ttwNBptKVrXxhlMXERVAlCER2xvN/vMZ2OFDqZzeI3COlgfw==",
723
725
  "license": "SEE LICENSE IN LICENSE.txt",
724
726
  "dependencies": {
725
727
  "@forge/i18n": "1.0.0",
@@ -756,14 +758,14 @@
756
758
  }
757
759
  },
758
760
  "node_modules/@forge/tunnel": {
759
- "version": "7.1.1-next.5-experimental-016ed9d",
760
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.1.1-next.5-experimental-016ed9d.tgz",
761
- "integrity": "sha512-ulIAoZQF7+N5aQd3ntBEm9LAof7Bp2rIfDUcjaRHyJSrHL5ZxPU5TyxsIokzMRfso+O+KoEFrl99coYhXfzVZg==",
761
+ "version": "7.1.1-next.5-experimental-c575574",
762
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.1.1-next.5-experimental-c575574.tgz",
763
+ "integrity": "sha512-f/MkFrqGElW0oo/fR0VinSwaAp90pdE+BWZ8Txno9rRQXlfxUEe8UYdVwetf6SVBuWIMtsLKkiOPHGLXyptnsw==",
762
764
  "license": "SEE LICENSE IN LICENSE.txt",
763
765
  "dependencies": {
764
- "@forge/bundler": "7.2.0-next.5-experimental-016ed9d",
765
- "@forge/cli-shared": "9.4.0-next.4-experimental-016ed9d",
766
- "@forge/csp": "6.3.0-experimental-016ed9d",
766
+ "@forge/bundler": "7.2.0-next.5-experimental-c575574",
767
+ "@forge/cli-shared": "9.4.0-next.4-experimental-c575574",
768
+ "@forge/csp": "6.3.0-experimental-c575574",
767
769
  "@forge/runtime": "7.0.0",
768
770
  "@forge/util": "^3.0.0",
769
771
  "cheerio": "^1.2.0",
@@ -3398,6 +3400,14 @@
3398
3400
  "node": ">=18"
3399
3401
  }
3400
3402
  },
3403
+ "node_modules/cross-fetch": {
3404
+ "version": "3.2.0",
3405
+ "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.2.0.tgz",
3406
+ "integrity": "sha1-NOkZL1O8dX1mFDBNnl5vtO23guM= sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==",
3407
+ "dependencies": {
3408
+ "node-fetch": "^2.7.0"
3409
+ }
3410
+ },
3401
3411
  "node_modules/cross-spawn": {
3402
3412
  "version": "7.0.6",
3403
3413
  "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -4984,11 +4994,12 @@
4984
4994
  }
4985
4995
  },
4986
4996
  "node_modules/graphql-request": {
4987
- "version": "7.4.0",
4988
- "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-7.4.0.tgz",
4989
- "integrity": "sha1-l6H8hx559oLYFpY0Rqxrf5nJY/k= sha512-xfr+zFb/QYbs4l4ty0dltqiXIp07U6sl+tOKAb0t50/EnQek6CVVBLjETXi+FghElytvgaAWtIOt3EV7zLzIAQ==",
4997
+ "version": "6.1.0",
4998
+ "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-6.1.0.tgz",
4999
+ "integrity": "sha1-9OshB5Z688elkH6zExxnHqyJvk8= sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==",
4990
5000
  "dependencies": {
4991
- "@graphql-typed-document-node/core": "^3.2.0"
5001
+ "@graphql-typed-document-node/core": "^3.2.0",
5002
+ "cross-fetch": "^3.1.5"
4992
5003
  },
4993
5004
  "peerDependencies": {
4994
5005
  "graphql": "14 - 16"
@@ -5357,6 +5368,18 @@
5357
5368
  "url": "https://github.com/sponsors/sindresorhus"
5358
5369
  }
5359
5370
  },
5371
+ "node_modules/https-proxy-agent": {
5372
+ "version": "7.0.6",
5373
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
5374
+ "integrity": "sha1-2o3+rH2hMLBcK6S1nJts1mYRprk= sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
5375
+ "dependencies": {
5376
+ "agent-base": "^7.1.2",
5377
+ "debug": "4"
5378
+ },
5379
+ "engines": {
5380
+ "node": ">= 14"
5381
+ }
5382
+ },
5360
5383
  "node_modules/hyperdyperid": {
5361
5384
  "version": "1.2.0",
5362
5385
  "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
@@ -6457,6 +6480,47 @@
6457
6480
  "node": ">= 8.0.0"
6458
6481
  }
6459
6482
  },
6483
+ "node_modules/node-fetch": {
6484
+ "version": "2.7.0",
6485
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
6486
+ "integrity": "sha1-0PD6bj4twdJ+/NitmdVQvalNGH0= sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
6487
+ "dependencies": {
6488
+ "whatwg-url": "^5.0.0"
6489
+ },
6490
+ "engines": {
6491
+ "node": "4.x || >=6.0.0"
6492
+ },
6493
+ "peerDependencies": {
6494
+ "encoding": "^0.1.0"
6495
+ },
6496
+ "peerDependenciesMeta": {
6497
+ "encoding": {
6498
+ "optional": true
6499
+ }
6500
+ }
6501
+ },
6502
+ "node_modules/node-fetch/node_modules/tr46": {
6503
+ "version": "0.0.3",
6504
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
6505
+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
6506
+ "license": "MIT"
6507
+ },
6508
+ "node_modules/node-fetch/node_modules/webidl-conversions": {
6509
+ "version": "3.0.1",
6510
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
6511
+ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
6512
+ "license": "BSD-2-Clause"
6513
+ },
6514
+ "node_modules/node-fetch/node_modules/whatwg-url": {
6515
+ "version": "5.0.0",
6516
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
6517
+ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
6518
+ "license": "MIT",
6519
+ "dependencies": {
6520
+ "tr46": "~0.0.3",
6521
+ "webidl-conversions": "^3.0.0"
6522
+ }
6523
+ },
6460
6524
  "node_modules/node-machine-id": {
6461
6525
  "version": "1.1.12",
6462
6526
  "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
@@ -1,7 +1,7 @@
1
1
  import { AppConfigProvider } from '@forge/cli-shared';
2
2
  import { CachedConfigService } from '../../service/cached-config-service';
3
3
  import { SettingsView } from '../view/settings-view';
4
- export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment", "seasonal-effects"];
4
+ export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment", "seasonal-effects", "proxy"];
5
5
  export declare const DELETABLE_SETTINGS: readonly ["proxy"];
6
6
  export declare class SettingsController {
7
7
  private readonly settingsView;
@@ -12,6 +12,8 @@ export declare class SettingsController {
12
12
  private parseBoolean;
13
13
  private isAllowedSetting;
14
14
  private isSettingDeleteAllowed;
15
+ private validateProxyUrl;
16
+ private redactUrlCredentials;
15
17
  showSettings(json?: boolean): Promise<void>;
16
18
  deleteSetting(preference: string): Promise<void>;
17
19
  setSetting(preference: string, value: string): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAMlB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,yEAA0E,CAAC;AAGxG,eAAO,MAAM,kBAAkB,oBAAqB,CAAC;AAYrD,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB;IAGlD,OAAO,CAAC,YAAY,CA+ClB;IAEF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,sBAAsB;IAIjB,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAU3B,aAAa,CAAC,UAAU,EAAE,MAAM;IAehC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAiB1D"}
1
+ {"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAMlB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,kFAAmF,CAAC;AAGjH,eAAO,MAAM,kBAAkB,oBAAqB,CAAC;AAYrD,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB;IAGlD,OAAO,CAAC,YAAY,CA4DlB;IAEF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,oBAAoB;IAaf,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAU3B,aAAa,CAAC,UAAU,EAAE,MAAM;IAehC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAiB1D"}
@@ -4,7 +4,7 @@ exports.SettingsController = exports.DELETABLE_SETTINGS = exports.ALLOWED_SETTIN
4
4
  const cli_shared_1 = require("@forge/cli-shared");
5
5
  const manifest_1 = require("@forge/manifest");
6
6
  const environment_1 = require("../environment");
7
- exports.ALLOWED_SETTINGS = ['usage-analytics', 'default-environment', 'seasonal-effects'];
7
+ exports.ALLOWED_SETTINGS = ['usage-analytics', 'default-environment', 'seasonal-effects', 'proxy'];
8
8
  exports.DELETABLE_SETTINGS = ['proxy'];
9
9
  class SettingsController {
10
10
  settingsView;
@@ -63,6 +63,19 @@ class SettingsController {
63
63
  const parsedValue = this.parseBoolean(value);
64
64
  this.cachedConfigService.setCustomEffects(parsedValue);
65
65
  }
66
+ },
67
+ proxy: {
68
+ description: cli_shared_1.Text.settings.proxy.description,
69
+ get: async () => {
70
+ const proxy = this.cachedConfigService.getProxy();
71
+ return proxy ? this.redactUrlCredentials(proxy) : proxy;
72
+ },
73
+ set: async (value) => {
74
+ this.validateProxyUrl(value);
75
+ this.cachedConfigService.setProxy(value);
76
+ },
77
+ getDisplayValue: (value) => this.redactUrlCredentials(value),
78
+ delete: async () => this.cachedConfigService.deleteProxy()
66
79
  }
67
80
  };
68
81
  parseBoolean(value) {
@@ -81,6 +94,30 @@ class SettingsController {
81
94
  isSettingDeleteAllowed(preference) {
82
95
  return exports.DELETABLE_SETTINGS.includes(preference);
83
96
  }
97
+ validateProxyUrl(value) {
98
+ try {
99
+ const proxyUrl = new URL(value);
100
+ if (proxyUrl.protocol === 'http:' || proxyUrl.protocol === 'https:') {
101
+ return;
102
+ }
103
+ }
104
+ catch (e) {
105
+ }
106
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.proxy.invalidUrl);
107
+ }
108
+ redactUrlCredentials(value) {
109
+ try {
110
+ const url = new URL(value);
111
+ if (url.username || url.password) {
112
+ url.username = '***';
113
+ url.password = url.password ? '***' : '';
114
+ }
115
+ return url.toString();
116
+ }
117
+ catch (e) {
118
+ return value;
119
+ }
120
+ }
84
121
  async showSettings(json) {
85
122
  const settings = [];
86
123
  for (const settingName of exports.ALLOWED_SETTINGS) {
@@ -1 +1 @@
1
- {"version":3,"file":"settings-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":";;;AAAA,kDAO2B;AAC3B,8CAAyC;AAEzC,gDAAgF;AAInE,QAAA,gBAAgB,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,EAAE,kBAAkB,CAAU,CAAC;AAG3F,QAAA,kBAAkB,GAAG,CAAC,OAAO,CAAU,CAAC;AAYrD,MAAa,kBAAkB;IAEV;IACA;IACA;IAHnB,YACmB,YAA0B,EAC1B,mBAAwC,EACxC,YAA+B;QAF/B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAmB;IAC/C,CAAC;IAEI,YAAY,GAAwC;QAC1D,iBAAiB,EAAE;YACjB,WAAW,EAAE,iBAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW;YACrD,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,EAAE;YACnE,GAAG,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;gBAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC7C,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YAChE,CAAC;SACF;QACD,qBAAqB,EAAE;YACrB,WAAW,EAAE,iBAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,WAAW;YACzD,GAAG,EAAE,KAAK,IAAI,EAAE;gBACd,IAAI,CAAC;oBACH,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChD,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;oBAC1E,OAAO,WAAW,CAAC,CAAC,CAAC,IAAA,gCAAmB,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;gBACtE,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,YAAY,iCAAoB,EAAE,CAAC;wBACtC,OAAO;oBACT,CAAC;oBACD,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;YACD,GAAG,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;gBAC3B,IAAA,oCAAsB,EAAC,KAAK,CAAC,CAAC;gBAC9B,MAAM,WAAW,GAAG,IAAA,oCAAsB,EAAC,KAAK,CAAC,CAAC;gBAClD,IAAI,CAAC;oBACH,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChD,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBACrE,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,YAAY,iCAAoB,EAAE,CAAC;wBACtC,MAAM,IAAI,4BAAe,CAAC,iBAAM,CAAC,eAAe,EAAE,CAAC,CAAC;oBACtD,CAAC;oBACD,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;YACD,eAAe,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,iBAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,+BAAkB,CAAC,WAAW,CAAC;YACtG,cAAc,EAAE,iBAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI;SACtD;QACD,kBAAkB,EAAE;YAClB,WAAW,EAAE,iBAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW;YACpD,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;YAC5D,GAAG,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;gBAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC7C,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACzD,CAAC;SACF;KACF,CAAC;IAEM,YAAY,CAAC,KAAc;QACjC,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC;YACd,KAAK,OAAO;gBACV,OAAO,KAAK,CAAC;YACf;gBACE,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,UAAkB;QACzC,OAAO,wBAAgB,CAAC,QAAQ,CAAC,UAAiB,CAAC,CAAC;IACtD,CAAC;IAEO,sBAAsB,CAAC,UAAkB;QAC/C,OAAO,0BAAkB,CAAC,QAAQ,CAAC,UAAiB,CAAC,CAAC;IACxD,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAc;QACtC,MAAM,QAAQ,GAAqD,EAAE,CAAC;QACtE,KAAK,MAAM,WAAW,IAAI,wBAAgB,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC/C,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAAkB;QAC3C,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,0BAAkB,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE9C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,0BAAkB,CAAC,CAAC,CAAC;QACrF,CAAC;QACD,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QAEvB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,UAAkB,EAAE,KAAa;QACvD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAgB,CAAC,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE9C,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEzB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEtF,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC;CACF;AArHD,gDAqHC"}
1
+ {"version":3,"file":"settings-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,4 @@
1
- import { HttpProxyAgent } from 'http-proxy-agent';
2
1
  import { Dependencies } from './dependency-injection';
3
- export declare function setupProxy(): HttpProxyAgent<string> | undefined;
4
2
  export declare function registerCommands(deps: Dependencies): Promise<void>;
5
3
  export declare const main: () => Promise<void>;
6
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAmEvE,wBAAgB,UAAU,IAAI,cAAc,CAAC,MAAM,CAAC,GAAG,SAAS,CAc/D;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBA6BxD;AAQD,eAAO,MAAM,IAAI,QAAa,OAAO,CAAC,IAAI,CAgBzC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAoEvE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBA6BxD;AAQD,eAAO,MAAM,IAAI,QAAa,OAAO,CAAC,IAAI,CAkBzC,CAAC"}
@@ -1,15 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.main = void 0;
4
- exports.setupProxy = setupProxy;
5
4
  exports.registerCommands = registerCommands;
6
- const tslib_1 = require("tslib");
7
5
  const cli_shared_1 = require("@forge/cli-shared");
8
- const http_proxy_agent_1 = require("http-proxy-agent");
9
- const http_1 = tslib_1.__importDefault(require("http"));
10
- const https_1 = tslib_1.__importDefault(require("https"));
11
6
  const dependency_injection_1 = require("./dependency-injection");
12
7
  const version_info_1 = require("./version-info");
8
+ const proxy_1 = require("./proxy");
13
9
  const register_app_commands_1 = require("./register-app-commands");
14
10
  const register_authentication_command_1 = require("./register-authentication-command");
15
11
  const register_autocomplete_commands_1 = require("./register-autocomplete-commands");
@@ -70,22 +66,6 @@ function applyCommandHelpGroups(deps) {
70
66
  }
71
67
  deps.cmd.sortCommandsByGroup(Object.keys(COMMAND_HELP_GROUPS));
72
68
  }
73
- function setupProxy() {
74
- const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
75
- const proxyUrl = cachedConf.get('proxy');
76
- if (proxyUrl && proxyUrl.trim()) {
77
- let agent;
78
- if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
79
- agent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl, { rejectUnauthorized: false });
80
- }
81
- else {
82
- agent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl);
83
- }
84
- http_1.default.globalAgent = agent;
85
- https_1.default.globalAgent = agent;
86
- return agent;
87
- }
88
- }
89
69
  async function registerCommands(deps) {
90
70
  (0, register_autocomplete_commands_1.registerCommands)(deps);
91
71
  (0, register_authentication_command_1.registerCommands)(deps);
@@ -122,6 +102,7 @@ const registerEvents = ({ ui }) => {
122
102
  });
123
103
  };
124
104
  const main = async () => {
105
+ (0, proxy_1.setupProxy)();
125
106
  const cliDetails = (0, version_info_1.getCLIDetails)();
126
107
  const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
127
108
  registerEvents(deps);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ import { HttpProxyAgent } from 'http-proxy-agent';
2
+ import { HttpsProxyAgent } from 'https-proxy-agent';
3
+ import { ProxyAgent } from 'undici';
4
+ export interface ProxyAgents {
5
+ httpAgent: HttpProxyAgent<string>;
6
+ httpsAgent: HttpsProxyAgent<string>;
7
+ undiciProxyAgent: ProxyAgent;
8
+ proxy: URL;
9
+ }
10
+ export declare function setupProxy(): ProxyAgents | undefined;
11
+ //# sourceMappingURL=proxy.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/command-line/proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAuB,MAAM,QAAQ,CAAC;AAEzD,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IACpC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,KAAK,EAAE,GAAG,CAAC;CACZ;AAaD,wBAAgB,UAAU,IAAI,WAAW,GAAG,SAAS,CA6BpD"}
@@ -0,0 +1,53 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.setupProxy = setupProxy;
4
+ const tslib_1 = require("tslib");
5
+ const cli_shared_1 = require("@forge/cli-shared");
6
+ const http_proxy_agent_1 = require("http-proxy-agent");
7
+ const https_proxy_agent_1 = require("https-proxy-agent");
8
+ const http_1 = tslib_1.__importDefault(require("http"));
9
+ const https_1 = tslib_1.__importDefault(require("https"));
10
+ const undici_1 = require("undici");
11
+ function parseProxyUrl(proxyUrl) {
12
+ try {
13
+ const parsedUrl = new URL(proxyUrl);
14
+ if (parsedUrl.protocol === 'http:' || parsedUrl.protocol === 'https:') {
15
+ return parsedUrl;
16
+ }
17
+ }
18
+ catch (e) {
19
+ return undefined;
20
+ }
21
+ }
22
+ function setupProxy() {
23
+ const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
24
+ const proxyUrl = cachedConf.get('proxy');
25
+ if (proxyUrl && proxyUrl.trim()) {
26
+ const proxy = parseProxyUrl(proxyUrl);
27
+ if (!proxy) {
28
+ return undefined;
29
+ }
30
+ let httpAgent;
31
+ let httpsAgent;
32
+ let undiciProxyAgent;
33
+ if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
34
+ httpAgent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl, { rejectUnauthorized: false });
35
+ httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, { rejectUnauthorized: false });
36
+ undiciProxyAgent = new undici_1.ProxyAgent({
37
+ uri: proxyUrl,
38
+ requestTls: { rejectUnauthorized: false },
39
+ proxyTls: { rejectUnauthorized: false }
40
+ });
41
+ }
42
+ else {
43
+ httpAgent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl);
44
+ httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl);
45
+ undiciProxyAgent = new undici_1.ProxyAgent(proxyUrl);
46
+ }
47
+ http_1.default.globalAgent = httpAgent;
48
+ https_1.default.globalAgent = httpsAgent;
49
+ (0, undici_1.setGlobalDispatcher)(undiciProxyAgent);
50
+ return { httpAgent, httpsAgent, undiciProxyAgent, proxy };
51
+ }
52
+ }
53
+ //# sourceMappingURL=proxy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/command-line/proxy.ts"],"names":[],"mappings":";;AAyBA,gCA6BC;;AAtDD,kDAAoE;AACpE,uDAAkD;AAClD,yDAAoD;AACpD,wDAAwB;AACxB,0DAA0B;AAC1B,mCAAyD;AASzD,SAAS,aAAa,CAAC,QAAgB;IACrC,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,SAAS,CAAC,QAAQ,KAAK,OAAO,IAAI,SAAS,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACtE,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAgB,UAAU;IACxB,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAS,OAAO,CAAC,CAAC;IACjD,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,SAAS,CAAC;QACd,IAAI,UAAU,CAAC;QACf,IAAI,gBAAgB,CAAC;QACrB,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,GAAG,EAAE,CAAC;YACrD,SAAS,GAAG,IAAI,iCAAc,CAAC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC;YACxE,UAAU,GAAG,IAAI,mCAAe,CAAC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1E,gBAAgB,GAAG,IAAI,mBAAU,CAAC;gBAChC,GAAG,EAAE,QAAQ;gBACb,UAAU,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE;gBACzC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE;aACxC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,IAAI,iCAAc,CAAC,QAAQ,CAAC,CAAC;YACzC,UAAU,GAAG,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAC;YAC3C,gBAAgB,GAAG,IAAI,mBAAU,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC;QACD,cAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,eAAK,CAAC,WAAW,GAAG,UAAU,CAAC;QAC/B,IAAA,4BAAmB,EAAC,gBAAgB,CAAC,CAAC;QACtC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC5D,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqCtD,eAAO,MAAM,qBAAqB,GAAI,8CAA8C,YAAY,SAU/F,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,kBAAkB,YAAY,SAK9D,CAAC"}
1
+ {"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAkCtD,eAAO,MAAM,qBAAqB,GAAI,8CAA8C,YAAY,SAU/F,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,kBAAkB,YAAY,SAM9D,CAAC"}
@@ -46,6 +46,7 @@ const registerCommands = ({ cmd, ...deps }) => {
46
46
  const preferences = cmd.command(COMMAND_NAME).requireNoAuthentication().description(cli_shared_1.Text.settings.description);
47
47
  registerSettingsList({ cmd: preferences, ...deps });
48
48
  registerSettingsSet({ cmd: preferences, ...deps });
49
+ (0, exports.registerDeleteSetting)({ cmd: preferences, ...deps });
49
50
  };
50
51
  exports.registerCommands = registerCommands;
51
52
  //# sourceMappingURL=register-settings-commands.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"register-settings-commands.js","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAEzC,0EAAwF;AAExF,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACjC,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAE9C,MAAM,oBAAoB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAC1F,GAAG;SACA,OAAO,CAAC,iBAAiB,CAAC;SAC1B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;SAC3C,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,UAAU,EAAE;SACZ,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QACzB,MAAM,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IACzF,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,sCAAgB,CAAC,CAAC;SAC5D,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;QAClC,MAAM,kBAAkB,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAKK,MAAM,qBAAqB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAClG,GAAG;SACA,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,wCAAkB,CAAC,CAAC;SACjE,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QAC3B,MAAM,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC;AAEK,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAgB,EAAE,EAAE;IACjE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,uBAAuB,EAAE,CAAC,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE/G,oBAAoB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IACpD,mBAAmB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B"}
1
+ {"version":3,"file":"register-settings-commands.js","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAEzC,0EAAwF;AAExF,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACjC,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAE9C,MAAM,oBAAoB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAC1F,GAAG;SACA,OAAO,CAAC,iBAAiB,CAAC;SAC1B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;SAC3C,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,UAAU,EAAE;SACZ,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QACzB,MAAM,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IACzF,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,sCAAgB,CAAC,CAAC;SAC5D,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;QAClC,MAAM,kBAAkB,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAClG,GAAG;SACA,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,wCAAkB,CAAC,CAAC;SACjE,uBAAuB,EAAE;SACzB,yBAAyB,EAAE;SAC3B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QAC3B,MAAM,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC;AAEK,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAgB,EAAE,EAAE;IACjE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,uBAAuB,EAAE,CAAC,WAAW,CAAC,iBAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE/G,oBAAoB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IACpD,mBAAmB,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IACnD,IAAA,6BAAqB,EAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "13.4.0-next.5-experimental-016ed9d",
3
+ "version": "13.4.0-next.5-experimental-c575574",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -21,14 +21,14 @@
21
21
  "generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
22
22
  },
23
23
  "dependencies": {
24
- "@forge/bundler": "7.2.0-next.5-experimental-016ed9d",
25
- "@forge/cli-shared": "9.4.0-next.4-experimental-016ed9d",
24
+ "@forge/bundler": "7.2.0-next.5-experimental-c575574",
25
+ "@forge/cli-shared": "9.4.0-next.4-experimental-c575574",
26
26
  "@forge/egress": "3.0.0",
27
- "@forge/lint": "6.2.0-next.5-experimental-016ed9d",
28
- "@forge/manifest": "13.3.1-next.0-experimental-016ed9d",
27
+ "@forge/lint": "6.2.0-next.5-experimental-c575574",
28
+ "@forge/manifest": "13.3.1-next.0-experimental-c575574",
29
29
  "@forge/i18n": "1.0.0",
30
30
  "@forge/runtime": "7.0.0",
31
- "@forge/tunnel": "7.1.1-next.5-experimental-016ed9d",
31
+ "@forge/tunnel": "7.1.1-next.5-experimental-c575574",
32
32
  "@forge/util": "3.0.0",
33
33
  "@sentry/node": "7.106.0",
34
34
  "ajv": "^8.18.0",
@@ -49,6 +49,7 @@
49
49
  "fs-extra": "^11.2.0",
50
50
  "hidefile": "^3.0.0",
51
51
  "http-proxy-agent": "^7.0.2",
52
+ "https-proxy-agent": "^7.0.6",
52
53
  "latest-version": "^7.0.0",
53
54
  "lodash": "^4.17.21",
54
55
  "node-machine-id": "^1.1.12",
@@ -59,6 +60,7 @@
59
60
  "semver": "^7.6.0",
60
61
  "tmp": "^0.2.3",
61
62
  "tslib": "^2.6.2",
63
+ "undici": "^7.19.0",
62
64
  "v8-compile-cache": "^2.4.0",
63
65
  "yaml": "^2.3.4"
64
66
  },
@@ -104,4 +106,4 @@
104
106
  "optional": true
105
107
  }
106
108
  }
107
- }
109
+ }