Fix: Remove incorrect cors option type from apollo-server-express's c…

…onstructor (#2373) * Fix: Remove incorrect cors option type from apollo-server-express's constructor #2330 (comment) * update changelog * Update CHANGELOG.md
apollographql · Feb 25, 2019 · 1ef592a · 1ef592a
1 parent 85470d0
commit 1ef592a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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<ExpressContext, Context> | Context;
 }
 

diff --git 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;
   }