From 3cad283a01f8c4748c8249ad36c21c88acbc23dc Mon Sep 17 00:00:00 2001 From: Conduitry Date: Wed, 31 Mar 2021 15:23:57 -0400 Subject: [PATCH 1/4] fix parsing url in node adapter --- packages/adapter-node/src/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/adapter-node/src/server.js b/packages/adapter-node/src/server.js index f93e6cb3b9e6..15947db4918e 100644 --- a/packages/adapter-node/src/server.js +++ b/packages/adapter-node/src/server.js @@ -31,7 +31,7 @@ const assets_handler = sirv(join(__dirname, '/assets'), { polka() .use(compression({ threshold: 0 }), assets_handler, prerendered_handler, async (req, res) => { - const parsed = new URL(req.url || ''); + const parsed = new URL(req.url || '', 'http://localhost'); const rendered = await app.render({ method: req.method, headers: req.headers, // TODO: what about repeated headers, i.e. string[] From e6c54d2ada3b58175669c260331bd8b7dd82f91c Mon Sep 17 00:00:00 2001 From: Conduitry Date: Wed, 31 Mar 2021 15:24:52 -0400 Subject: [PATCH 2/4] add changeset --- .changeset/silver-elephants-tap.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/silver-elephants-tap.md diff --git a/.changeset/silver-elephants-tap.md b/.changeset/silver-elephants-tap.md new file mode 100644 index 000000000000..9f622b74a2d5 --- /dev/null +++ b/.changeset/silver-elephants-tap.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/adapter-node': patch +--- + +Fix fatal error when trying to parse URLs of incoming requests From 4cab44dec70c417eeabec3d8602d60befcf0fb9e Mon Sep 17 00:00:00 2001 From: Conduitry Date: Wed, 31 Mar 2021 15:25:16 -0400 Subject: [PATCH 3/4] simplify vercel url parsing --- packages/adapter-vercel/src/entry.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/adapter-vercel/src/entry.js b/packages/adapter-vercel/src/entry.js index 38b7cde419dc..5af07aa6a0b3 100644 --- a/packages/adapter-vercel/src/entry.js +++ b/packages/adapter-vercel/src/entry.js @@ -3,8 +3,7 @@ import { URL } from 'url'; import { get_body } from '@sveltejs/kit/http'; export default async (req, res) => { - const host = `${req.headers['x-forwarded-proto']}://${req.headers.host}`; - const { pathname, searchParams } = new URL(req.url || '', host); + const { pathname, searchParams } = new URL(req.url || '', 'http://localhost'); const { render } = await import('./server/app.mjs'); From c3f0b34d56de670427a49e75a0a60ee727a858c7 Mon Sep 17 00:00:00 2001 From: Conduitry Date: Wed, 31 Mar 2021 15:26:03 -0400 Subject: [PATCH 4/4] add changelog --- .changeset/witty-eyes-relax.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/witty-eyes-relax.md diff --git a/.changeset/witty-eyes-relax.md b/.changeset/witty-eyes-relax.md new file mode 100644 index 000000000000..c251ebf1c8fd --- /dev/null +++ b/.changeset/witty-eyes-relax.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/adapter-vercel': patch +--- + +Simplify parsing of URLS of incoming requests