diff --git a/packages/github/__tests__/github.proxy.test.ts b/packages/github/__tests__/github.proxy.test.ts index ad45ecbf..86c51fc2 100644 --- a/packages/github/__tests__/github.proxy.test.ts +++ b/packages/github/__tests__/github.proxy.test.ts @@ -1,6 +1,6 @@ import * as http from 'http' import * as https from 'https' -import { proxy } from 'proxy' +import { createProxy } from 'proxy' // Default values are set when the module is imported, so we need to set proxy first. const proxyUrl = 'http://127.0.0.1:8081' @@ -16,7 +16,7 @@ describe('@actions/github', () => { beforeAll(async () => { // Start proxy server - proxyServer = proxy() + proxyServer = createProxy() await new Promise(resolve => { const port = Number(proxyUrl.split(':')[2]) proxyServer.listen(port, () => resolve()) diff --git a/packages/github/__tests__/github.test.ts b/packages/github/__tests__/github.test.ts index 3b934f3c..a1ba44ce 100644 --- a/packages/github/__tests__/github.test.ts +++ b/packages/github/__tests__/github.test.ts @@ -1,5 +1,5 @@ import * as http from 'http' -import { proxy } from 'proxy' +import { createProxy } from 'proxy' import {getOctokit} from '../src/github' import {GitHub, getOctokitOptions} from '../src/utils' @@ -12,7 +12,7 @@ describe('@actions/github', () => { beforeAll(async () => { // Start proxy server - proxyServer = proxy() + proxyServer = createProxy() await new Promise(resolve => { const port = Number(proxyUrl.split(':')[2]) proxyServer.listen(port, () => resolve(null)) diff --git a/packages/github/__tests__/proxy.d.ts b/packages/github/__tests__/proxy1.d.ts similarity index 77% rename from packages/github/__tests__/proxy.d.ts rename to packages/github/__tests__/proxy1.d.ts index 9b61127b..87213267 100644 --- a/packages/github/__tests__/proxy.d.ts +++ b/packages/github/__tests__/proxy1.d.ts @@ -1,4 +1,4 @@ -declare module 'proxy' { +declare module 'proxy1' { import * as http from 'http' function internal(): http.Server export = internal diff --git a/packages/github/package-lock.json b/packages/github/package-lock.json index 48caadc8..5a1824b5 100644 --- a/packages/github/package-lock.json +++ b/packages/github/package-lock.json @@ -15,6 +15,7 @@ "@octokit/plugin-rest-endpoint-methods": "^7.2.3" }, "devDependencies": { + "@types/proxy": "^1.0.1", "proxy": "^2.1.1" } }, @@ -161,6 +162,21 @@ "@octokit/openapi-types": "^18.0.0" } }, + "node_modules/@types/node": { + "version": "20.6.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.1.tgz", + "integrity": "sha512-4LcJvuXQlv4lTHnxwyHQZ3uR9Zw2j7m1C9DfuwoTFQQP4Pmu04O6IfLYgMmHoOCt0nosItLLZAH+sOrRE0Bo8g==", + "dev": true + }, + "node_modules/@types/proxy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/proxy/-/proxy-1.0.1.tgz", + "integrity": "sha512-vjRgU9Ke0+6sfVeAXQphHRGb+OgBNpah1fma4aP7Pto2rnlrPDjsq+vyvy7emw+Fc9ppEciQtRh9Gaaxzu1Gzw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -516,6 +532,21 @@ "@octokit/openapi-types": "^18.0.0" } }, + "@types/node": { + "version": "20.6.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.1.tgz", + "integrity": "sha512-4LcJvuXQlv4lTHnxwyHQZ3uR9Zw2j7m1C9DfuwoTFQQP4Pmu04O6IfLYgMmHoOCt0nosItLLZAH+sOrRE0Bo8g==", + "dev": true + }, + "@types/proxy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/proxy/-/proxy-1.0.1.tgz", + "integrity": "sha512-vjRgU9Ke0+6sfVeAXQphHRGb+OgBNpah1fma4aP7Pto2rnlrPDjsq+vyvy7emw+Fc9ppEciQtRh9Gaaxzu1Gzw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", diff --git a/packages/github/package.json b/packages/github/package.json index e19f979d..9543b1b4 100644 --- a/packages/github/package.json +++ b/packages/github/package.json @@ -44,6 +44,7 @@ "@octokit/plugin-rest-endpoint-methods": "^7.2.3" }, "devDependencies": { + "@types/proxy": "^1.0.1", "proxy": "^2.1.1" } }