From ecc198cbe373d27412a10138bf4a5ed64ed701bc Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@davidglasser.net>
Date: Tue, 26 Mar 2019 11:00:19 -0700
Subject: [PATCH] Revert "Extract TypeScript utility types to
 `apollo-server-env` (#2415)"

This reverts commit 3a3c67dcfc1537e5b9f3a0a51ef38df5590a6d87.

Revert this and #2417 on release-2.5.0 because having apollo-server-plugin-base
use newly added types from apollo-server-env yet only declare it as a
devDependency meant that TypeScript consumers of the published alpha packages
could end up breaking because the import of apollo-server-env could be resolved
to an older version of the package without the newly added types.

I'm not sure if this reversion is the right long term answer vs making the
apollo-server-env dependency non-dev, but this will let the alpha process for
2.5.0 move forward for now.
---
 packages/apollo-datasource-rest/src/RESTDataSource.ts       | 3 ++-
 packages/apollo-server-env/src/index.d.ts                   | 1 -
 .../apollo-server-env/src/typescript-utility-types.d.ts     | 2 --
 packages/apollo-server-plugin-base/src/index.ts             | 6 ++++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 packages/apollo-server-env/src/typescript-utility-types.d.ts

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> = T | Promise<T>;
+
 export abstract class RESTDataSource<TContext = any> 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> = T | Promise<T>;
-export type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
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> = T | Promise<T>;
+
 export interface ApolloServerPlugin {
   serverWillStart?(service: GraphQLServiceContext): ValueOrPromise<void>;
   requestDidStart?<TContext>(
@@ -20,6 +20,8 @@ export interface ApolloServerPlugin {
   ): GraphQLRequestListener<TContext> | void;
 }
 
+export type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
+
 export interface GraphQLRequestListener<TContext = Record<string, any>> {
   parsingDidStart?(
     requestContext: WithRequired<