fix: update Octokit import to use rest module

Replaces the core Octokit import with the rest module in octokit.ts for better feature support.

.github/knip.ts

@@ -1,12 +1,12 @@
 import type { KnipConfig } from "knip";
 
 const config: KnipConfig = {
-  entry: ["build/index.ts", ".github/empty-string-checker.ts"],
+  entry: ["src/index.ts"],
   project: ["src/**/*.ts"],
-  ignore: ["src/types/config.ts", "**/__mocks__/**", "**/__fixtures__/**"],
+  ignore: ["**/__mocks__/**", "**/__fixtures__/**"],
   ignoreExportsUsedInFile: true,
   // eslint can also be safely ignored as per the docs: https://knip.dev/guides/handling-issues#eslint--jest
-  ignoreDependencies: ["eslint-config-prettier", "eslint-plugin-prettier", "@types/jest", "@mswjs/data", "tsx"],
+  ignoreDependencies: ["eslint-config-prettier", "eslint-plugin-prettier", "@types/jest", "@mswjs/data", "tsx", "simple-git"],
   eslint: true,
 };
 

package.json

@@ -41,9 +41,14 @@
   "dependencies": {
     "@actions/core": "^1.11.1",
     "@actions/github": "^6.0.0",
+    "@octokit/core": "^6.1.2",
     "@octokit/plugin-paginate-graphql": "^5.2.4",
+    "@octokit/plugin-paginate-rest": "^11.3.5",
+    "@octokit/plugin-rest-endpoint-methods": "^13.2.6",
     "@octokit/plugin-retry": "^7.1.2",
     "@octokit/plugin-throttling": "^9.3.2",
+    "@octokit/rest": "^21.0.2",
+    "@octokit/types": "^13.6.1",
     "@octokit/webhooks": "^13.3.0",
     "@sinclair/typebox": "^0.33.20",
     "@ubiquity-os/ubiquity-os-logger": "^1.3.2",
@@ -59,7 +64,6 @@
     "@eslint/js": "^9.14.0",
     "@jest/globals": "29.7.0",
     "@mswjs/data": "0.16.1",
-    "@octokit/rest": "^21.0.2",
     "@types/jest": "29.5.12",
     "@types/node": "^20.11.19",
     "cspell": "^8.4.0",

src/octokit.ts

@@ -1,4 +1,4 @@
-import { Octokit } from "@octokit/core";
+import { Octokit } from "@octokit/rest";
 import { RequestOptions } from "@octokit/types";
 import { paginateRest } from "@octokit/plugin-paginate-rest";
 import { restEndpointMethods } from "@octokit/plugin-rest-endpoint-methods";
@@ -24,5 +24,5 @@ const defaultOptions = {
 };
 
 export const customOctokit = Octokit.plugin(throttling, retry, paginateRest, restEndpointMethods, paginateGraphQL).defaults((instanceOptions: object) => {
-  return Object.assign({}, defaultOptions, instanceOptions);
+  return { ...defaultOptions, ...instanceOptions};
 });