From 21ec6130368a41ac1e395967ca0d53e3d8db0b1c Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Mon, 25 Feb 2019 09:27:12 -0500 Subject: [PATCH 1/3] 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 | 3 +-- packages/apollo-server/src/index.ts | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) 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; } From 6abe1fe99c24e3894a5f440c12e765e701c06803 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Mon, 25 Feb 2019 09:31:17 -0500 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e63a75b9fe2..ffef44dbbb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### vNEXT +- Fix ApolloServerExpressConfig typing incorrectly including cors as part of 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) From 94b964b53ee56aa401f7790df98a6e9f879fdf75 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Feb 2019 17:03:52 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffef44dbbb1..75462caf806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### vNEXT -- Fix ApolloServerExpressConfig typing incorrectly including cors as part of constructor options [PR #2373](https://github.com/apollographql/apollo-server/pull/2373) +- 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