Update octokit

Author: cschleiden

package-lock.json

@@ -313,7 +313,7 @@
     "webpack-cli": "^3.3.10"
   },
   "dependencies": {
-    "@octokit/rest": "^18.0.0",
+    "@octokit/rest": "18.0.14",
     "atob": "^2.1.2",
     "btoa": "^1.2.1",
     "github-actions-parser": "0.17.0",

package.json

@@ -117,7 +117,7 @@ export async function getGitHubContext(): Promise<GitHubContext | undefined> {
           name: protocolInfo.repositoryName,
           owner: protocolInfo.owner,
           defaultBranch: `refs/heads/${repoInfo.data.default_branch}`,
-          ownerIsOrg: repoInfo.data.owner.type === "Organization",
+          ownerIsOrg: repoInfo.data.owner?.type === "Organization",
           orgFeaturesEnabled:
             session.scopes.find((x) => x.toLocaleLowerCase() === "admin:org") !=
             null,

src/git/repository.ts

@@ -1,6 +1,7 @@
 import * as vscode from "vscode";
-import { getGitHubContext } from "../git/repository";
+
 import { cacheLogInfo } from "./logInfoProvider";
+import { getGitHubContext } from "../git/repository";
 import { parseLog } from "./model";
 import { parseUri } from "./scheme";
 
@@ -26,7 +27,7 @@ export class WorkflowStepLogProvider
         }
       );
 
-      const log = result.data;
+      const log = result.data as any;
 
       const logInfo = parseLog(log);
       cacheLogInfo(uri, logInfo);

src/logs/fileProvider.ts

@@ -1,23 +1,23 @@
-import { Octokit } from "@octokit/rest";
+import { RestEndpointMethods } from "@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types";
 
 // Type helpers
-type Modify<T, R> = Omit<T, keyof R> & R;
-
 type Await<T> = T extends {
   then(onfulfilled?: (value: infer U) => unknown): unknown;
 }
   ? U
   : T;
 
-type GetElementType<T extends Array<any>> = T extends (infer U)[] ? U : never;
+type GetElementType<T> = T extends (infer U)[] ? U : never;
 
 type OctokitData<
-  Operation extends keyof Octokit["actions"],
+  Operation extends keyof RestEndpointMethods["actions"],
   ResultProperty extends keyof Await<
-    ReturnType<Octokit["actions"][Operation]>
+    ReturnType<RestEndpointMethods["actions"][Operation]>
   >["data"]
 > = GetElementType<
-  Await<ReturnType<Octokit["actions"][Operation]>>["data"][ResultProperty]
+  Await<
+    ReturnType<RestEndpointMethods["actions"][Operation]>
+  >["data"][ResultProperty]
 >;
 
 //