Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix appolo-server-micro top level error response #1619

Merged
merged 2 commits into from Sep 5, 2018
Merged

Fix appolo-server-micro top level error response #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c848dd4
Fix appolo-server-micro top level error response
Sep 5, 2018
0b6d3df
Merge branch 'master' into fix-apollo-server-micro-error-response
martijnwalraven Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ All of the packages in the `apollo-server` repo are released with the same versi
- Update `graphql-playground-html` to 1.7.4 [#1586](https://github.com/apollographql/apollo-server/pull/1586)
- Add support for `graphql-js` v14 by augmenting typeDefs with the `@cacheControl` directive so SDL validation doesn't fail [#1595](https://github.com/apollographql/apollo-server/pull/1595)
- Add `node-fetch` extensions typing to `RequestInit` [#1602](https://github.com/apollographql/apollo-server/pull/1602)
- Fix [#1581](https://github.com/apollographql/apollo-server/issues/1581) `apollo-server-micro` top level error response [#1619](https://github.com/apollographql/apollo-server/pull/1619)
- Switch `ApolloServerBase.schema` from private access to protected access. [#1610](https://github.com/apollographql/apollo-server/pull/1610)
- Add toggle for including error messages in reports [#1615](https://github.com/apollographql/apollo-server/pull/1615)
- Fix `apollo-server-cloud-functions` tests [#1611](https://github.com/apollographql/apollo-server/pull/1611/)
Expand Down
4 changes: 2 additions & 2 deletions packages/apollo-server-micro/src/microApollo.ts
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ import {
runHttpQuery,
convertNodeHttpToRequest,
} from 'apollo-server-core';
import { json, RequestHandler } from 'micro';
import { send, json, RequestHandler } from 'micro';
import * as url from 'url';
import { IncomingMessage, ServerResponse } from 'http';

Expand Down Expand Up @@ -66,7 +66,7 @@ export function graphqlMicro(
error.statusCode = 500;
}

throw error;
send(res, error.statusCode, error.message);
}
};

Expand Down