Update adapters to use new app.render API (#3133)

* replace request.origin/path/query with request.url * fix some stuff * typo * lint * fix test * fix xss vuln * fix test * gah * fixes * simplify * use pathname+search as key * all tests passing * lint * tidy up * update types in docs * update docs * more docs * more docs * more docs * i would be lost without conduitry * update template app * throw useful error when trying to access path/query/origin/page * $params -> $route.params, only use getters in dev, remove the word "deprecate" * update docs * finish updating load input section * update * make this section less verbose * move url into $route * update some docs * rename route store back to page * throw errors on accessing $page.path etc * fix types * fix some docs * fix migrating docs * decode path, strip prefix * tidy up * remove comment * lint * update adapters * changeset * error if adapter provides wrong input * changeset * Update documentation/docs/05-modules.md * Update documentation/migrating/04-pages.md * remove unused code
sveltejs · Dec 30, 2021 · c096899 · c096899
1 parent d17f459
commit c096899
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 24 deletions.
diff --git a/.changeset/honest-beers-sing.md b/.changeset/honest-beers-sing.md
@@ -0,0 +1,9 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-vercel': patch
+---
+
+Update adapters to provide app.render with a url
diff --git a/.changeset/rude-balloons-return.md b/.changeset/rude-balloons-return.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Error if adapter provides wrong input to app.render
diff --git a/.changeset/shy-oranges-sin.md b/.changeset/shy-oranges-sin.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Replace [request|page].[origin|path|query] with url object
diff --git a/packages/adapter-cloudflare-workers/files/entry.js b/packages/adapter-cloudflare-workers/files/entry.js
@@ -26,12 +26,10 @@ async function handle(event) {
 
 	// fall back to an app route
 	const request = event.request;
-	const request_url = new URL(request.url);
 
 	try {
 		const rendered = await app.render({
-			path: request_url.pathname,
-			query: request_url.searchParams,
+			url: request.url,
 			rawBody: await read(request),
 			headers: Object.fromEntries(request.headers),
 			method: request.method

diff --git a/packages/adapter-cloudflare/files/worker.js b/packages/adapter-cloudflare/files/worker.js
@@ -33,8 +33,7 @@ export default {
 		// dynamically-generated pages
 		try {
 			const rendered = await app.render({
-				path: url.pathname,
-				query: url.searchParams,
+				url,
 				rawBody: new Uint8Array(await req.arrayBuffer()),
 				headers: Object.fromEntries(req.headers),
 				method: req.method

diff --git a/packages/adapter-netlify/src/handler.js b/packages/adapter-netlify/src/handler.js
@@ -7,18 +7,15 @@ export function init(manifest) {
 	const app = new App(manifest);
 
 	return async (event) => {
-		const { path, httpMethod, headers, rawQuery, body, isBase64Encoded } = event;
-
-		const query = new URLSearchParams(rawQuery);
+		const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
 
 		const encoding = isBase64Encoded ? 'base64' : headers['content-encoding'] || 'utf-8';
 		const rawBody = typeof body === 'string' ? Buffer.from(body, encoding) : body;
 
 		const rendered = await app.render({
+			url: rawUrl,
 			method: httpMethod,
 			headers,
-			path,
-			query,
 			rawBody
 		});
 

diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
@@ -39,14 +39,6 @@ const serve_prerendered = sirv(path.join(__dirname, '/prerendered'), {
 
 /** @type {import('polka').Middleware} */
 const ssr = async (req, res) => {
-	let parsed;
-	try {
-		parsed = new URL(req.url || '', 'http://localhost');
-	} catch (e) {
-		res.statusCode = 400;
-		return res.end('Invalid URL');
-	}
-
 	let body;
 
 	try {
@@ -57,10 +49,9 @@ const ssr = async (req, res) => {
 	}
 
 	const rendered = await app.render({
+		url: req.url,
 		method: req.method,
 		headers: req.headers, // TODO: what about repeated headers, i.e. string[]
-		path: parsed.pathname,
-		query: parsed.searchParams,
 		rawBody: body
 	});
 

diff --git a/packages/adapter-vercel/files/entry.js b/packages/adapter-vercel/files/entry.js
@@ -8,8 +8,6 @@ __fetch_polyfill();
 const app = new App(manifest);
 
 export default async (req, res) => {
-	const { pathname, searchParams } = new URL(req.url || '', 'http://localhost');
-
 	let body;
 
 	try {
@@ -20,10 +18,9 @@ export default async (req, res) => {
 	}
 
 	const rendered = await app.render({
+		url: req.url,
 		method: req.method,
 		headers: req.headers,
-		path: pathname,
-		query: searchParams,
 		rawBody: body
 	});
 

diff --git a/packages/kit/src/core/build/build_server.js b/packages/kit/src/core/build/build_server.js
@@ -88,6 +88,11 @@ export class App {
 	render(request, {
 		prerender
 	} = {}) {
+		// TODO remove this for 1.0
+		if (Object.keys(request).sort().join() !== 'headers,method,rawBody,url') {
+			throw new Error('Adapters should call app.render({ url, method, headers, rawBody })');
+		}
+
 		const host = ${
 			config.kit.host
 				? s(config.kit.host)