From 03d67aced00c7ce605d95b6393cf968e1100573b Mon Sep 17 00:00:00 2001
From: Arne Wiese <arne@wiese.me>
Date: Tue, 30 Mar 2021 16:27:09 +0200
Subject: [PATCH 1/2] Fix query params being empty

---
 .changeset/fluffy-carpets-confess.md | 5 +++++
 packages/adapter-vercel/src/entry.js | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/fluffy-carpets-confess.md

diff --git a/.changeset/fluffy-carpets-confess.md b/.changeset/fluffy-carpets-confess.md
new file mode 100644
index 000000000000..31879f6b209d
--- /dev/null
+++ b/.changeset/fluffy-carpets-confess.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-vercel': patch
+---
+
+Fix query params not being set
diff --git a/packages/adapter-vercel/src/entry.js b/packages/adapter-vercel/src/entry.js
index 35f80981cddd..38b7cde419dc 100644
--- a/packages/adapter-vercel/src/entry.js
+++ b/packages/adapter-vercel/src/entry.js
@@ -1,10 +1,10 @@
-import { URL, URLSearchParams } from 'url';
+import { URL } from 'url';
 // eslint-disable-next-line import/no-unresolved
 import { get_body } from '@sveltejs/kit/http';
 
 export default async (req, res) => {
 	const host = `${req.headers['x-forwarded-proto']}://${req.headers.host}`;
-	const { pathname, query = '' } = new URL(req.url || '', host);
+	const { pathname, searchParams } = new URL(req.url || '', host);
 
 	const { render } = await import('./server/app.mjs');
 
@@ -12,7 +12,7 @@ export default async (req, res) => {
 		method: req.method,
 		headers: req.headers,
 		path: pathname,
-		query: new URLSearchParams(query),
+		query: searchParams,
 		body: await get_body(req)
 	});
 

From 7c1cef44c8d6aaa6e0cc6980c7442076f0d53d72 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:23:03 -0700
Subject: [PATCH 2/2] Update adapter-node

---
 .changeset/flat-pillows-think.md     | 6 ++++++
 .changeset/fluffy-carpets-confess.md | 5 -----
 packages/adapter-node/src/server.js  | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/flat-pillows-think.md
 delete mode 100644 .changeset/fluffy-carpets-confess.md

diff --git a/.changeset/flat-pillows-think.md b/.changeset/flat-pillows-think.md
new file mode 100644
index 000000000000..06d63777a330
--- /dev/null
+++ b/.changeset/flat-pillows-think.md
@@ -0,0 +1,6 @@
+---
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-vercel': patch
+---
+
+Fix adapter-vercel query parsing and update adapter-node's
diff --git a/.changeset/fluffy-carpets-confess.md b/.changeset/fluffy-carpets-confess.md
deleted file mode 100644
index 31879f6b209d..000000000000
--- a/.changeset/fluffy-carpets-confess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/adapter-vercel': patch
----
-
-Fix query params not being set
diff --git a/packages/adapter-node/src/server.js b/packages/adapter-node/src/server.js
index 4812dd4f1f67..f93e6cb3b9e6 100644
--- a/packages/adapter-node/src/server.js
+++ b/packages/adapter-node/src/server.js
@@ -3,7 +3,7 @@ import fs from 'fs';
 import polka from 'polka';
 import { dirname, join } from 'path';
 import sirv from 'sirv';
-import { parse, URLSearchParams, fileURLToPath } from 'url';
+import { URL, fileURLToPath } from 'url';
 // eslint-disable-next-line import/no-unresolved
 import { get_body } from '@sveltejs/kit/http';
 // App is a dynamic file built from the application layer.
@@ -31,13 +31,13 @@ const assets_handler = sirv(join(__dirname, '/assets'), {
 
 polka()
 	.use(compression({ threshold: 0 }), assets_handler, prerendered_handler, async (req, res) => {
-		const parsed = parse(req.url || '');
+		const parsed = new URL(req.url || '');
 		const rendered = await app.render({
 			method: req.method,
 			headers: req.headers, // TODO: what about repeated headers, i.e. string[]
 			path: parsed.pathname,
 			body: await get_body(req),
-			query: new URLSearchParams(parsed.query || '')
+			query: parsed.searchParams
 		});
 
 		if (rendered) {