diff --git a/package.json b/package.json index fd28bc6..776ec32 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,11 @@ "open-source" ], "dependencies": { + "@actions/core": "^1.11.1", + "@octokit/plugin-rest-endpoint-methods": "^13.2.6", "@sinclair/typebox": "0.34.3", + "@ubiquity-os/plugin-sdk": "^1.1.0", "@ubiquity-os/ubiquity-os-logger": "1.3.2", - "@ubiquity-os/plugin-sdk": "^1.0.11", "dotenv": "16.4.5", "ms": "2.1.3", "ts-retry": "4.2.5" diff --git a/src/helpers/update-pull-requests.ts b/src/helpers/update-pull-requests.ts index d579132..e29a86d 100644 --- a/src/helpers/update-pull-requests.ts +++ b/src/helpers/update-pull-requests.ts @@ -1,4 +1,4 @@ -import { RestEndpointMethodTypes } from "@octokit/rest"; +import { RestEndpointMethodTypes } from "@octokit/plugin-rest-endpoint-methods"; import ms from "ms"; import { getAllTimelineEvents } from "../handlers/github-events"; import { generateSummary, ResultInfo } from "../handlers/summary"; diff --git a/tests/main.test.ts b/tests/main.test.ts index 83eb3cf..db3ea65 100644 --- a/tests/main.test.ts +++ b/tests/main.test.ts @@ -1,5 +1,4 @@ import { drop } from "@mswjs/data"; -import { Octokit } from "@octokit/rest"; import { http, HttpResponse } from "msw"; import * as githubHelpers from "../src/helpers/github"; import { db } from "./__mocks__/db"; @@ -9,6 +8,7 @@ import { Context, pluginSettingsSchema } from "../src/types"; import seed from "./__mocks__/seed.json"; import { Logs } from "@ubiquity-os/ubiquity-os-logger"; import { Value } from "@sinclair/typebox/value"; +import { customOctokit as Octokit } from "@ubiquity-os/plugin-sdk/octokit"; const mergePullRequest = jest.fn(); diff --git a/yarn.lock b/yarn.lock index 7ace8f9..f161dbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1770,11 +1770,6 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== -"@sinclair/typebox@^0.33.21": - version "0.33.22" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.33.22.tgz#3339d85172509095a8384cb4b44834a7c9309d86" - integrity sha512-auUj4k+f4pyrIVf4GW5UKquSZFHJWri06QgARy9C0t9ZTjJLIuNIrr1yl9bWcJWJ1Gz1vOvYN1D+QPaIlNMVkQ== - "@sinonjs/commons@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd" @@ -2053,10 +2048,10 @@ "@typescript-eslint/types" "8.14.0" eslint-visitor-keys "^3.4.3" -"@ubiquity-os/plugin-sdk@^1.0.11": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@ubiquity-os/plugin-sdk/-/plugin-sdk-1.0.11.tgz#b45029a0bd7469b19e71d4685d9ee8e7163afe38" - integrity sha512-BlZbqOfuBYMFyDEJfPc9HCrr5l8m3uNOXmPXr/M8/UFwZT+nHfZfB+AULoY0Goyx2BX1JaHd5bgDjJG1PwozPA== +"@ubiquity-os/plugin-sdk@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@ubiquity-os/plugin-sdk/-/plugin-sdk-1.1.0.tgz#94f5fa276dad0d9279189aa67adbf0fee7e0f321" + integrity sha512-kiapUg6Fuc5cK0zo9Gy4B9uu1yvh3x7oTPRhGeaonjkyZNfM3xr387yshdazl4nwy2ePeyCrVc294miTBHpzpQ== dependencies: "@actions/core" "^1.11.1" "@actions/github" "^6.0.0" @@ -2069,7 +2064,6 @@ "@octokit/rest" "^21.0.2" "@octokit/types" "^13.6.1" "@octokit/webhooks" "^13.3.0" - "@sinclair/typebox" "^0.33.21" "@ubiquity-os/ubiquity-os-logger" "^1.3.2" dotenv "^16.4.5" hono "^4.6.9" @@ -2696,6 +2690,13 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -2707,6 +2708,15 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^7.0.1: + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"