From 94fdf49554d69440af02d6f6e0c8639dc2f3c8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Tue, 12 Jan 2021 09:44:54 +0100 Subject: [PATCH] Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version --- .changeset/great-vans-happen.md | 11 ++ .github/styles/vocab.txt | 1 + package.json | 2 +- packages/app/package.json | 2 +- packages/backend/package.json | 2 +- packages/cli/package.json | 2 +- .../packages/backend/package.json.hbs | 2 +- plugins/catalog-backend/package.json | 2 +- plugins/catalog-import/package.json | 2 +- plugins/cloudbuild/package.json | 2 - plugins/github-actions/package.json | 3 +- .../src/api/GithubActionsApi.ts | 23 ++-- .../src/api/GithubActionsClient.ts | 24 ++-- .../WorkflowRunDetails/WorkflowRunDetails.tsx | 6 +- .../src/components/useWorkflowRuns.ts | 71 ++++++------ plugins/scaffolder-backend/package.json | 3 +- .../scaffolder/stages/publish/github.test.ts | 29 ++--- yarn.lock | 103 +++++++++++++----- 18 files changed, 172 insertions(+), 118 deletions(-) create mode 100644 .changeset/great-vans-happen.md diff --git a/.changeset/great-vans-happen.md b/.changeset/great-vans-happen.md new file mode 100644 index 0000000000..45d6eb2ee9 --- /dev/null +++ b/.changeset/great-vans-happen.md @@ -0,0 +1,11 @@ +--- +'@backstage/cli': patch +'@backstage/create-app': patch +'@backstage/plugin-catalog-backend': patch +'@backstage/plugin-catalog-import': patch +'@backstage/plugin-cloudbuild': patch +'@backstage/plugin-github-actions': patch +'@backstage/plugin-scaffolder-backend': patch +--- + +Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt index a79d27bcec..a71887f796 100644 --- a/.github/styles/vocab.txt +++ b/.github/styles/vocab.txt @@ -143,6 +143,7 @@ npm nvarchar nvm OAuth +octokit oidc Okta Oldsberg diff --git a/package.json b/package.json index 8376915729..e2e3f1b075 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "version": "1.0.0", "devDependencies": { "@changesets/cli": "^2.11.0", - "@octokit/openapi-types": "^2.0.0", + "@octokit/openapi-types": "^2.2.0", "@spotify/eslint-config-oss": "^1.0.1", "@spotify/prettier-config": "^9.0.0", "command-exists": "^1.2.9", diff --git a/packages/app/package.json b/packages/app/package.json index faa37a2378..e83af5a0c6 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -36,7 +36,7 @@ "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", - "@octokit/rest": "^18.0.0", + "@octokit/rest": "^18.0.12", "@roadiehq/backstage-plugin-buildkite": "^0.1.3", "@roadiehq/backstage-plugin-github-insights": "^0.2.16", "@roadiehq/backstage-plugin-github-pull-requests": "^0.6.3", diff --git a/packages/backend/package.json b/packages/backend/package.json index 0ecb44bf0b..1e6819b7b8 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -40,7 +40,7 @@ "@backstage/plugin-scaffolder-backend": "^0.4.0", "@backstage/plugin-techdocs-backend": "^0.5.0", "@gitbeaker/node": "^28.0.2", - "@octokit/rest": "^18.0.0", + "@octokit/rest": "^18.0.12", "azure-devops-node-api": "^10.1.1", "dockerode": "^3.2.1", "example-app": "^0.2.8", diff --git a/packages/cli/package.json b/packages/cli/package.json index 277f710b5e..f6512b6261 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -34,7 +34,7 @@ "@hot-loader/react-dom": "^16.13.0", "@lerna/package-graph": "^3.18.5", "@lerna/project": "^3.18.0", - "@octokit/request": "^5.2.0", + "@octokit/request": "^5.4.12", "@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-json": "^4.0.2", "@rollup/plugin-node-resolve": "^9.0.0", diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs index d9e7726c06..7b7429d838 100644 --- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs @@ -27,8 +27,8 @@ "@backstage/plugin-proxy-backend": "^{{version '@backstage/plugin-proxy-backend'}}", "@backstage/plugin-scaffolder-backend": "^{{version '@backstage/plugin-scaffolder-backend'}}", "@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}", - "@octokit/rest": "^18.0.0", "@gitbeaker/node": "^28.0.2", + "@octokit/rest": "^18.0.12", "dockerode": "^3.2.1", "express": "^4.17.1", "express-promise-router": "^3.0.3", diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index 8fc9712777..9a782ac1e5 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -34,7 +34,7 @@ "@backstage/backend-common": "^0.4.2", "@backstage/catalog-model": "^0.6.0", "@backstage/config": "^0.1.2", - "@octokit/graphql": "^4.5.6", + "@octokit/graphql": "^4.5.8", "@types/express": "^4.17.6", "@types/ldapjs": "^1.0.9", "codeowners-utils": "^1.0.2", diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index d308bef7b8..1a7d22d551 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -38,7 +38,7 @@ "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@octokit/rest": "^18.0.6", + "@octokit/rest": "^18.0.12", "git-url-parse": "^11.4.3", "react": "^16.13.1", "react-dom": "^16.13.1", diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json index 7cac2e6a68..9434ec70c8 100644 --- a/plugins/cloudbuild/package.json +++ b/plugins/cloudbuild/package.json @@ -37,8 +37,6 @@ "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@octokit/rest": "^18.0.0", - "@octokit/types": "^5.4.1", "moment": "^2.27.0", "qs": "^6.9.4", "react": "^16.13.1", diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index 94b69935d0..f876eb9e7c 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -40,8 +40,7 @@ "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@octokit/rest": "^18.0.0", - "@octokit/types": "^5.4.1", + "@octokit/rest": "^18.0.12", "moment": "^2.27.0", "react": "^16.13.1", "react-dom": "^16.13.1", diff --git a/plugins/github-actions/src/api/GithubActionsApi.ts b/plugins/github-actions/src/api/GithubActionsApi.ts index bf79e74351..75086998c9 100644 --- a/plugins/github-actions/src/api/GithubActionsApi.ts +++ b/plugins/github-actions/src/api/GithubActionsApi.ts @@ -15,12 +15,7 @@ */ import { createApiRef } from '@backstage/core'; -import { - ActionsListWorkflowRunsForRepoResponseData, - ActionsGetWorkflowResponseData, - ActionsGetWorkflowRunResponseData, - EndpointInterface, -} from '@octokit/types'; +import { RestEndpointMethodTypes } from '@octokit/rest'; export const githubActionsApiRef = createApiRef({ id: 'plugin.githubactions.service', @@ -42,7 +37,9 @@ export type GithubActionsApi = { pageSize?: number; page?: number; branch?: string; - }) => Promise; + }) => Promise< + RestEndpointMethodTypes['actions']['listWorkflowRuns']['response']['data'] + >; getWorkflow: ({ token, owner, @@ -53,7 +50,9 @@ export type GithubActionsApi = { owner: string; repo: string; id: number; - }) => Promise; + }) => Promise< + RestEndpointMethodTypes['actions']['getWorkflow']['response']['data'] + >; getWorkflowRun: ({ token, owner, @@ -64,7 +63,9 @@ export type GithubActionsApi = { owner: string; repo: string; id: number; - }) => Promise; + }) => Promise< + RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data'] + >; reRunWorkflow: ({ token, owner, @@ -86,5 +87,7 @@ export type GithubActionsApi = { owner: string; repo: string; runId: number; - }) => Promise; + }) => Promise< + RestEndpointMethodTypes['actions']['downloadJobLogsForWorkflowRun']['response']['data'] + >; }; diff --git a/plugins/github-actions/src/api/GithubActionsClient.ts b/plugins/github-actions/src/api/GithubActionsClient.ts index 94fb774537..5be2c9a743 100644 --- a/plugins/github-actions/src/api/GithubActionsClient.ts +++ b/plugins/github-actions/src/api/GithubActionsClient.ts @@ -15,13 +15,7 @@ */ import { GithubActionsApi } from './GithubActionsApi'; -import { Octokit } from '@octokit/rest'; -import { - ActionsListWorkflowRunsForRepoResponseData, - ActionsGetWorkflowResponseData, - ActionsGetWorkflowRunResponseData, - EndpointInterface, -} from '@octokit/types'; +import { Octokit, RestEndpointMethodTypes } from '@octokit/rest'; export class GithubActionsClient implements GithubActionsApi { async reRunWorkflow({ @@ -55,7 +49,9 @@ export class GithubActionsClient implements GithubActionsApi { pageSize?: number; page?: number; branch?: string; - }): Promise { + }): Promise< + RestEndpointMethodTypes['actions']['listWorkflowRuns']['response']['data'] + > { const workflowRuns = await new Octokit({ auth: token, }).actions.listWorkflowRunsForRepo({ @@ -77,7 +73,9 @@ export class GithubActionsClient implements GithubActionsApi { owner: string; repo: string; id: number; - }): Promise { + }): Promise< + RestEndpointMethodTypes['actions']['getWorkflow']['response']['data'] + > { const workflow = await new Octokit({ auth: token }).actions.getWorkflow({ owner, repo, @@ -95,7 +93,9 @@ export class GithubActionsClient implements GithubActionsApi { owner: string; repo: string; id: number; - }): Promise { + }): Promise< + RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data'] + > { const run = await new Octokit({ auth: token }).actions.getWorkflowRun({ owner, repo, @@ -113,7 +113,9 @@ export class GithubActionsClient implements GithubActionsApi { owner: string; repo: string; runId: number; - }): Promise { + }): Promise< + RestEndpointMethodTypes['actions']['downloadJobLogsForWorkflowRun']['response']['data'] + > { const workflow = await new Octokit({ auth: token, }).actions.downloadJobLogsForWorkflowRun({ diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx index a2753589eb..ac238b8d0f 100644 --- a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx +++ b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx @@ -209,8 +209,8 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => { @@ -218,7 +218,7 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => { Author - {`${details.value?.head_commit.author.name} (${details.value?.head_commit.author.email})`} + {`${details.value?.head_commit.author?.name} (${details.value?.head_commit.author?.email})`} diff --git a/plugins/github-actions/src/components/useWorkflowRuns.ts b/plugins/github-actions/src/components/useWorkflowRuns.ts index d0be852beb..4261012c26 100644 --- a/plugins/github-actions/src/components/useWorkflowRuns.ts +++ b/plugins/github-actions/src/components/useWorkflowRuns.ts @@ -18,7 +18,6 @@ import { useAsyncRetry } from 'react-use'; import { WorkflowRun } from './WorkflowRunsTable/WorkflowRunsTable'; import { githubActionsApiRef } from '../api/GithubActionsApi'; import { useApi, githubAuthApiRef, errorApiRef } from '@backstage/core'; -import { ActionsListWorkflowRunsForRepoResponseData } from '@octokit/types'; export function useWorkflowRuns({ owner, @@ -55,44 +54,40 @@ export function useWorkflowRuns({ page: page + 1, branch, }) - .then( - ( - workflowRunsData: ActionsListWorkflowRunsForRepoResponseData, - ): WorkflowRun[] => { - setTotal(workflowRunsData.total_count); - // Transformation here - return workflowRunsData.workflow_runs.map(run => ({ - message: run.head_commit.message, - id: `${run.id}`, - onReRunClick: async () => { - try { - await api.reRunWorkflow({ - token, - owner, - repo, - runId: run.id, - }); - } catch (e) { - errorApi.post(e); - } + .then((workflowRunsData): WorkflowRun[] => { + setTotal(workflowRunsData.total_count); + // Transformation here + return workflowRunsData.workflow_runs.map(run => ({ + message: run.head_commit.message, + id: `${run.id}`, + onReRunClick: async () => { + try { + await api.reRunWorkflow({ + token, + owner, + repo, + runId: run.id, + }); + } catch (e) { + errorApi.post(e); + } + }, + source: { + branchName: run.head_branch, + commit: { + hash: run.head_commit.id, + url: run.head_repository.branches_url.replace( + '{/branch}', + run.head_branch, + ), }, - source: { - branchName: run.head_branch, - commit: { - hash: run.head_commit.id, - url: run.head_repository.branches_url.replace( - '{/branch}', - run.head_branch, - ), - }, - }, - status: run.status, - conclusion: run.conclusion, - url: run.url, - githubUrl: run.html_url, - })); - }, - ) + }, + status: run.status, + conclusion: run.conclusion, + url: run.url, + githubUrl: run.html_url, + })); + }) ); }, [page, pageSize, repo, owner]); diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index efbc73ff4b..7855dcd349 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -35,7 +35,7 @@ "@backstage/integration": "^0.1.5", "@gitbeaker/core": "^28.0.2", "@gitbeaker/node": "^28.0.2", - "@octokit/rest": "^18.0.0", + "@octokit/rest": "^18.0.12", "@types/dockerode": "^3.2.1", "@types/express": "^4.17.6", "azure-devops-node-api": "^10.1.1", @@ -60,7 +60,6 @@ "devDependencies": { "@backstage/cli": "^0.4.5", "@backstage/test-utils": "^0.1.5", - "@octokit/types": "^5.4.1", "@types/fs-extra": "^9.0.1", "@types/git-url-parse": "^9.0.0", "@types/supertest": "^2.0.8", diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts index 22f1cd3172..2487076605 100644 --- a/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts @@ -17,15 +17,10 @@ jest.mock('@octokit/rest'); jest.mock('./helpers'); -import { Octokit } from '@octokit/rest'; -import { - OctokitResponse, - ReposCreateInOrgResponseData, - UsersGetByUsernameResponseData, -} from '@octokit/types'; +import { getVoidLogger } from '@backstage/backend-common'; +import { Octokit, RestEndpointMethodTypes } from '@octokit/rest'; import { GithubPublisher } from './github'; import { initRepoAndPush } from './helpers'; -import { getVoidLogger } from '@backstage/backend-common'; const { mockGithubClient } = require('@octokit/rest') as { mockGithubClient: { @@ -54,12 +49,12 @@ describe('GitHub Publisher', () => { data: { clone_url: 'https://github.com/backstage/backstage.git', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['repos']['createInOrg']['response']); mockGithubClient.users.getByUsername.mockResolvedValue({ data: { type: 'Organization', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['users']['getByUsername']['response']); const result = await publisher.publish({ values: { @@ -104,12 +99,12 @@ describe('GitHub Publisher', () => { data: { clone_url: 'https://github.com/backstage/backstage.git', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['repos']['createForAuthenticatedUser']['response']); mockGithubClient.users.getByUsername.mockResolvedValue({ data: { type: 'User', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['users']['getByUsername']['response']); const result = await publisher.publish({ values: { @@ -148,12 +143,12 @@ describe('GitHub Publisher', () => { data: { clone_url: 'https://github.com/backstage/backstage.git', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['repos']['createForAuthenticatedUser']['response']); mockGithubClient.users.getByUsername.mockResolvedValue({ data: { type: 'User', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['users']['getByUsername']['response']); const result = await publisher.publish({ values: { @@ -205,12 +200,12 @@ describe('GitHub Publisher', () => { data: { clone_url: 'https://github.com/backstage/backstage.git', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['repos']['createInOrg']['response']); mockGithubClient.users.getByUsername.mockResolvedValue({ data: { type: 'Organization', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['users']['getByUsername']['response']); const result = await publisher.publish({ values: { @@ -254,12 +249,12 @@ describe('GitHub Publisher', () => { data: { clone_url: 'https://github.com/backstage/backstage.git', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['repos']['createForAuthenticatedUser']['response']); mockGithubClient.users.getByUsername.mockResolvedValue({ data: { type: 'User', }, - } as OctokitResponse); + } as RestEndpointMethodTypes['users']['getByUsername']['response']); const result = await publisher.publish({ values: { diff --git a/yarn.lock b/yarn.lock index 339e810697..b10819d4f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4668,6 +4668,13 @@ dependencies: "@octokit/types" "^2.0.0" +"@octokit/auth-token@^2.4.4": + version "2.4.4" + resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56" + integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q== + dependencies: + "@octokit/types" "^6.0.0" + "@octokit/core@^3.0.0": version "3.1.0" resolved "https://registry.npmjs.org/@octokit/core/-/core-3.1.0.tgz#9c3c9b23f7504668cfa057f143ccbf0c645a0ac9" @@ -4680,6 +4687,18 @@ before-after-hook "^2.1.0" universal-user-agent "^5.0.0" +"@octokit/core@^3.2.3": + version "3.2.4" + resolved "https://registry.npmjs.org/@octokit/core/-/core-3.2.4.tgz#5791256057a962eca972e31818f02454897fd106" + integrity sha512-d9dTsqdePBqOn7aGkyRFe7pQpCXdibSJ5SFnrTr0axevObZrpz3qkWm7t/NjYv5a66z6vhfteriaq4FRz3e0Qg== + dependencies: + "@octokit/auth-token" "^2.4.4" + "@octokit/graphql" "^4.5.8" + "@octokit/request" "^5.4.12" + "@octokit/types" "^6.0.3" + before-after-hook "^2.1.0" + universal-user-agent "^6.0.0" + "@octokit/endpoint@^6.0.1": version "6.0.3" resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.3.tgz#dd09b599662d7e1b66374a177ab620d8cdf73487" @@ -4698,19 +4717,19 @@ "@octokit/types" "^5.0.0" universal-user-agent "^5.0.0" -"@octokit/graphql@^4.5.6": - version "4.5.6" - resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.6.tgz#708143ba15cf7c1879ed6188266e7f270be805d4" - integrity sha512-Rry+unqKTa3svswT2ZAuqenpLrzJd+JTv89LTeVa5UM/5OX8o4KTkPL7/1ABq4f/ZkELb0XEK/2IEoYwykcLXg== +"@octokit/graphql@^4.5.8": + version "4.5.8" + resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.8.tgz#d42373633c3015d0eafce64a8ce196be167fdd9b" + integrity sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA== dependencies: "@octokit/request" "^5.3.0" - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^2.0.0": - version "2.0.1" - resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz#7453d8281ce66b8ed1607f7ac7d751c3baffd2cc" - integrity sha512-9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q== +"@octokit/openapi-types@^2.2.0": + version "2.2.0" + resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.2.0.tgz#123e0438a0bc718ccdac3b5a2e69b3dd00daa85b" + integrity sha512-274lNUDonw10kT8wHg8fCcUc1ZjZHbWv0/TbAwb0ojhBQqZYc1cQ/4yqTVTtPMDeZ//g7xVEYe/s3vURkRghPg== "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" @@ -4731,11 +4750,23 @@ dependencies: "@octokit/types" "^5.0.0" +"@octokit/plugin-paginate-rest@^2.6.2": + version "2.7.0" + resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.7.0.tgz#6bb7b043c246e0654119a6ec4e72a172c9e2c7f3" + integrity sha512-+zARyncLjt9b0FjqPAbJo4ss7HOlBi1nprq+cPlw5vu2+qjy7WvlXhtXFdRHQbSL1Pt+bfAKaLADEkkvg8sP8w== + dependencies: + "@octokit/types" "^6.0.1" + "@octokit/plugin-request-log@^1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e" integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw== +"@octokit/plugin-request-log@^1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44" + integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg== + "@octokit/plugin-rest-endpoint-methods@2.4.0": version "2.4.0" resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz#3288ecf5481f68c494dd0602fc15407a59faf61e" @@ -4752,12 +4783,12 @@ "@octokit/types" "^5.4.1" deprecation "^2.3.1" -"@octokit/plugin-rest-endpoint-methods@4.2.0": - version "4.2.0" - resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.2.0.tgz#c5a0691b3aba5d8b4ef5dffd6af3649608f167ba" - integrity sha512-1/qn1q1C1hGz6W/iEDm9DoyNoG/xdFDt78E3eZ5hHeUfJTLJgyAMdj9chL/cNBHjcjd+FH5aO1x0VCqR2RE0mw== +"@octokit/plugin-rest-endpoint-methods@4.4.1": + version "4.4.1" + resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.4.1.tgz#105cf93255432155de078c9efc33bd4e14d1cd63" + integrity sha512-+v5PcvrUcDeFXf8hv1gnNvNLdm4C0+2EiuWt9EatjjUmfriM1pTMM+r4j1lLHxeBQ9bVDmbywb11e3KjuavieA== dependencies: - "@octokit/types" "^5.5.0" + "@octokit/types" "^6.1.0" deprecation "^2.3.1" "@octokit/request-error@^1.0.2": @@ -4792,6 +4823,20 @@ once "^1.4.0" universal-user-agent "^5.0.0" +"@octokit/request@^5.4.12": + version "5.4.12" + resolved "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc" + integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg== + dependencies: + "@octokit/endpoint" "^6.0.1" + "@octokit/request-error" "^2.0.0" + "@octokit/types" "^6.0.3" + deprecation "^2.0.0" + is-plain-object "^5.0.0" + node-fetch "^2.6.1" + once "^1.4.0" + universal-user-agent "^6.0.0" + "@octokit/rest@^16.28.4": version "16.43.1" resolved "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz#3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b" @@ -4824,15 +4869,15 @@ "@octokit/plugin-request-log" "^1.0.0" "@octokit/plugin-rest-endpoint-methods" "4.1.4" -"@octokit/rest@^18.0.6": - version "18.0.6" - resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.0.6.tgz#76c274f1a68f40741a131768ef483f041e7b98b6" - integrity sha512-ES4lZBKPJMX/yUoQjAZiyFjei9pJ4lTTfb9k7OtYoUzKPDLl/M8jiHqt6qeSauyU4eZGLw0sgP1WiQl9FYeM5w== +"@octokit/rest@^18.0.12": + version "18.0.12" + resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.0.12.tgz#278bd41358c56d87c201e787e8adc0cac132503a" + integrity sha512-hNRCZfKPpeaIjOVuNJzkEL6zacfZlBPV8vw8ReNeyUkVvbuCvvrrx8K8Gw2eyHHsmd4dPlAxIXIZ9oHhJfkJpw== dependencies: - "@octokit/core" "^3.0.0" - "@octokit/plugin-paginate-rest" "^2.2.0" - "@octokit/plugin-request-log" "^1.0.0" - "@octokit/plugin-rest-endpoint-methods" "4.2.0" + "@octokit/core" "^3.2.3" + "@octokit/plugin-paginate-rest" "^2.6.2" + "@octokit/plugin-request-log" "^1.0.2" + "@octokit/plugin-rest-endpoint-methods" "4.4.1" "@octokit/types@^2.0.0", "@octokit/types@^2.0.1": version "2.5.0" @@ -4855,11 +4900,12 @@ dependencies: "@types/node" ">= 8" -"@octokit/types@^5.5.0": - version "5.5.0" - resolved "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b" - integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ== +"@octokit/types@^6.0.0", "@octokit/types@^6.0.1", "@octokit/types@^6.0.3", "@octokit/types@^6.1.0": + version "6.2.1" + resolved "https://registry.npmjs.org/@octokit/types/-/types-6.2.1.tgz#7f881fe44475ab1825776a4a59ca1ae082ed1043" + integrity sha512-jHs9OECOiZxuEzxMZcXmqrEO8GYraHF+UzNVH2ACYh8e/Y7YoT+hUf9ldvVd6zIvWv4p3NdxbQ0xx3ku5BnSiA== dependencies: + "@octokit/openapi-types" "^2.2.0" "@types/node" ">= 8" "@open-draft/until@^1.0.3": @@ -15739,6 +15785,11 @@ is-plain-object@^3.0.0: dependencies: isobject "^4.0.0" +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-potential-custom-element-name@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"