From 0beffc2a0aa1452b0388d22a7cadabc64e71f915 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 17 Oct 2021 01:58:44 +0300 Subject: [PATCH] fix(deps): http(s)-proxy-agent updated to v5 --- .changeset/poor-ways-beg.md | 5 +++ packages/npm-registry-agent/package.json | 4 +- packages/npm-registry-agent/src/index.ts | 4 +- pnpm-lock.yaml | 49 +++++++++--------------- 4 files changed, 28 insertions(+), 34 deletions(-) create mode 100644 .changeset/poor-ways-beg.md diff --git a/.changeset/poor-ways-beg.md b/.changeset/poor-ways-beg.md new file mode 100644 index 0000000000..63e3f768e3 --- /dev/null +++ b/.changeset/poor-ways-beg.md @@ -0,0 +1,5 @@ +--- +"@pnpm/npm-registry-agent": patch +--- + +`http-proxy-agent` and `https-proxy-agent` update to v5. diff --git a/packages/npm-registry-agent/package.json b/packages/npm-registry-agent/package.json index 3e13debfcc..89b0c44caa 100644 --- a/packages/npm-registry-agent/package.json +++ b/packages/npm-registry-agent/package.json @@ -23,8 +23,8 @@ }, "dependencies": { "agentkeepalive": "^4.1.3", - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^3.0.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", "lru-cache": "^6.0.0", "socks-proxy-agent": "^5.0.0" }, diff --git a/packages/npm-registry-agent/src/index.ts b/packages/npm-registry-agent/src/index.ts index 6457f8050e..3c9d8c64f9 100644 --- a/packages/npm-registry-agent/src/index.ts +++ b/packages/npm-registry-agent/src/index.ts @@ -1,7 +1,7 @@ import { URL } from 'url' import HttpAgent from 'agentkeepalive' import createHttpProxyAgent from 'http-proxy-agent' -import HttpsProxyAgent from 'https-proxy-agent' +import createHttpsProxyAgent from 'https-proxy-agent' import LRU from 'lru-cache' import SocksProxyAgent from 'socks-proxy-agent' @@ -166,7 +166,7 @@ function getProxy ( if (!isHttps) { return createHttpProxyAgent(popts) } else { - return new HttpsProxyAgent(popts) + return createHttpsProxyAgent(popts) } } if (proxyUrl.protocol?.startsWith('socks')) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e0e2bf159a..077446c8bb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1425,14 +1425,14 @@ importers: '@types/http-proxy-agent': ^4.0.0 '@types/lru-cache': ^5.1.0 agentkeepalive: ^4.1.3 - http-proxy-agent: ^4.0.1 - https-proxy-agent: ^3.0.1 + http-proxy-agent: ^5.0.0 + https-proxy-agent: ^5.0.0 lru-cache: ^6.0.0 socks-proxy-agent: ^5.0.0 dependencies: agentkeepalive: 4.1.4 - http-proxy-agent: 4.0.1 - https-proxy-agent: 3.0.1 + http-proxy-agent: 5.0.0 + https-proxy-agent: 5.0.0 lru-cache: 6.0.0 socks-proxy-agent: 5.0.1 devDependencies: @@ -4841,6 +4841,10 @@ packages: resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} engines: {node: '>= 6'} + /@tootallnate/once/2.0.0: + resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} + engines: {node: '>= 10'} + /@tsconfig/node10/1.0.8: resolution: {integrity: sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==} dev: true @@ -4949,7 +4953,7 @@ packages: resolution: {integrity: sha512-2XJTByP9C14Kcq5ClvPRfOgFJxklhuru7xmuSPcNr2CPwRGdpCgIdUUNc0MDb25+bzaSolVN0u4RKH7M+CMimg==} deprecated: This is a stub types definition. http-proxy-agent provides its own type definitions, so you do not need this installed. dependencies: - http-proxy-agent: 4.0.1 + http-proxy-agent: 5.0.0 transitivePeerDependencies: - supports-color dev: true @@ -5669,13 +5673,6 @@ packages: engines: {node: '>=6.0'} dev: false - /agent-base/4.3.0: - resolution: {integrity: sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==} - engines: {node: '>= 4.0.0'} - dependencies: - es6-promisify: 5.0.0 - dev: false - /agent-base/6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -7803,16 +7800,6 @@ packages: es6-symbol: 3.1.3 dev: true - /es6-promise/4.2.8: - resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} - dev: false - - /es6-promisify/5.0.0: - resolution: {integrity: sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=} - dependencies: - es6-promise: 4.2.8 - dev: false - /es6-symbol/3.1.3: resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==} dependencies: @@ -9314,6 +9301,16 @@ packages: transitivePeerDependencies: - supports-color + /http-proxy-agent/5.0.0: + resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==} + engines: {node: '>= 6'} + dependencies: + '@tootallnate/once': 2.0.0 + agent-base: 6.0.2 + debug: 4.3.2 + transitivePeerDependencies: + - supports-color + /http-signature/1.2.0: resolution: {integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=} engines: {node: '>=0.8', npm: '>=1.3.7'} @@ -9327,14 +9324,6 @@ packages: resolution: {integrity: sha512-JrT3ua+WgH8zBD3HEJYbeEgnuQaAnUeRRko/YojPAJjGmIfGD3KPU/asLdsLwKjfxOmQe5nXMQ0pt/7MyapVbQ==} dev: true - /https-proxy-agent/3.0.1: - resolution: {integrity: sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==} - engines: {node: '>= 4.5.0'} - dependencies: - agent-base: 4.3.0 - debug: 3.2.7 - dev: false - /https-proxy-agent/5.0.0: resolution: {integrity: sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==} engines: {node: '>= 6'}