@forge/cli 13.3.0-next.12-experimental-4b981ef → 13.3.0-next.12-experimental-4b981ef-experimental-5b8eb3c

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,11 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 13.3.0-next.12-experimental-4b981ef-experimental-5b8eb3c
4
+
5
+ ### Patch Changes
6
+
7
+ - 5b8eb3c: Add native Forge CLI proxy support for Node and Undici network clients.
8
+
3
9
  ## 13.3.0-next.12-experimental-4b981ef
4
10
 
5
11
  ### Minor Changes
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "13.3.0-next.12-experimental-4b981ef",
3
+ "version": "13.3.0-next.12-experimental-4b981ef-experimental-5b8eb3c",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "13.3.0-next.12-experimental-4b981ef",
9
+ "version": "13.3.0-next.12-experimental-4b981ef-experimental-5b8eb3c",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
@@ -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
  },
53
55
  "bin": {
@@ -5369,6 +5371,18 @@
5369
5371
  "url": "https://github.com/sponsors/sindresorhus"
5370
5372
  }
5371
5373
  },
5374
+ "node_modules/https-proxy-agent": {
5375
+ "version": "7.0.6",
5376
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
5377
+ "integrity": "sha1-2o3+rH2hMLBcK6S1nJts1mYRprk= sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
5378
+ "dependencies": {
5379
+ "agent-base": "^7.1.2",
5380
+ "debug": "4"
5381
+ },
5382
+ "engines": {
5383
+ "node": ">= 14"
5384
+ }
5385
+ },
5372
5386
  "node_modules/hyperdyperid": {
5373
5387
  "version": "1.2.0",
5374
5388
  "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.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;AAarD,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,8 +4,9 @@ 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
+ const INVALID_PROXY_URL = 'Invalid proxy URL specified. Valid proxy URLs must start with http:// or https://';
9
10
  class SettingsController {
10
11
  settingsView;
11
12
  cachedConfigService;
@@ -63,6 +64,19 @@ class SettingsController {
63
64
  const parsedValue = this.parseBoolean(value);
64
65
  this.cachedConfigService.setCustomEffects(parsedValue);
65
66
  }
67
+ },
68
+ proxy: {
69
+ description: cli_shared_1.Text.settings.proxy.description,
70
+ get: async () => {
71
+ const proxy = this.cachedConfigService.getProxy();
72
+ return proxy ? this.redactUrlCredentials(proxy) : proxy;
73
+ },
74
+ set: async (value) => {
75
+ this.validateProxyUrl(value);
76
+ this.cachedConfigService.setProxy(value);
77
+ },
78
+ getDisplayValue: (value) => this.redactUrlCredentials(value),
79
+ delete: async () => this.cachedConfigService.deleteProxy()
66
80
  }
67
81
  };
68
82
  parseBoolean(value) {
@@ -81,6 +95,30 @@ class SettingsController {
81
95
  isSettingDeleteAllowed(preference) {
82
96
  return exports.DELETABLE_SETTINGS.includes(preference);
83
97
  }
98
+ validateProxyUrl(value) {
99
+ try {
100
+ const proxyUrl = new URL(value);
101
+ if (proxyUrl.protocol === 'http:' || proxyUrl.protocol === 'https:') {
102
+ return;
103
+ }
104
+ }
105
+ catch (e) {
106
+ }
107
+ throw new cli_shared_1.ValidationError(INVALID_PROXY_URL);
108
+ }
109
+ redactUrlCredentials(value) {
110
+ try {
111
+ const url = new URL(value);
112
+ if (url.username || url.password) {
113
+ url.username = '***';
114
+ url.password = url.password ? '***' : '';
115
+ }
116
+ return url.toString();
117
+ }
118
+ catch (e) {
119
+ return value;
120
+ }
121
+ }
84
122
  async showSettings(json) {
85
123
  const settings = [];
86
124
  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":"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"}
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;AA8DvE,wBAAgB,UAAU,IAAI,cAAc,CAAC,MAAM,CAAC,GAAG,SAAS,CAc/D;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBA2BxD;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;AA+DvE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBA2BxD;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");
@@ -65,22 +61,6 @@ function applyCommandHelpGroups(deps) {
65
61
  }
66
62
  deps.cmd.sortCommandsByGroup(Object.keys(COMMAND_HELP_GROUPS));
67
63
  }
68
- function setupProxy() {
69
- const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
70
- const proxyUrl = cachedConf.get('proxy');
71
- if (proxyUrl && proxyUrl.trim()) {
72
- let agent;
73
- if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
74
- agent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl, { rejectUnauthorized: false });
75
- }
76
- else {
77
- agent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl);
78
- }
79
- http_1.default.globalAgent = agent;
80
- https_1.default.globalAgent = agent;
81
- return agent;
82
- }
83
- }
84
64
  async function registerCommands(deps) {
85
65
  (0, register_autocomplete_commands_1.registerCommands)(deps);
86
66
  (0, register_authentication_command_1.registerCommands)(deps);
@@ -115,6 +95,7 @@ const registerEvents = ({ ui }) => {
115
95
  });
116
96
  };
117
97
  const main = async () => {
98
+ (0, proxy_1.setupProxy)();
118
99
  const cliDetails = (0, version_info_1.getCLIDetails)();
119
100
  const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
120
101
  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;AAED,wBAAgB,UAAU,IAAI,WAAW,GAAG,SAAS,CAyBpD"}
@@ -0,0 +1,38 @@
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 setupProxy() {
12
+ const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
13
+ const proxyUrl = cachedConf.get('proxy');
14
+ if (proxyUrl && proxyUrl.trim()) {
15
+ let httpAgent;
16
+ let httpsAgent;
17
+ let undiciProxyAgent;
18
+ if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
19
+ httpAgent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl, { rejectUnauthorized: false });
20
+ httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, { rejectUnauthorized: false });
21
+ undiciProxyAgent = new undici_1.ProxyAgent({
22
+ uri: proxyUrl,
23
+ requestTls: { rejectUnauthorized: false },
24
+ proxyTls: { rejectUnauthorized: false }
25
+ });
26
+ }
27
+ else {
28
+ httpAgent = new http_proxy_agent_1.HttpProxyAgent(proxyUrl);
29
+ httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl);
30
+ undiciProxyAgent = new undici_1.ProxyAgent(proxyUrl);
31
+ }
32
+ http_1.default.globalAgent = httpAgent;
33
+ https_1.default.globalAgent = httpsAgent;
34
+ (0, undici_1.setGlobalDispatcher)(undiciProxyAgent);
35
+ return { httpAgent, httpsAgent, undiciProxyAgent, proxy: new URL(proxyUrl) };
36
+ }
37
+ }
38
+ //# sourceMappingURL=proxy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/command-line/proxy.ts"],"names":[],"mappings":";;AAcA,gCAyBC;;AAvCD,kDAAoE;AACpE,uDAAkD;AAClD,yDAAoD;AACpD,wDAAwB;AACxB,0DAA0B;AAC1B,mCAAyD;AASzD,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,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,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC/E,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.3.0-next.12-experimental-4b981ef",
3
+ "version": "13.3.0-next.12-experimental-4b981ef-experimental-5b8eb3c",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -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
  },
64
66
  "devDependencies": {