Merge branch 'main' into v2

Author: zegl

package.json

@@ -28,12 +28,13 @@
   },
   "homepage": "https://github.com/sturdy-dev/codeball-action#readme",
   "dependencies": {
-    "@actions/core": "^1.8.2",
+    "@actions/core": "^1.9.1",
     "@actions/github": "^5.0.3",
-    "@octokit/action": "^3.18.1",
-    "@octokit/core": "^3.6.0",
-    "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
-    "node-fetch": "^3.2.4"
+    "@octokit/core": "^4.0.5",
+    "@octokit/plugin-paginate-rest": "^4.1.0",
+    "@octokit/plugin-rest-endpoint-methods": "^6.3.0",
+    "https-proxy-agent": "^5.0.1",
+    "node-fetch": "^3.2.10"
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",

src/lib/octokit/index.ts

@@ -1,12 +1,22 @@
 import {Octokit as Core} from '@octokit/core'
 import {paginateRest} from '@octokit/plugin-paginate-rest'
 import {legacyRestEndpointMethods} from '@octokit/plugin-rest-endpoint-methods'
-import ProxyAgent from 'proxy-agent'
+
+const HttpsProxyAgent = require('https-proxy-agent')
 
 const DEFAULTS = {
   baseUrl: getApiBaseUrl()
 }
 
+const httpProxy = process.env['HTTP_PROXY'] || process.env['http_proxy']
+const httpsProxy = process.env['HTTPS_PROXY'] || process.env['https_proxy']
+
+const proxy = httpProxy
+  ? new HttpsProxyAgent(httpProxy)
+  : httpsProxy
+  ? new HttpsProxyAgent(httpProxy)
+  : undefined
+
 export const Octokit = Core.plugin(
   paginateRest,
   legacyRestEndpointMethods
@@ -15,7 +25,7 @@ export const Octokit = Core.plugin(
     ...DEFAULTS,
     ...options,
     request: {
-      agent: new ProxyAgent(),
+      agent: proxy,
       ...options.request
     }
   }

src/suggester/main.ts

@@ -126,7 +126,7 @@ const suggestViaGitHub = async ({
         path: string
         start_line?: number
         side?: 'LEFT' | 'RIGHT'
-        line?: number
+        line: number
         start_side?: 'LEFT' | 'RIGHT'
       }