feat(apollo): support defining paths

Akryum · Oct 1, 2019 · 11bb48f · 11bb48f
1 parent 42113c4
commit 11bb48f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/packages/@nodepack/plugin-apollo/src/runtime/apollo-express.js b/packages/@nodepack/plugin-apollo/src/runtime/apollo-express.js
@@ -39,6 +39,13 @@ hook('expressHttp', async (ctx) => {
     },
   }))
 
+  // Express middleware
+  server.applyMiddleware({
+    app,
+    cors: config.cors,
+    path: apolloConfig.path || '/graphql',
+  })
+
   // GraphQL Playground
   if (apolloConfig.playground !== false) {
     const playgroundRoute = ctx.playgroundRoute =
@@ -49,12 +56,6 @@ hook('expressHttp', async (ctx) => {
     }))
   }
 
-  // Express middleware
-  server.applyMiddleware({
-    app,
-    cors: config.cors,
-  })
-
   // Subscriptions
   server.installSubscriptionHandlers(httpServer)
 

diff --git a/packages/@nodepack/plugin-apollo/src/runtime/server.js b/packages/@nodepack/plugin-apollo/src/runtime/server.js
@@ -33,7 +33,7 @@ export async function getApolloConfig ({
     tracing: true,
     introspection: true,
     subscriptions: {
-      path: '/subscriptions',
+      path: apolloConfig.apolloServerOptions.subscriptionsPath || '/subscriptions',
       /**
        * @param {any} connection
        */

diff --git a/packages/@nodepack/plugin-apollo/types/index.d.ts b/packages/@nodepack/plugin-apollo/types/index.d.ts
@@ -1,5 +1,5 @@
 import { DocumentNode } from 'graphql'
-import { IResolvers, PubSubEngine, ApolloServer } from 'apollo-server-express'
+import { IResolvers, PubSubEngine, ApolloServer, Config } from 'apollo-server-express'
 import { ExecutionParams } from 'subscriptions-transport-ws'
 import { Request, Response } from 'express'
 
@@ -20,3 +20,7 @@ export interface ApolloContext {
   user: any
   server: ApolloServer
 }
+
+export interface ApolloConfig extends Config {
+  path: string
+}