diff --git a/packages/apollo-datasource-rest/src/RESTDataSource.ts b/packages/apollo-datasource-rest/src/RESTDataSource.ts index fc12f508884..26d7a492a3c 100644 --- a/packages/apollo-datasource-rest/src/RESTDataSource.ts +++ b/packages/apollo-datasource-rest/src/RESTDataSource.ts @@ -7,7 +7,6 @@ import { URL, URLSearchParams, URLSearchParamsInit, - ValueOrPromise, } from 'apollo-server-env'; import { DataSource, DataSourceConfig } from 'apollo-datasource'; @@ -42,6 +41,8 @@ export interface CacheOptions { export type Body = BodyInit | object; export { Request }; +type ValueOrPromise = T | Promise; + export abstract class RESTDataSource extends DataSource { httpCache!: HTTPCache; context!: TContext; diff --git a/packages/apollo-server-env/src/index.d.ts b/packages/apollo-server-env/src/index.d.ts index 896661f362c..e6239128c40 100644 --- a/packages/apollo-server-env/src/index.d.ts +++ b/packages/apollo-server-env/src/index.d.ts @@ -1,3 +1,2 @@ export * from './fetch'; export * from './url'; -export * from './typescript-utility-types'; diff --git a/packages/apollo-server-env/src/typescript-utility-types.d.ts b/packages/apollo-server-env/src/typescript-utility-types.d.ts deleted file mode 100644 index d041738e163..00000000000 --- a/packages/apollo-server-env/src/typescript-utility-types.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export type ValueOrPromise = T | Promise; -export type WithRequired = T & Required>; diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index c0329394ec5..71ab7c3c5b8 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -1,5 +1,3 @@ -import { ValueOrPromise, WithRequired } from 'apollo-server-env'; -export { WithRequired }; import { GraphQLServiceContext, GraphQLRequestContext, @@ -13,6 +11,8 @@ export { GraphQLResponse, }; +type ValueOrPromise = T | Promise; + export interface ApolloServerPlugin { serverWillStart?(service: GraphQLServiceContext): ValueOrPromise; requestDidStart?( @@ -20,6 +20,8 @@ export interface ApolloServerPlugin { ): GraphQLRequestListener | void; } +export type WithRequired = T & Required>; + export interface GraphQLRequestListener> { parsingDidStart?( requestContext: WithRequired<