From 502413ff480103d2768a0ea961f5338465b5c42c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 23:37:53 +0000 Subject: [PATCH 1/2] chore(deps): update dependency http-proxy-agent to v6 --- package-lock.json | 76 +++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a363c7b9..300312f46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "@types/lolex": "^5.1.0", "@types/node": "^18.0.0", "fetch-mock": "^9.0.0", - "http-proxy-agent": "^5.0.0", + "http-proxy-agent": "^6.0.0", "jest": "^29.0.0", "lolex": "^6.0.0", "prettier": "2.8.8", @@ -3927,15 +3927,6 @@ "@sinonjs/commons": "^1.7.0" } }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, "node_modules/@types/babel__core": { "version": "7.1.19", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz", @@ -5500,9 +5491,9 @@ } }, "node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -6473,17 +6464,28 @@ "dev": true }, "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-6.0.0.tgz", + "integrity": "sha512-tmlr1P183cfJxzneOlOnQrv4hMkOBcTow1rjlT3tnaJbJGlz4xnZuOEAvHFfKqX5RhvIxkCABPQHo3tQEj3ouw==", "dev": true, "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" + "agent-base": "^7.0.0", + "debug": "^4.3.4" }, "engines": { - "node": ">= 6" + "node": ">= 14" + } + }, + "node_modules/http-proxy-agent/node_modules/agent-base": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.0.0.tgz", + "integrity": "sha512-awaqsf16R0tAUMxWiVikaBDKrbt0im7XdzPMh3I8TFC097G4ZowjGgLBfXt+tGPsE+1U1FyLBGuWMd/EPVblWg==", + "dev": true, + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" } }, "node_modules/https-proxy-agent": { @@ -17918,12 +17920,6 @@ "@sinonjs/commons": "^1.7.0" } }, - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, "@types/babel__core": { "version": "7.1.19", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz", @@ -19160,9 +19156,9 @@ "dev": true }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -19906,14 +19902,24 @@ "dev": true }, "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-6.0.0.tgz", + "integrity": "sha512-tmlr1P183cfJxzneOlOnQrv4hMkOBcTow1rjlT3tnaJbJGlz4xnZuOEAvHFfKqX5RhvIxkCABPQHo3tQEj3ouw==", "dev": true, "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" + "agent-base": "^7.0.0", + "debug": "^4.3.4" + }, + "dependencies": { + "agent-base": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.0.0.tgz", + "integrity": "sha512-awaqsf16R0tAUMxWiVikaBDKrbt0im7XdzPMh3I8TFC097G4ZowjGgLBfXt+tGPsE+1U1FyLBGuWMd/EPVblWg==", + "dev": true, + "requires": { + "debug": "^4.3.4" + } + } } }, "https-proxy-agent": { diff --git a/package.json b/package.json index 951c7168f..055cbeea4 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@types/lolex": "^5.1.0", "@types/node": "^18.0.0", "fetch-mock": "^9.0.0", - "http-proxy-agent": "^5.0.0", + "http-proxy-agent": "^6.0.0", "jest": "^29.0.0", "lolex": "^6.0.0", "prettier": "2.8.8", From 7d576ed9982c1a0d5807eb7a34be04004cb6c70a Mon Sep 17 00:00:00 2001 From: Gregor Martynus <39992+gr2m@users.noreply.github.com> Date: Fri, 12 May 2023 16:51:32 -0700 Subject: [PATCH 2/2] test: adapt for `http-proxy-agent@6` --- test/agent-proxy/agent-proxy-test.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/agent-proxy/agent-proxy-test.test.ts b/test/agent-proxy/agent-proxy-test.test.ts index 2fa604acd..eb7e5940b 100644 --- a/test/agent-proxy/agent-proxy-test.test.ts +++ b/test/agent-proxy/agent-proxy-test.test.ts @@ -8,7 +8,7 @@ const http = require("http"); const HttpProxy = require("proxy"); -const HttpProxyAgent = require("http-proxy-agent"); +const { HttpProxyAgent } = require("http-proxy-agent"); import { Octokit } from "../../src";