diff --git a/packages/apollo-server-core/src/index.ts b/packages/apollo-server-core/src/index.ts index 100ff00b2f5..27e27ee2d49 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 c9d9a399c7f..839fcafe6d5 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 c9d9a399c7f..839fcafe6d5 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 c9d9a399c7f..839fcafe6d5 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 82baf52f110..39a8f62d1e0 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 3628b36199a..69da3a753cb 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 f623abb2e72..ff285cd76c4 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';