fix: scoped github client imports

ssube · Feb 16, 2020 · d6002bc · d6002bc
1 parent b7a1e07
commit d6002bc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/config/rollup-named.json b/config/rollup-named.json
@@ -64,5 +64,8 @@
   ],
   "node_modules/node-emoji/index.js": [
     "find"
+  ],
+  "node_modules/@octokit/rest/index.js": [
+    "Octokit"
   ]
 }
diff --git a/src/listener/GithubListener.ts b/src/listener/GithubListener.ts
@@ -1,4 +1,4 @@
-import Octokit from '@octokit/rest';
+import { Octokit } from '@octokit/rest';
 import { Container, Inject } from 'noicejs';
 import { Repository } from 'typeorm';
 

diff --git a/src/utils/github/index.ts b/src/utils/github/index.ts
@@ -1,5 +1,5 @@
 import { App } from '@octokit/app';
-import Octokit from '@octokit/rest';
+import { Octokit } from '@octokit/rest';
 import { BaseOptions, Inject, Logger } from 'noicejs';
 
 import { INJECT_LOGGER } from '../../BaseService';

diff --git a/test/controller/github/TestCommitController.ts b/test/controller/github/TestCommitController.ts
@@ -1,4 +1,4 @@
-import { ChecksListForRefResponse, ReposGetCombinedStatusForRefResponse, Response } from '@octokit/rest';
+import { Octokit } from '@octokit/rest';
 import { expect } from 'chai';
 import { ineeda } from 'ineeda';
 import { spy } from 'sinon';
@@ -19,7 +19,7 @@ const TEST_TRANSFORM = 'test-transform';
 
 interface ClientResponse<T> {
   endpoint: any;
-  (params: any): Promise<Response<T>>;
+  (params: any): Promise<Octokit.Response<T>>;
 }
 
 describeLeaks('github commit controller', async () => {
@@ -32,7 +32,7 @@ describeLeaks('github commit controller', async () => {
       }),
     }));
 
-    const listForRef: ClientResponse<ChecksListForRefResponse> = (params: any) => Promise.resolve({
+    const listForRef: ClientResponse<Octokit.ChecksListForRefResponse> = (params: any) => Promise.resolve({
       [Symbol.iterator]: undefined as any,
       data: {
         check_runs: [],
@@ -43,7 +43,7 @@ describeLeaks('github commit controller', async () => {
     });
     listForRef.endpoint = undefined;
 
-    const getCombinedStatusForRef: ClientResponse<ReposGetCombinedStatusForRefResponse> = (params: any) => Promise.resolve({
+    const getCombinedStatusForRef: ClientResponse<Octokit.ReposGetCombinedStatusForRefResponse> = (params: any) => Promise.resolve({
       [Symbol.iterator]: undefined as any,
       data: {
         commit_url: '',

diff --git a/test/utils/github/TestClient.ts b/test/utils/github/TestClient.ts
@@ -1,5 +1,5 @@
 import { App } from '@octokit/app';
-import Octokit from '@octokit/rest';
+import { Octokit } from '@octokit/rest';
 import { expect } from 'chai';
 import { ineeda } from 'ineeda';
 import { match, spy, stub } from 'sinon';