dep on express (there is an import), other tweaks

apollographql · Jun 12, 2018 · dbfa57c · dbfa57c
1 parent 3e93524
commit dbfa57c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json
@@ -54,7 +54,7 @@
  },
  "dependencies": {
  "apollo-cache-control": "^0.1.1",
- "apollo-engine-reporting": "0.0.0-beta.11",
+ "apollo-engine-reporting": "0.0.0-beta.12",
  "apollo-tracing": "^0.2.0-beta.1",
  "graphql-extensions": "0.1.0-beta.13",
  "graphql-subscriptions": "^0.5.8",

diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts
@@ -308,6 +308,10 @@ const typeDefs = gql\`${startSchema}\`
  if (this.engineProxy) await this.engineProxy.stop();
  if (this.subscriptionServer) await this.subscriptionServer.close();
  if (this.http) await new Promise(s => this.http.close(s));
+ if (this.engineReportingAgent) {
+ this.engineReportingAgent.stop();
+ await this.engineReportingAgent.sendReport();
+ }
  }
 
  private createSubscriptionServer(

diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json
@@ -35,6 +35,7 @@
  "dependencies": {
  "apollo-server-core": "^2.0.0-beta.6",
  "apollo-server-express": "^2.0.0-beta.6",
+ "express": "^4.0.0",
  "graphql-subscriptions": "^0.5.8"
  }
 }
diff --git a/packages/apollo-server/src/index.ts b/packages/apollo-server/src/index.ts
@@ -1,3 +1,7 @@
+// Note: express is only used if you use the ApolloServer.listen API to create
+// an express app for you instead of registerServer (which you might not even
+// use with express). The dependency is unused otherwise, so don't worry if
+// you're not using express or your version doesn't quite match up.
 import express from 'express';
 import { Request } from 'express';
 import { registerServer } from 'apollo-server-express';