Use express.Router (#403)

* use express.Router * use express.Router() for app-schema-router * middleware is an array * use express.Router() * use express.Router()
keystonejs · Jun 21, 2023 · 68c5ded · 68c5ded
1 parent a35dba0
commit 68c5ded
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/packages/app-graphql-playground/index.js b/packages/app-graphql-playground/index.js
@@ -16,7 +16,7 @@ class GraphQLPlaygroundApp {
   prepareMiddleware({ dev }) {
     const graphiqlPath = this._graphiqlPath;
     const apiPath = this._apiPath;
-    const app = express();
+    const app = express.Router();
     if (dev && falsey(process.env.DISABLE_LOGGING)) {
       // NOTE: Must come before we setup the GraphQL API
       const devQueryPath = `${graphiqlPath}/go`;

diff --git a/packages/app-graphql/index.js b/packages/app-graphql/index.js
@@ -33,7 +33,7 @@ class GraphQLApp {
     });
     const apiPath = this._apiPath;
     const graphiqlPath = this._graphiqlPath;
-    const app = express();
+    const app = express.Router();
 
     if (dev && graphiqlPath) {
       // This is a convenience to make the out of the box experience slightly simpler.

diff --git a/packages/app-schema-router/index.js b/packages/app-schema-router/index.js
@@ -11,18 +11,21 @@ class SchemaRouterApp {
    * @return Array<middlewares>
    */
   prepareMiddleware({ keystone, dev }) {
-    const attachRouterId = express().use(this.apiPath, (req, res, next) => {
-      req.routerId = this.routerFn(req, res);
-      next();
-    });
-
     const conditionalApps = [
       Object.entries(this.apps).map(([routerId, app]) =>
         conditionalMiddleware({ routerId, middleware: app.prepareMiddleware({ keystone, dev }) })
       ),
     ];
 
-    return [attachRouterId, ...conditionalApps];
+    return express
+      .Router()
+      .use(this.apiPath, [
+        (req, res, next) => {
+          req.routerId = this.routerFn(req, res);
+          next();
+        }, 
+        ...conditionalApps
+      ]);
   }
 
   /**

diff --git a/packages/app-static/index.js b/packages/app-static/index.js
@@ -22,7 +22,7 @@ class StaticApp {
   }
 
   prepareMiddleware({ dev, distDir }) {
-    const app = express();
+    const app = express.Router();
     const folderToServe = dev ? this._src : getDistDir(this._src, distDir);
     app.use(this._path, express.static(folderToServe));
     if (this._fallback) {