Skip to content

Commit

Permalink
Merge branch 'main' into ds-copy-fix-from-learn-pr-207
Browse files Browse the repository at this point in the history
  • Loading branch information
jtoar authored Mar 18, 2022
2 parents 3847e30 + a9b6eb9 commit 06f18a3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/docs/cors.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const handler = createGraphQLHandler({
services,
+ cors: {
+ origin: 'https://www.example.com', // <-- web side domain
+ credentials: 'include',
+ credentials: true,
+ },
onException: () => {
db.$disconnect()
Expand Down
2 changes: 1 addition & 1 deletion packages/api-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"fastify": "3.27.4",
"fastify-http-proxy": "6.2.2",
"fastify-raw-body": "3.2.0",
"fastify-static": "4.6.0",
"fastify-static": "4.6.1",
"fastify-url-data": "3.0.3",
"lodash.escape": "4.0.1",
"pretty-bytes": "5.6.0",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5705,7 +5705,7 @@ __metadata:
fastify: 3.27.4
fastify-http-proxy: 6.2.2
fastify-raw-body: 3.2.0
fastify-static: 4.6.0
fastify-static: 4.6.1
fastify-url-data: 3.0.3
jest: 27.5.1
lodash.escape: 4.0.1
Expand Down Expand Up @@ -15565,9 +15565,9 @@ __metadata:
languageName: node
linkType: hard

"fastify-static@npm:4.6.0":
version: 4.6.0
resolution: "fastify-static@npm:4.6.0"
"fastify-static@npm:4.6.1":
version: 4.6.1
resolution: "fastify-static@npm:4.6.1"
dependencies:
content-disposition: ^0.5.3
encoding-negotiator: ^2.0.1
Expand All @@ -15576,7 +15576,7 @@ __metadata:
p-limit: ^3.1.0
readable-stream: ^3.4.0
send: ^0.17.1
checksum: 6090548bce646b6c93f4658f6471260a5fea250f33c185447695c8313630af1c32785761bf1565afd8fa5bdb30df0da4ae28e8a47bdfc8460d57448364bc5fc7
checksum: 59ac784b90d0da8f09461b9810dbce601fb207e6aa7783c5069ca381b2d1fbc254e3e9f9e61b4b6d02345431de812ec01fe1da346e542b99944f7a6933eb2bb4
languageName: node
linkType: hard

Expand Down

0 comments on commit 06f18a3

Please sign in to comment.