Merge pull request #459 from bwlt/fix/graphiql

Using await on graphiql handler - Fix graphiql issues
apollographql · Jul 13, 2017 · f20161b · f20161b
2 parents 5ea2169 + 525f40a
commit f20161b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/packages/graphql-server-micro/README.md b/packages/graphql-server-micro/README.md
@@ -18,12 +18,6 @@ const server = micro(
  get("/graphql", graphqlHandler),
  post("/graphql", graphqlHandler),
  get("/graphiql", graphiqlHandler),
- get("/noop", (req, res) => {
- // Micro router requires at least one 200 route
- // or you will always get a 404
- return send(res, 200, "");
- }),
-
  (req, res) => send(res, 404, "not found"),
  ),
 );

diff --git a/packages/graphql-server-micro/src/microApollo.ts b/packages/graphql-server-micro/src/microApollo.ts
@@ -63,7 +63,7 @@ export interface MicroGraphiQLOptionsFunction {
 export function microGraphiql(options: GraphiQL.GraphiQLData | MicroGraphiQLOptionsFunction): RequestHandler {
  return (req: IncomingMessage, res: ServerResponse) => {
  const query = req.url && url.parse(req.url, true).query || {};
- GraphiQL.resolveGraphiQLString(query, options, req).then(graphiqlString => {
+ return GraphiQL.resolveGraphiQLString(query, options, req).then(graphiqlString => {
  res.setHeader('Content-Type', 'text/html');
  res.write(graphiqlString);
  res.end();