fix: update Octokit import to use rest module

.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,
 };
 

.github/workflows/cspell.yml

@@ -12,13 +12,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - uses: oven-sh/setup-bun@v2
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: "20.10.0"
 
       - name: Install cspell
-        run: yarn add cspell
+        run: bun add -D cspell
 
       - name: Run cspell
-        run: yarn format:cspell
+        run: bun format:cspell

.github/workflows/knip.yml

@@ -10,23 +10,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # needed to use yarn v4
-      - name: Enable corepack
-        run: corepack enable
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: 20.10.0
 
+      - uses: oven-sh/setup-bun@v2
+
       - name: Install toolchain
-        run: yarn install
+        run: bun install
 
       - name: Store PR number
         run: echo ${{ github.event.number }} > pr-number.txt
 
       - name: Run Knip
-        run: yarn knip || yarn knip --reporter json > knip-results.json
+        run: bun knip || bun knip --reporter json > knip-results.json
 
       - name: Upload knip result
         if: failure()

.github/workflows/no-empty-strings.yml

@@ -19,12 +19,13 @@ jobs:
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
+      - uses: oven-sh/setup-bun@v2
       - name: Install Dependencies
         run: |
-          yarn add tsx simple-git
+          bun add -D simple-git
       - name: Check for Empty Strings
         run: |
-          yarn tsx .github/empty-string-checker.ts
+          bun .github/empty-string-checker.ts
         env:
           GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           GITHUB_REPOSITORY: ${{ github.repository }}

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};
 });