Replace request with isomorphic-unfetch

Signed-off-by: Jason Kim <[email protected]>
IBM · Apr 26, 2020 · 2e98a77 · 2e98a77
1 parent 743c66b
commit 2e98a77
Show file tree

Hide file tree

Showing 9 changed files with 283 additions and 228 deletions.
diff --git a/packages/openapi-to-graphql/lib/index.js.map b/packages/openapi-to-graphql/lib/index.js.map
diff --git a/packages/openapi-to-graphql/lib/resolver_builder.d.ts b/packages/openapi-to-graphql/lib/resolver_builder.d.ts
@@ -1,8 +1,7 @@
-import { ConnectOptions } from './types/options';
+import { ConnectOptions, RequestOptions } from './types/options';
 import { Operation } from './types/operation';
 import { ResolveFunction, SubscriptionIterator } from './types/graphql';
 import { PreprocessingData } from './types/preprocessing_data';
-import * as NodeRequest from 'request';
 declare type GetResolverParams = {
     operation: Operation;
     argsFromLink?: {
@@ -12,7 +11,7 @@ declare type GetResolverParams = {
     responseName?: string;
     data: PreprocessingData;
     baseUrl?: string;
-    requestOptions?: NodeRequest.OptionsWithUrl;
+    requestOptions?: RequestOptions;
 };
 declare type GetSubscribeParams = {
     operation: Operation;

diff --git a/packages/openapi-to-graphql/lib/resolver_builder.js b/packages/openapi-to-graphql/lib/resolver_builder.js
diff --git a/packages/openapi-to-graphql/lib/resolver_builder.js.map b/packages/openapi-to-graphql/lib/resolver_builder.js.map
diff --git a/packages/openapi-to-graphql/lib/types/options.d.ts b/packages/openapi-to-graphql/lib/types/options.d.ts
@@ -1,4 +1,3 @@
-import * as NodeRequest from 'request';
 import { ResolveFunction, ResolveObject, GraphQLOperationType } from './graphql';
 /**
  * Type definition of the options that users can pass to OpenAPI-to-GraphQL.
@@ -19,6 +18,9 @@ export declare type Report = {
     numMutationsCreated: number;
     numSubscriptionsCreated: number;
 };
+export declare type RequestOptions = {
+    [key: string]: any;
+};
 export declare type ConnectOptions = {
     [key: string]: boolean | number | string;
 };
@@ -126,7 +128,7 @@ export declare type Options = {
      * calls to the API backend.
      * e.g. Setup the web proxy to use.
      */
-    requestOptions?: NodeRequest.OptionsWithUrl;
+    requestOptions?: RequestOptions;
     /**
      * Allows to override or add options to the PubSub connect object used to make
      * publish/subscribe to the API backend.
@@ -329,7 +331,7 @@ export declare type InternalOptions = {
      * calls to the API backend.
      * e.g. Setup the web proxy to use.
      */
-    requestOptions?: NodeRequest.OptionsWithUrl;
+    requestOptions?: RequestOptions;
     /**
      * Allows to override or add options to the PubSub connect object used to make
      * publish/subscribe to the API backend.

diff --git a/packages/openapi-to-graphql/package.json b/packages/openapi-to-graphql/package.json
@@ -71,10 +71,10 @@
     "form-urlencoded": "^4.1.1",
     "graphql-subscriptions": "^1.1.0",
     "graphql-type-json": "^0.2.1",
+    "isomorphic-unfetch": "^3.0.0",
     "jsonpath-plus": "^3.0.0",
     "oas-validator": "^3.1.0",
     "pluralize": "^8.0.0",
-    "request": "^2.88.0",
     "swagger2openapi": "^5.1.0"
   },
   "peerDependencies": {

diff --git a/packages/openapi-to-graphql/src/index.ts b/packages/openapi-to-graphql/src/index.ts
@@ -35,6 +35,7 @@ import {
   Options,
   InternalOptions,
   Report,
+  RequestOptions,
   ConnectOptions
 } from './types/options'
 import { Oas3, CallbackObject } from './types/oas3'
@@ -43,7 +44,6 @@ import { Args, Field, GraphQLOperationType } from './types/graphql'
 import { Operation } from './types/operation'
 import { PreprocessingData } from './types/preprocessing_data'
 import { GraphQLSchema, GraphQLObjectType } from 'graphql'
-import * as NodeRequest from 'request'
 
 // Imports:
 import { getGraphQLType, getArgs } from './schema_builder'
@@ -600,7 +600,7 @@ function getFieldForOperation(
   operation: Operation,
   baseUrl: string,
   data: PreprocessingData,
-  requestOptions: NodeRequest.OptionsWithUrl,
+  requestOptions: RequestOptions,
   connectOptions: ConnectOptions
 ): Field {
   // Create GraphQL Type for response: