refactor: adapt for latest universal-user-agent

gr2m · gr2m · commit bb366cc6d34c · 2019-10-06T14:55:31.000-07:00
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
-import getUserAgent from "universal-user-agent";
+import { getUserAgent } from "universal-user-agent";
 import { Collection, HookCollection } from "before-after-hook";
 import { request } from "@octokit/request";
-import { graphql } from "@octokit/graphql";
+import { graphql, withCustomRequest } from "@octokit/graphql";
 
 import { OctokitOptions, Parameters, Plugin } from "./types";
 import { VERSION } from "./version";
@@ -62,7 +62,7 @@ export class Octokit {
     }
 
     this.request = request.defaults(requestDefaults);
-    this.graphql = graphql.defaults(requestDefaults);
+    this.graphql = withCustomRequest(this.request).defaults(requestDefaults);
     this.hook = hook;
 
     // apply plugins
diff --git a/test/auth.test.ts b/test/auth.test.ts
@@ -1,4 +1,4 @@
-import getUserAgent from "universal-user-agent";
+import { getUserAgent } from "universal-user-agent";
 import fetchMock, { MockMatcherFunction } from "fetch-mock";
 import { Response } from "node-fetch";
 import {
diff --git a/test/graphql.test.ts b/test/graphql.test.ts
@@ -1,4 +1,4 @@
-import getUserAgent from "universal-user-agent";
+import { getUserAgent } from "universal-user-agent";
 import fetchMock from "fetch-mock";
 
 import { Octokit } from "../src";
diff --git a/test/hook.test.ts b/test/hook.test.ts
@@ -1,4 +1,4 @@
-import getUserAgent from "universal-user-agent";
+import { getUserAgent } from "universal-user-agent";
 import fetchMock from "fetch-mock";
 
 import { Octokit } from "../src";
diff --git a/test/request.test.ts b/test/request.test.ts
@@ -1,4 +1,4 @@
-import getUserAgent from "universal-user-agent";
+import { getUserAgent } from "universal-user-agent";
 import fetchMock from "fetch-mock";
 
 import { Octokit } from "../src";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import getUserAgent from "universal-user-agent";`
	`1`	`+import { getUserAgent } from "universal-user-agent";`
`2`	`2`	`import fetchMock, { MockMatcherFunction } from "fetch-mock";`
`3`	`3`	`import { Response } from "node-fetch";`
`4`	`4`	`import {`