From f07ad2f1cde9d3268929443f80082fbbb9403a12 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 15 Mar 2018 23:35:19 +0200 Subject: [PATCH] Export `GraphQLOptions` type directly from `apollo-server-express`. Directly export `GraphQLOptions` from the `apollo-server-express` (and synonymously, `graphql-server-express`) main module, rather than exporting it only from `./expressApollo`. While the type would have still been available to someone using "connect" middleware, this could yield less shake-win for connect developers who might be tree-shaking, as they'd unnecessarily introduce the "express" middleware entry points. --- packages/apollo-server-express/src/expressApollo.ts | 2 -- packages/apollo-server-express/src/index.ts | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-express/src/expressApollo.ts b/packages/apollo-server-express/src/expressApollo.ts index a5d2d4481e0..f1e55029094 100644 --- a/packages/apollo-server-express/src/expressApollo.ts +++ b/packages/apollo-server-express/src/expressApollo.ts @@ -7,8 +7,6 @@ import { } from 'apollo-server-core'; import * as GraphiQL from 'apollo-server-module-graphiql'; -export type GraphQLOptions = GraphQLOptions; - export interface ExpressGraphQLOptionsFunction { (req?: express.Request, res?: express.Response): | GraphQLOptions diff --git a/packages/apollo-server-express/src/index.ts b/packages/apollo-server-express/src/index.ts index e477b41dc89..45808779a98 100644 --- a/packages/apollo-server-express/src/index.ts +++ b/packages/apollo-server-express/src/index.ts @@ -1,10 +1,14 @@ +// Expose types which can be used by both middleware flavors. +export { GraphQLOptions } from 'apollo-server-core'; + +// Express Middleware export { ExpressGraphQLOptionsFunction, ExpressHandler, ExpressGraphiQLOptionsFunction, graphqlExpress, graphiqlExpress, - GraphQLOptions, } from './expressApollo'; +// Connect Middleware export { graphqlConnect, graphiqlConnect } from './connectApollo';