From b2bfd08e8291b0fde1116003d3c1264562d83968 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Mon, 25 Feb 2019 09:27:12 -0500 Subject: [PATCH] Fix: Remove incorrect cors option type from apollo-server-express's constructor https://github.com/apollographql/apollo-server/pull/2330#discussion_r259773834 --- packages/apollo-server-express/src/ApolloServer.ts | 1 - packages/apollo-server/src/index.ts | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-express/src/ApolloServer.ts b/packages/apollo-server-express/src/ApolloServer.ts index 2c3a87a3958..7b46b084fcd 100644 --- a/packages/apollo-server-express/src/ApolloServer.ts +++ b/packages/apollo-server-express/src/ApolloServer.ts @@ -76,7 +76,6 @@ export interface ExpressContext { } export interface ApolloServerExpressConfig extends Config { - cors?: CorsOptions | boolean; context?: ContextFunction | Context; } diff --git a/packages/apollo-server/src/index.ts b/packages/apollo-server/src/index.ts index 853855123d9..61b3ce9210b 100644 --- a/packages/apollo-server/src/index.ts +++ b/packages/apollo-server/src/index.ts @@ -26,7 +26,11 @@ export class ApolloServer extends ApolloServerBase { private httpServer?: http.Server; private cors?: CorsOptions | boolean; - constructor(config: ApolloServerExpressConfig) { + constructor( + config: ApolloServerExpressConfig & { + cors?: CorsOptions | boolean; + }, + ) { super(config); this.cors = config && config.cors; }