Enable GraphQLUpload for Apollo Server 2.0 (#1322)

* export GraphQLUpload

* fix GraphQLScalar typing

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;

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,

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,

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,

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,

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';

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';