diff --git a/package-lock.json b/package-lock.json index 9000ceb3..aaef13b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "@xterm/headless": "^6.1.0-beta.213", "@xterm/xterm": "^6.1.0-beta.213", "chrome-remote-interface": "^0.34.0", - "http-proxy-agent": "^7.0.2", + "http-proxy-agent": "^9.0.0", "https-proxy-agent": "^7.0.6", "jschardet": "3.1.4", "katex": "^0.16.47", @@ -3620,6 +3620,20 @@ "node": ">=20.0.0" } }, + "node_modules/@typespec/ts-http-runtime/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/@vscode/codicons": { "version": "0.0.46-12", "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.46-12.tgz", @@ -3919,6 +3933,19 @@ "@vscode/windows-ca-certs": "^0.3.1" } }, + "node_modules/@vscode/proxy-agent/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/@vscode/ripgrep": { "version": "1.18.0", "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.18.0.tgz", @@ -4295,6 +4322,20 @@ "node": ">=16" } }, + "node_modules/@vscode/test-electron/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/@vscode/test-web": { "version": "0.0.76", "resolved": "https://registry.npmjs.org/@vscode/test-web/-/test-web-0.0.76.tgz", @@ -4340,6 +4381,20 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/@vscode/test-web/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/@vscode/test-web/node_modules/playwright": { "version": "1.60.0", "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.60.0.tgz", @@ -12302,16 +12357,25 @@ } }, "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-9.0.0.tgz", + "integrity": "sha512-FcF8VhXYLQcxWCnt/cCpT2apKsRDUGeVEeMqGu4HSTu29U8Yw0TLOjdYIlDsYk3IkUh+taX4IDWpPcCqKDhCjA==", "license": "MIT", "dependencies": { - "agent-base": "^7.1.0", + "agent-base": "9.0.0", "debug": "^4.3.4" }, "engines": { - "node": ">= 14" + "node": ">= 20" + } + }, + "node_modules/http-proxy-agent/node_modules/agent-base": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-9.0.0.tgz", + "integrity": "sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA==", + "license": "MIT", + "engines": { + "node": ">= 20" } }, "node_modules/http2-wrapper": { diff --git a/package.json b/package.json index 7d814c33..a214ab06 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "@xterm/headless": "^6.1.0-beta.213", "@xterm/xterm": "^6.1.0-beta.213", "chrome-remote-interface": "^0.34.0", - "http-proxy-agent": "^7.0.2", + "http-proxy-agent": "^9.0.0", "https-proxy-agent": "^7.0.6", "jschardet": "3.1.4", "katex": "^0.16.47", diff --git a/remote/package-lock.json b/remote/package-lock.json index 7d9d5848..8b7500d9 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -37,7 +37,7 @@ "@xterm/headless": "^6.1.0-beta.213", "@xterm/xterm": "^6.1.0-beta.213", "cookie": "^0.7.0", - "http-proxy-agent": "^7.0.2", + "http-proxy-agent": "^9.0.0", "https-proxy-agent": "^7.0.6", "jschardet": "3.1.4", "katex": "^0.16.47", @@ -647,6 +647,19 @@ "@vscode/windows-ca-certs": "^0.3.1" } }, + "node_modules/@vscode/proxy-agent/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/@vscode/ripgrep-universal": { "version": "1.18.0", "resolved": "https://registry.npmjs.org/@vscode/ripgrep-universal/-/ripgrep-universal-1.18.0.tgz", @@ -1083,16 +1096,25 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-9.0.0.tgz", + "integrity": "sha512-FcF8VhXYLQcxWCnt/cCpT2apKsRDUGeVEeMqGu4HSTu29U8Yw0TLOjdYIlDsYk3IkUh+taX4IDWpPcCqKDhCjA==", "license": "MIT", "dependencies": { - "agent-base": "^7.1.0", + "agent-base": "9.0.0", "debug": "^4.3.4" }, "engines": { - "node": ">= 14" + "node": ">= 20" + } + }, + "node_modules/http-proxy-agent/node_modules/agent-base": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-9.0.0.tgz", + "integrity": "sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA==", + "license": "MIT", + "engines": { + "node": ">= 20" } }, "node_modules/https-proxy-agent": { diff --git a/remote/package.json b/remote/package.json index a7aa0208..5ae2b403 100644 --- a/remote/package.json +++ b/remote/package.json @@ -32,7 +32,7 @@ "@xterm/headless": "^6.1.0-beta.213", "@xterm/xterm": "^6.1.0-beta.213", "cookie": "^0.7.0", - "http-proxy-agent": "^7.0.2", + "http-proxy-agent": "^9.0.0", "https-proxy-agent": "^7.0.6", "jschardet": "3.1.4", "katex": "^0.16.47", diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts index 9b11a712..07706bd7 100644 --- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts +++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts @@ -102,7 +102,7 @@ flakySuite('Native Modules (all platforms)', () => { }); test('http-proxy-agent', async () => { - const { default: mod } = await import('http-proxy-agent'); + const mod = await import('http-proxy-agent'); assert.ok(typeof mod.HttpProxyAgent === 'function', testErrorMessage('http-proxy-agent')); }); diff --git a/src/vs/platform/request/node/proxy.ts b/src/vs/platform/request/node/proxy.ts index a87fb31a..29b6497f 100644 --- a/src/vs/platform/request/node/proxy.ts +++ b/src/vs/platform/request/node/proxy.ts @@ -45,7 +45,7 @@ export async function getProxyAgent(rawRequestURL: string, env: typeof process.e }; if (requestURL.protocol === 'http:') { - const { default: mod } = await import('http-proxy-agent'); + const mod = await import('http-proxy-agent'); return new mod.HttpProxyAgent(proxyURL, opts); } else { const { default: mod } = await import('https-proxy-agent');