From 61b4939327ec0778b65ffd0e145e5dc8a67f17ea Mon Sep 17 00:00:00 2001
From: Prosper Otemuyiwa <prosper@meteor.com>
Date: Tue, 10 Jul 2018 05:36:34 +0100
Subject: [PATCH] Enable GraphQLUpload for Apollo Server 2.0 (#1322)

* export GraphQLUpload

* fix GraphQLScalar typing
---
 packages/apollo-server-core/src/index.ts    | 4 ++++
 packages/apollo-server-express/src/index.ts | 6 ++++--
 packages/apollo-server-hapi/src/index.ts    | 6 ++++--
 packages/apollo-server-koa/src/index.ts     | 6 ++++--
 packages/apollo-server-lambda/src/index.ts  | 6 ++++--
 packages/apollo-server-micro/src/index.ts   | 6 ++++--
 packages/apollo-server/src/index.ts         | 7 ++++++-
 7 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/packages/apollo-server-core/src/index.ts b/packages/apollo-server-core/src/index.ts
index 100ff00b..27e27ee2 100644
--- a/packages/apollo-server-core/src/index.ts
+++ b/packages/apollo-server-core/src/index.ts
@@ -34,3 +34,7 @@ export const gql: (
   template: TemplateStringsArray | string,
   ...substitutions: any[]
 ) => DocumentNode = gqlTag;
+
+import { GraphQLScalarType } from 'graphql';
+import { GraphQLUpload as UploadScalar } from 'apollo-upload-server';
+export const GraphQLUpload = UploadScalar as GraphQLScalarType;
diff --git a/packages/apollo-server-express/src/index.ts b/packages/apollo-server-express/src/index.ts
index c9d9a399..839fcafe 100644
--- a/packages/apollo-server-express/src/index.ts
+++ b/packages/apollo-server-express/src/index.ts
@@ -1,6 +1,8 @@
-export { GraphQLOptions, gql } from 'apollo-server-core';
-
 export {
+  GraphQLUpload,
+  GraphQLOptions,
+  gql,
+  // Errors
   ApolloError,
   toApolloError,
   SyntaxError,
diff --git a/packages/apollo-server-hapi/src/index.ts b/packages/apollo-server-hapi/src/index.ts
index c9d9a399..839fcafe 100644
--- a/packages/apollo-server-hapi/src/index.ts
+++ b/packages/apollo-server-hapi/src/index.ts
@@ -1,6 +1,8 @@
-export { GraphQLOptions, gql } from 'apollo-server-core';
-
 export {
+  GraphQLUpload,
+  GraphQLOptions,
+  gql,
+  // Errors
   ApolloError,
   toApolloError,
   SyntaxError,
diff --git a/packages/apollo-server-koa/src/index.ts b/packages/apollo-server-koa/src/index.ts
index c9d9a399..839fcafe 100644
--- a/packages/apollo-server-koa/src/index.ts
+++ b/packages/apollo-server-koa/src/index.ts
@@ -1,6 +1,8 @@
-export { GraphQLOptions, gql } from 'apollo-server-core';
-
 export {
+  GraphQLUpload,
+  GraphQLOptions,
+  gql,
+  // Errors
   ApolloError,
   toApolloError,
   SyntaxError,
diff --git a/packages/apollo-server-lambda/src/index.ts b/packages/apollo-server-lambda/src/index.ts
index 82baf52f..39a8f62d 100644
--- a/packages/apollo-server-lambda/src/index.ts
+++ b/packages/apollo-server-lambda/src/index.ts
@@ -1,6 +1,8 @@
-export { GraphQLOptions, gql } from 'apollo-server-core';
-
 export {
+  GraphQLUpload,
+  GraphQLOptions,
+  gql,
+  // Errors
   ApolloError,
   toApolloError,
   SyntaxError,
diff --git a/packages/apollo-server-micro/src/index.ts b/packages/apollo-server-micro/src/index.ts
index 3628b361..69da3a75 100644
--- a/packages/apollo-server-micro/src/index.ts
+++ b/packages/apollo-server-micro/src/index.ts
@@ -1,4 +1,8 @@
 export {
+  GraphQLUpload,
+  GraphQLOptions,
+  gql,
+  // Errors
   ApolloError,
   toApolloError,
   SyntaxError,
@@ -6,8 +10,6 @@ export {
   AuthenticationError,
   ForbiddenError,
   UserInputError,
-  GraphQLOptions,
-  gql,
 } from 'apollo-server-core';
 
 export * from 'graphql-tools';
diff --git a/packages/apollo-server/src/index.ts b/packages/apollo-server/src/index.ts
index f623abb2..ff285cd7 100644
--- a/packages/apollo-server/src/index.ts
+++ b/packages/apollo-server/src/index.ts
@@ -7,7 +7,12 @@ import * as http from 'http';
 import * as net from 'net';
 import { ApolloServer as ApolloServerBase } from 'apollo-server-express';
 
-export { GraphQLOptions, GraphQLExtension, gql } from 'apollo-server-core';
+export {
+  GraphQLUpload,
+  GraphQLOptions,
+  GraphQLExtension,
+  gql,
+} from 'apollo-server-core';
 
 export * from './exports';