diff --git a/CHANGELOG.md b/CHANGELOG.md index e63a75b9fe2..75462caf806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### vNEXT +- Fix `ApolloServerExpressConfig` typing incorrectly including `cors` as part of its constructor options. [PR #2373](https://github.com/apollographql/apollo-server/pull/2373) + ### v2.4.6 - Allow Node.js-like runtimes to identify as Node.js as well. [PR #2357](https://github.com/apollographql/apollo-server/pull/2357) [Issue #2356](https://github.com/apollographql/apollo-server/issue/2356) diff --git a/packages/apollo-server-express/src/ApolloServer.ts b/packages/apollo-server-express/src/ApolloServer.ts index 2c3a87a3958..ebac3cd78f4 100644 --- a/packages/apollo-server-express/src/ApolloServer.ts +++ b/packages/apollo-server-express/src/ApolloServer.ts @@ -1,5 +1,5 @@ import express from 'express'; -import corsMiddleware, { CorsOptions } from 'cors'; +import corsMiddleware from 'cors'; import { json, OptionsJson } from 'body-parser'; import { renderPlaygroundPage, @@ -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; }