diff --git a/packages/amplify-category-notifications/package.json b/packages/amplify-category-notifications/package.json index 6bb6a2d79a7..1351bcbbaa9 100644 --- a/packages/amplify-category-notifications/package.json +++ b/packages/amplify-category-notifications/package.json @@ -36,7 +36,7 @@ "lodash": "^4.17.21", "ora": "^4.0.3", "promise-sequential": "^1.1.1", - "proxy-agent": "^5.0.0" + "proxy-agent": "^6.3.0" }, "jest": { "testEnvironmentOptions": { diff --git a/packages/amplify-category-notifications/src/pinpoint-helper.ts b/packages/amplify-category-notifications/src/pinpoint-helper.ts index 22fed7eaee4..18f8d90c70d 100644 --- a/packages/amplify-category-notifications/src/pinpoint-helper.ts +++ b/packages/amplify-category-notifications/src/pinpoint-helper.ts @@ -33,7 +33,7 @@ import { resolveRegion, loadConfigurationForEnv, } from '@aws-amplify/amplify-provider-awscloudformation'; -import proxyAgent from 'proxy-agent'; +import { ProxyAgent } from 'proxy-agent'; const spinner = ora(''); const defaultPinpointRegion = 'us-east-1'; @@ -544,10 +544,11 @@ export const getPinpointClient = async ( customUserAgent: formUserAgentParam(context, userAgentAction), }; + // HTTP_PROXY & HTTPS_PROXY env vars are read automatically by ProxyAgent, but we check to see if they are set before using the proxy if (httpProxy) { aws.config.update({ httpOptions: { - agent: proxyAgent(httpProxy), + agent: new ProxyAgent(), }, }); } diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json index 298e0588b01..df78610cd7f 100644 --- a/packages/amplify-cli-core/package.json +++ b/packages/amplify-cli-core/package.json @@ -52,7 +52,7 @@ "node-fetch": "^2.6.7", "open": "^8.4.0", "ora": "^4.0.3", - "proxy-agent": "^5.0.0", + "proxy-agent": "^6.3.0", "semver": "^7.5.4", "typescript-json-schema": "~0.52.0", "which": "^2.0.2", diff --git a/packages/amplify-cli-core/src/banner-message/index.ts b/packages/amplify-cli-core/src/banner-message/index.ts index 42a24c40776..b2dc8776725 100644 --- a/packages/amplify-cli-core/src/banner-message/index.ts +++ b/packages/amplify-cli-core/src/banner-message/index.ts @@ -1,6 +1,6 @@ import fetch from 'node-fetch'; import semver from 'semver'; -import ProxyAgent from 'proxy-agent'; +import { ProxyAgent } from 'proxy-agent'; import { getLogger } from '../logger'; export type Message = { @@ -43,7 +43,8 @@ export class BannerMessage { try { logger.info(`fetch banner messages from ${url}`); const proxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY; - const fetchOptions = proxy ? { agent: new ProxyAgent(proxy) } : {}; + // HTTP_PROXY & HTTPS_PROXY env vars are read automatically by ProxyAgent, but we check to see if they are set before using the proxy + const fetchOptions = proxy ? { agent: new ProxyAgent() } : {}; const result = await fetch(url, fetchOptions); const body = await result.json(); if (!semver.satisfies(body.version, MAX_SUPPORTED_MESSAGE_CONFIG_VERSION)) { diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json index 6cadaeee65e..d36c5ab2dbf 100644 --- a/packages/amplify-provider-awscloudformation/package.json +++ b/packages/amplify-provider-awscloudformation/package.json @@ -66,7 +66,7 @@ "node-fetch": "^2.6.7", "ora": "^4.0.3", "promise-sequential": "^1.1.1", - "proxy-agent": "^5.0.0", + "proxy-agent": "^6.3.0", "rimraf": "^3.0.0", "xstate": "^4.14.0" }, diff --git a/packages/amplify-provider-awscloudformation/src/aws-utils/aws-amplify.js b/packages/amplify-provider-awscloudformation/src/aws-utils/aws-amplify.js index 8a3deeba456..3e1be6ed115 100644 --- a/packages/amplify-provider-awscloudformation/src/aws-utils/aws-amplify.js +++ b/packages/amplify-provider-awscloudformation/src/aws-utils/aws-amplify.js @@ -1,5 +1,5 @@ const aws = require('aws-sdk'); -const proxyAgent = require('proxy-agent'); +const { ProxyAgent } = require('proxy-agent'); const configurationManager = require('../configuration-manager'); const { regions: amplifyServiceRegions } = require('../aws-regions'); @@ -24,7 +24,7 @@ async function getConfiguredAmplifyClient(context, options = {}) { if (httpProxy) { aws.config.update({ httpOptions: { - agent: proxyAgent(httpProxy), + agent: new ProxyAgent(), }, }); } diff --git a/packages/amplify-provider-awscloudformation/src/aws-utils/aws.js b/packages/amplify-provider-awscloudformation/src/aws-utils/aws.js index 9631b25c326..dd30c7f276a 100644 --- a/packages/amplify-provider-awscloudformation/src/aws-utils/aws.js +++ b/packages/amplify-provider-awscloudformation/src/aws-utils/aws.js @@ -22,7 +22,7 @@ try { aws = require('aws-sdk'); } -const proxyAgent = require('proxy-agent'); +const { ProxyAgent } = require('proxy-agent'); const configurationManager = require('../configuration-manager'); aws.configureWithCreds = async (context) => { @@ -35,7 +35,7 @@ aws.configureWithCreds = async (context) => { if (httpProxy) { aws.config.update({ httpOptions: { - agent: proxyAgent(httpProxy), + agent: new ProxyAgent(httpProxy), }, }); } diff --git a/packages/amplify-provider-awscloudformation/src/configuration-manager.ts b/packages/amplify-provider-awscloudformation/src/configuration-manager.ts index 784516d9f04..140e2287ead 100644 --- a/packages/amplify-provider-awscloudformation/src/configuration-manager.ts +++ b/packages/amplify-provider-awscloudformation/src/configuration-manager.ts @@ -13,7 +13,7 @@ import chalk from 'chalk'; import { prompt } from 'inquirer'; import _ from 'lodash'; import path from 'path'; -import proxyAgent from 'proxy-agent'; +import { ProxyAgent } from 'proxy-agent'; import { STS } from 'aws-sdk'; import awsRegions from './aws-regions'; import constants from './constants'; @@ -838,10 +838,11 @@ export async function getAwsConfig(context: $TSContext): Promise { } } + // HTTP_PROXY & HTTPS_PROXY env vars are read automatically by ProxyAgent, but we check to see if they are set before using the proxy if (httpProxy) { resultAWSConfigInfo = { ...resultAWSConfigInfo, - httpOptions: { agent: proxyAgent(httpProxy) }, + httpOptions: { agent: new ProxyAgent() }, }; } diff --git a/packages/amplify-provider-awscloudformation/src/system-config-manager.ts b/packages/amplify-provider-awscloudformation/src/system-config-manager.ts index 7bde9f05f3b..4d1f2e7db87 100644 --- a/packages/amplify-provider-awscloudformation/src/system-config-manager.ts +++ b/packages/amplify-provider-awscloudformation/src/system-config-manager.ts @@ -5,7 +5,7 @@ import * as fs from 'fs-extra'; import * as path from 'path'; import * as ini from 'ini'; import * as inquirer from 'inquirer'; -import proxyAgent from 'proxy-agent'; +import { ProxyAgent } from 'proxy-agent'; import * as constants from './constants'; import { fileLogger } from './utils/aws-logger'; import { AwsSdkConfig } from './utils/auth-types'; @@ -123,10 +123,11 @@ export const getProfiledAwsConfig = async ( }); } + // HTTP_PROXY & HTTPS_PROXY env vars are read automatically by ProxyAgent, but we check to see if they are set before using the proxy if (httpProxy) { awsConfigInfo = { ...awsConfigInfo, - httpOptions: { agent: proxyAgent(httpProxy) }, + httpOptions: { agent: new ProxyAgent() }, }; } diff --git a/packages/amplify-provider-awscloudformation/src/utils/admin-helpers.ts b/packages/amplify-provider-awscloudformation/src/utils/admin-helpers.ts index f78e7e115dd..58117a7f2a5 100644 --- a/packages/amplify-provider-awscloudformation/src/utils/admin-helpers.ts +++ b/packages/amplify-provider-awscloudformation/src/utils/admin-helpers.ts @@ -2,7 +2,7 @@ import { stateManager, $TSContext, AmplifyError, AmplifyFault } from '@aws-ampli import aws from 'aws-sdk'; import _ from 'lodash'; import fetch from 'node-fetch'; -import proxyAgent from 'proxy-agent'; +import { ProxyAgent } from 'proxy-agent'; import { adminLoginFlow } from '../admin-login'; import { AdminAuthConfig, AwsSdkConfig, CognitoAccessToken, CognitoIdToken } from './auth-types'; import { printer, prompter } from '@aws-amplify/amplify-prompts'; @@ -89,8 +89,9 @@ type AppStateResponse = { async function getAdminAppState(appId: string, region: string): Promise { // environment variable AMPLIFY_CLI_APPSTATE_BASE_URL useful for development against beta/gamma appstate endpoints const appStateBaseUrl = process.env.AMPLIFY_CLI_APPSTATE_BASE_URL ?? adminBackendMap[region].appStateUrl; + // HTTP_PROXY & HTTPS_PROXY env vars are read automatically by ProxyAgent, but we check to see if they are set before using the proxy const httpProxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY; - const fetchOptions = httpProxy ? { agent: proxyAgent(httpProxy) } : {}; + const fetchOptions = httpProxy ? { agent: new ProxyAgent() } : {}; const res = await fetch(`${appStateBaseUrl}/AppState/?appId=${appId}`, fetchOptions); if (res.status >= 500) { throw new AmplifyFault('ServiceCallFault', { diff --git a/yarn.lock b/yarn.lock index 85e8b1da24f..86e8d034db7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -339,7 +339,7 @@ __metadata: lodash: ^4.17.21 ora: ^4.0.3 promise-sequential: ^1.1.1 - proxy-agent: ^5.0.0 + proxy-agent: ^6.3.0 languageName: unknown linkType: soft @@ -421,7 +421,7 @@ __metadata: node-fetch: ^2.6.7 open: ^8.4.0 ora: ^4.0.3 - proxy-agent: ^5.0.0 + proxy-agent: ^6.3.0 rimraf: ^3.0.0 semver: ^7.5.4 strip-ansi: ^6.0.0 @@ -826,7 +826,7 @@ __metadata: node-fetch: ^2.6.7 ora: ^4.0.3 promise-sequential: ^1.1.1 - proxy-agent: ^5.0.0 + proxy-agent: ^6.3.0 rimraf: ^3.0.0 typescript: ^4.9.5 xstate: ^4.14.0 @@ -11269,6 +11269,13 @@ __metadata: languageName: node linkType: hard +"@tootallnate/quickjs-emscripten@npm:^0.23.0": + version: 0.23.0 + resolution: "@tootallnate/quickjs-emscripten@npm:0.23.0" + checksum: 2a939b781826fb5fd3edd0f2ec3b321d259d760464cf20611c9877205aaca3ccc0b7304dea68416baa0d568e82cd86b17d29548d1e5139fa3155a4a86a2b4b49 + languageName: node + linkType: hard + "@trysound/sax@npm:0.2.0": version: 0.2.0 resolution: "@trysound/sax@npm:0.2.0" @@ -12744,7 +12751,7 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.1.1, acorn-walk@npm:^8.2.0": +"acorn-walk@npm:^8.1.1": version: 8.2.0 resolution: "acorn-walk@npm:8.2.0" checksum: dbe92f5b2452c93e960c5594e666dd1fae141b965ff2cb4a1e1d0381e3e4db4274c5ce4ffa3d681a86ca2a8d4e29d5efc0670a08e23fd2800051ea387df56ca2 @@ -12793,7 +12800,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.0, agent-base@npm:^6.0.2": +"agent-base@npm:6, agent-base@npm:^6.0.2": version: 6.0.2 resolution: "agent-base@npm:6.0.2" dependencies: @@ -12802,6 +12809,15 @@ __metadata: languageName: node linkType: hard +"agent-base@npm:^7.0.1, agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": + version: 7.1.0 + resolution: "agent-base@npm:7.1.0" + dependencies: + debug: ^4.3.4 + checksum: fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce + languageName: node + linkType: hard + "agentkeepalive@npm:^4.2.1": version: 4.2.1 resolution: "agentkeepalive@npm:4.2.1" @@ -13788,7 +13804,7 @@ __metadata: languageName: node linkType: hard -"ast-types@npm:^0.13.2": +"ast-types@npm:^0.13.4": version: 0.13.4 resolution: "ast-types@npm:0.13.4" dependencies: @@ -14433,6 +14449,13 @@ __metadata: languageName: node linkType: hard +"basic-ftp@npm:^5.0.2": + version: 5.0.3 + resolution: "basic-ftp@npm:5.0.3" + checksum: 2b960ea976a4c16f420290063e6399894220e107653de3bc9a19d842bcfee49855d20f2449d27f0217af2e9bcfb6008a81461b59e43b9ef1fe21263513b107b4 + languageName: node + linkType: hard + "batch@npm:0.6.1": version: 0.6.1 resolution: "batch@npm:0.6.1" @@ -16766,10 +16789,10 @@ __metadata: languageName: node linkType: hard -"data-uri-to-buffer@npm:3": - version: 3.0.1 - resolution: "data-uri-to-buffer@npm:3.0.1" - checksum: 01fa28525402582fbb972c91822533f5528156e9e7241512b903467acbe2e0505760504e22c548bb707c7a56b5459194ee4fa6434e5995fa1a658744c2ce0cff +"data-uri-to-buffer@npm:^5.0.1": + version: 5.0.1 + resolution: "data-uri-to-buffer@npm:5.0.1" + checksum: 08ad2f2cd5cb8f37258fcd94ccaa549948bf3b0f921f29bb58840ae64c968c06efb60edf3dd51f803084765e5d3ab11896a98fd33a7729a7eb23e83d5ba5223c languageName: node linkType: hard @@ -16953,15 +16976,14 @@ __metadata: languageName: node linkType: hard -"degenerator@npm:^3.0.1": - version: 3.0.1 - resolution: "degenerator@npm:3.0.1" +"degenerator@npm:^5.0.0": + version: 5.0.1 + resolution: "degenerator@npm:5.0.1" dependencies: - ast-types: ^0.13.2 - escodegen: ^1.8.1 - esprima: ^4.0.0 - vm2: ^3.9.3 - checksum: b4c714597450899878ff79cfd37e8032940d4efb093c066f74c5c4c0b8daab0245bf2d44342b554da0f17864cac0cfe4a5c786f0dae55c74541534b929f1f76f + ast-types: ^0.13.4 + escodegen: ^2.1.0 + esprima: ^4.0.1 + checksum: e48d8a651edeb512a648711a09afec269aac6de97d442a4bb9cf121a66877e0eec11b9727100a10252335c0666ae1c84a8bc1e3a3f47788742c975064d2c7b1c languageName: node linkType: hard @@ -17722,14 +17744,13 @@ __metadata: languageName: node linkType: hard -"escodegen@npm:^1.8.1": - version: 1.14.3 - resolution: "escodegen@npm:1.14.3" +"escodegen@npm:^2.1.0": + version: 2.1.0 + resolution: "escodegen@npm:2.1.0" dependencies: esprima: ^4.0.1 - estraverse: ^4.2.0 + estraverse: ^5.2.0 esutils: ^2.0.2 - optionator: ^0.8.1 source-map: ~0.6.1 dependenciesMeta: source-map: @@ -17737,7 +17758,7 @@ __metadata: bin: escodegen: bin/escodegen.js esgenerate: bin/esgenerate.js - checksum: 30d337803e8f44308c90267bf6192399e4b44792497c77a7506b68ab802ba6a48ebbe1ce77b219aba13dfd2de5f5e1c267e35be1ed87b2a9c3315e8b283e302a + checksum: e1450a1f75f67d35c061bf0d60888b15f62ab63aef9df1901cffc81cffbbb9e8b3de237c5502cf8613a017c1df3a3003881307c78835a1ab54d8c8d2206e01d3 languageName: node linkType: hard @@ -18277,7 +18298,7 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": +"estraverse@npm:^4.1.1": version: 4.3.0 resolution: "estraverse@npm:4.3.0" checksum: 9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d @@ -18764,13 +18785,6 @@ __metadata: languageName: node linkType: hard -"file-uri-to-path@npm:2": - version: 2.0.0 - resolution: "file-uri-to-path@npm:2.0.0" - checksum: 78fad70e5ce84b11d9590998e4a3c3f87765c18bfa7edfcfd71eab1968c99d4448d24712911479aacf2a870578769f0b4e4fcc093654462a88823d8d134aed48 - languageName: node - linkType: hard - "file-url@npm:3.0.0": version: 3.0.0 resolution: "file-url@npm:3.0.0" @@ -19194,16 +19208,6 @@ __metadata: languageName: node linkType: hard -"ftp@npm:^0.3.10": - version: 0.3.10 - resolution: "ftp@npm:0.3.10" - dependencies: - readable-stream: 1.1.x - xregexp: 2.0.0 - checksum: bd541fc3e34796cb6fd9749312d4336779ded1edc4b4b82441c211a998da19b8f22a80101685ca128e40ccd33faa9429c22bfd638e2ae1c3b8f1b2f91c2ed719 - languageName: node - linkType: hard - "function-bind@npm:^1.1.1": version: 1.1.1 resolution: "function-bind@npm:1.1.1" @@ -19392,17 +19396,15 @@ __metadata: languageName: node linkType: hard -"get-uri@npm:3": - version: 3.0.2 - resolution: "get-uri@npm:3.0.2" +"get-uri@npm:^6.0.1": + version: 6.0.1 + resolution: "get-uri@npm:6.0.1" dependencies: - "@tootallnate/once": 1 - data-uri-to-buffer: 3 - debug: 4 - file-uri-to-path: 2 + basic-ftp: ^5.0.2 + data-uri-to-buffer: ^5.0.1 + debug: ^4.3.4 fs-extra: ^8.1.0 - ftp: ^0.3.10 - checksum: f0e20ce416448af5f90e5b0df2e2df3198a8b7ac80d9c9cb90ab3427ebff3119304d5acc1aba33646464f7529daba33e1961c093d06cd6ca729ac92dda51a21a + checksum: dde1cd2fa74561e603fd114de360bbe7e2c9b4f7c942257cd176bf508528ba7e7f31ae25b5c09b75cda7a09b4cabcc2f8bce9eb061e5709b680d67a544ae9bb9 languageName: node linkType: hard @@ -20535,7 +20537,7 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^4.0.0, http-proxy-agent@npm:^4.0.1": +"http-proxy-agent@npm:^4.0.0": version: 4.0.1 resolution: "http-proxy-agent@npm:4.0.1" dependencies: @@ -20557,6 +20559,16 @@ __metadata: languageName: node linkType: hard +"http-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "http-proxy-agent@npm:7.0.0" + dependencies: + agent-base: ^7.1.0 + debug: ^4.3.4 + checksum: a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8 + languageName: node + linkType: hard + "http-proxy-middleware@npm:^2.0.3": version: 2.0.4 resolution: "http-proxy-middleware@npm:2.0.4" @@ -20607,7 +20619,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:5, https-proxy-agent@npm:^5.0.0": +"https-proxy-agent@npm:^5.0.0": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" dependencies: @@ -20617,6 +20629,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.0": + version: 7.0.1 + resolution: "https-proxy-agent@npm:7.0.1" + dependencies: + agent-base: ^7.0.2 + debug: 4 + checksum: f08f646809c04803843534b5e0ea5b4034beaa065ef2f9505e4afaeb2fa962a15494e563357c819203cff07232d1631739947f031149eb837a16a2f3553fbe32 + languageName: node + linkType: hard + "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -21043,7 +21065,7 @@ __metadata: languageName: node linkType: hard -"ip@npm:^1.1.5": +"ip@npm:^1.1.5, ip@npm:^1.1.8": version: 1.1.8 resolution: "ip@npm:1.1.8" checksum: ab32a5ecfa678d4c158c1381c4c6744fce89a1d793e1b6635ba79d0753c069030b672d765887b6fff55670c711dfa47475895e5d6013efbbcf04687c51cb8db9 @@ -24514,7 +24536,7 @@ __metadata: languageName: node linkType: hard -"netmask@npm:^2.0.1, netmask@npm:^2.0.2": +"netmask@npm:^2.0.2": version: 2.0.2 resolution: "netmask@npm:2.0.2" checksum: cafd28388e698e1138ace947929f842944d0f1c0b87d3fa2601a61b38dc89397d33c0ce2c8e7b99e968584b91d15f6810b91bef3f3826adf71b1833b61d4bf4f @@ -25647,31 +25669,30 @@ node-pty@beta: languageName: node linkType: hard -"pac-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "pac-proxy-agent@npm:5.0.0" +"pac-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "pac-proxy-agent@npm:7.0.0" dependencies: - "@tootallnate/once": 1 - agent-base: 6 - debug: 4 - get-uri: 3 - http-proxy-agent: ^4.0.1 - https-proxy-agent: 5 - pac-resolver: ^5.0.0 - raw-body: ^2.2.0 - socks-proxy-agent: 5 - checksum: 993ea53f78af6233720bfa1ab82b748dad5eba514f45a6eb2128ee71b4417835e591823c9c4895327d2390c6bccb2924e849308a40d456ce15f88e3b3db073bf + "@tootallnate/quickjs-emscripten": ^0.23.0 + agent-base: ^7.0.2 + debug: ^4.3.4 + get-uri: ^6.0.1 + http-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.0 + pac-resolver: ^7.0.0 + socks-proxy-agent: ^8.0.1 + checksum: de7f26fbf970a7a8050df2331ebd3fef42a84a63c7c907c7f2601863737fc8dc1b7de616a5c9401b462966bfb1a94ca49efb75ec7cae0cbdc6bcb3d77aa9e8a6 languageName: node linkType: hard -"pac-resolver@npm:^5.0.0": - version: 5.0.0 - resolution: "pac-resolver@npm:5.0.0" +"pac-resolver@npm:^7.0.0": + version: 7.0.0 + resolution: "pac-resolver@npm:7.0.0" dependencies: - degenerator: ^3.0.1 - ip: ^1.1.5 - netmask: ^2.0.1 - checksum: 5b24c8f620fd1ac805b316063f4b355c6e8f092118f901756b04aef219545d98aab4abbc74fcf06a79298757968b646a2410c6ad45ad0e78280faa55e31c22e2 + degenerator: ^5.0.0 + ip: ^1.1.8 + netmask: ^2.0.2 + checksum: a5ac1bf1f33f667a1c85fd61744672d9364534a1bb68a676ef920091b735ed8a10fc2b57385909e34822a2147b10a898dd79139b07dae0dbd568561d5c40a81b languageName: node linkType: hard @@ -27315,23 +27336,23 @@ node-pty@beta: languageName: node linkType: hard -"proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "proxy-agent@npm:5.0.0" +"proxy-agent@npm:^6.3.0": + version: 6.3.0 + resolution: "proxy-agent@npm:6.3.0" dependencies: - agent-base: ^6.0.0 - debug: 4 - http-proxy-agent: ^4.0.0 - https-proxy-agent: ^5.0.0 - lru-cache: ^5.1.1 - pac-proxy-agent: ^5.0.0 - proxy-from-env: ^1.0.0 - socks-proxy-agent: ^5.0.0 - checksum: e6504b085fce8fd62c4c61a4da8a86b6eabe2dd9caae52954a289581903c070343511d55e92ff008ccbb872b1374aef7ab96a5054c3d5bce379732272b7eae30 + agent-base: ^7.0.2 + debug: ^4.3.4 + http-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.0 + lru-cache: ^7.14.1 + pac-proxy-agent: ^7.0.0 + proxy-from-env: ^1.1.0 + socks-proxy-agent: ^8.0.1 + checksum: 40a0df2c9af5da8e6fcb95268f3e93181d8dd5c5ee9493517793fe75f847641f44a962d25a49d7208ec3b68cf1998fcd0d976bae773796e2023c71cddd76b642 languageName: node linkType: hard -"proxy-from-env@npm:^1.0.0, proxy-from-env@npm:^1.1.0": +"proxy-from-env@npm:^1.1.0": version: 1.1.0 resolution: "proxy-from-env@npm:1.1.0" checksum: fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b @@ -27527,7 +27548,7 @@ node-pty@beta: languageName: node linkType: hard -"raw-body@npm:2.4.3, raw-body@npm:^2.2.0": +"raw-body@npm:2.4.3": version: 2.4.3 resolution: "raw-body@npm:2.4.3" dependencies: @@ -27824,18 +27845,6 @@ node-pty@beta: languageName: node linkType: hard -"readable-stream@npm:1.1.x": - version: 1.1.14 - resolution: "readable-stream@npm:1.1.14" - dependencies: - core-util-is: ~1.0.0 - inherits: ~2.0.1 - isarray: 0.0.1 - string_decoder: ~0.10.x - checksum: b7f41b16b305103d598e3c8964fa30d52d6e0b5d9fdad567588964521691c24b279c7a8bb71f11927c3613acf355bac72d8396885a43d50425b2caafd49bc83d - languageName: node - linkType: hard - "readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0": version: 3.6.0 resolution: "readable-stream@npm:3.6.0" @@ -29222,17 +29231,6 @@ node-pty@beta: languageName: node linkType: hard -"socks-proxy-agent@npm:5, socks-proxy-agent@npm:^5.0.0": - version: 5.0.1 - resolution: "socks-proxy-agent@npm:5.0.1" - dependencies: - agent-base: ^6.0.2 - debug: 4 - socks: ^2.3.3 - checksum: 2bc4d996d3e6cb65f69d84aa94d5dcfabac5c264e777ecdb24511703a614d0a426b40adc2c6b456a9c590e6d4c0a67da70e2d59742ac0411dd7f46a49ce07c73 - languageName: node - linkType: hard - "socks-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "socks-proxy-agent@npm:7.0.0" @@ -29244,13 +29242,24 @@ node-pty@beta: languageName: node linkType: hard -"socks@npm:^2.3.3, socks@npm:^2.6.2": - version: 2.7.0 - resolution: "socks@npm:2.7.0" +"socks-proxy-agent@npm:^8.0.1": + version: 8.0.1 + resolution: "socks-proxy-agent@npm:8.0.1" + dependencies: + agent-base: ^7.0.1 + debug: ^4.3.4 + socks: ^2.7.1 + checksum: 3971e6af5717d986e0314a69285cf6ec70d320bc2e31bf0bc32cf1618ac7abd9fd8620d9904cc467ae530752213bbfc8b6cedfd0b1381c0cbd1aada75ac05c0a + languageName: node + linkType: hard + +"socks@npm:^2.6.2, socks@npm:^2.7.1": + version: 2.7.1 + resolution: "socks@npm:2.7.1" dependencies: ip: ^2.0.0 smart-buffer: ^4.2.0 - checksum: 5cc9ea8d0f1fae370d7ac319b5dd8973fa24bc58d0194a8140687fd10be53a1f348b1b02b97932ce67ddae0edf459e5da0fe4b13cd5dd22ce46ac4d1a83239ec + checksum: 43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130 languageName: node linkType: hard @@ -31502,18 +31511,6 @@ node-pty@beta: languageName: node linkType: hard -"vm2@npm:^3.9.3": - version: 3.9.19 - resolution: "vm2@npm:3.9.19" - dependencies: - acorn: ^8.7.0 - acorn-walk: ^8.2.0 - bin: - vm2: bin/vm2 - checksum: 16e8e6bb389ae88b8ffbc439e8d7c09db3b98f7f738440af5b78080d6cb35db66b41b0ad055cc59bcc45cb8e270ed850667207348e90760b430403741f72337a - languageName: node - linkType: hard - "vscode-languageserver-types@npm:^3.15.1": version: 3.16.0 resolution: "vscode-languageserver-types@npm:3.16.0" @@ -32420,13 +32417,6 @@ node-pty@beta: languageName: node linkType: hard -"xregexp@npm:2.0.0": - version: 2.0.0 - resolution: "xregexp@npm:2.0.0" - checksum: 0a5f9134fad3f4d5bffce55eb8e4f00a20e29ad4d0355bf5579e7c5a386355d39e896d4bc941b4b19ea4a04f388980f05ef96cf33574961ba82416ffae78ad65 - languageName: node - linkType: hard - "xstate@npm:^4.14.0": version: 4.26.1 resolution: "xstate@npm:4.26.1"