From eb5fdefed9bd8e0a0de49167898dfd8a40cef5f2 Mon Sep 17 00:00:00 2001 From: Luke Tomlinson Date: Mon, 27 Jun 2022 10:38:58 -0400 Subject: [PATCH 1/2] Add additionalPlugins parameter to getOctokit method --- packages/github/src/github.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/github/src/github.ts b/packages/github/src/github.ts index bada7e522d..c8a20fed1e 100644 --- a/packages/github/src/github.ts +++ b/packages/github/src/github.ts @@ -2,7 +2,7 @@ import * as Context from './context' import {GitHub, getOctokitOptions} from './utils' // octokit + plugins -import {OctokitOptions} from '@octokit/core/dist-types/types' +import {OctokitOptions, OctokitPlugin} from '@octokit/core/dist-types/types' export const context = new Context.Context() @@ -14,7 +14,12 @@ export const context = new Context.Context() */ export function getOctokit( token: string, - options?: OctokitOptions + options?: OctokitOptions, + ...additionalPlugins: OctokitPlugin[] ): InstanceType { + if (additionalPlugins.length) { + const GitHubWithPlugins = GitHub.plugin(...additionalPlugins) + return new GitHubWithPlugins(getOctokitOptions(token, options)) + } return new GitHub(getOctokitOptions(token, options)) } From 101ce7178d5da23b86055448e76e43ba7da55056 Mon Sep 17 00:00:00 2001 From: Luke Tomlinson Date: Thu, 22 Sep 2022 13:45:56 -0400 Subject: [PATCH 2/2] Simplify getOctokit --- packages/github/src/github.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/github/src/github.ts b/packages/github/src/github.ts index c8a20fed1e..b4ed7133e4 100644 --- a/packages/github/src/github.ts +++ b/packages/github/src/github.ts @@ -17,9 +17,6 @@ export function getOctokit( options?: OctokitOptions, ...additionalPlugins: OctokitPlugin[] ): InstanceType { - if (additionalPlugins.length) { - const GitHubWithPlugins = GitHub.plugin(...additionalPlugins) - return new GitHubWithPlugins(getOctokitOptions(token, options)) - } - return new GitHub(getOctokitOptions(token, options)) + const GitHubWithPlugins = GitHub.plugin(...additionalPlugins) + return new GitHubWithPlugins(getOctokitOptions(token, options)) }