@sveltejs/kit 1.0.0-next.233 → 1.0.0-next.234

package/dist/chunks/index3.js

@@ -268,7 +268,7 @@ set_paths(${s(config.kit.paths)});
 // named imports without triggering Rollup's missing import detection
 const get_hooks = hooks => ({
 	getSession: hooks.getSession || (() => ({})),
-	handle: hooks.handle || (({ request, resolve }) => resolve(request)),
+	handle: hooks.handle || (({ event, resolve }) => resolve(event)),
 	handleError: hooks.handleError || (({ error }) => console.error(error.stack)),
 	externalFetch: hooks.externalFetch || fetch
 });
@@ -293,8 +293,17 @@ export class App {
 			dev: false,
 			floc: ${config.kit.floc},
 			get_stack: error => String(error), // for security
-			handle_error: (error, request) => {
-				hooks.handleError({ error, request });
+			handle_error: (error, event) => {
+				hooks.handleError({
+					error,
+					event,
+
+					// TODO remove for 1.0
+					// @ts-expect-error
+					get request() {
+						throw new Error('request in handleError has been replaced with event. See https://github.com/sveltejs/kit/pull/3384 for details');
+					}
+				});
 				error.stack = this.options.get_stack(error);
 			},
 			hooks,
@@ -317,25 +326,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 })');
+		if (!(request instanceof Request)) {
+			throw new Error('The first argument to app.render must be a Request object. See https://github.com/sveltejs/kit/pull/3384 for details');
 		}
 
-		const host = ${
-			config.kit.host
-				? s(config.kit.host)
-				: `request.headers[${s(config.kit.headers.host || 'host')}]`
-		};
-		const protocol = ${
-			config.kit.protocol
-				? s(config.kit.protocol)
-				: config.kit.headers.protocol
-				? `request.headers[${s(config.kit.headers.protocol)}] || default_protocol`
-				: 'default_protocol'
-		};
-
-		return respond({ ...request, url: new URL(request.url, protocol + '://' + host) }, this.options, { prerender });
+		return respond(request, this.options, { prerender });
 	}
 }
 `;

package/dist/chunks/index5.js

@@ -3,7 +3,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
 import { pathToFileURL, URL } from 'url';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { g as get_single_valued_header, r as resolve$1, i as is_root_relative } from './url.js';
+import { r as resolve$1, i as is_root_relative } from './url.js';
 import { g as generate_manifest } from './index4.js';
 import 'sade';
 import 'child_process';
@@ -412,28 +412,19 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	 * @param {string?} referrer
 	 */
 	async function visit(path, decoded_path, referrer) {
-		/** @type {Map<string, import('types/hooks').ServerResponse>} */
+		/** @type {Map<string, Response>} */
 		const dependencies = new Map();
 
-		const rendered = await app.render(
-			{
-				url: `${config.kit.protocol || 'http'}://${config.kit.host || 'prerender'}${path}`,
-				method: 'GET',
-				headers: {},
-				rawBody: null
-			},
-			{
-				prerender: {
-					all,
-					dependencies
-				}
+		const rendered = await app.render(new Request(`http://sveltekit-prerender${path}`), {
+			prerender: {
+				all,
+				dependencies
 			}
-		);
+		});
 
 		if (rendered) {
 			const response_type = Math.floor(rendered.status / 100);
-			const headers = rendered.headers;
-			const type = headers && headers['content-type'];
+			const type = rendered.headers.get('content-type');
 			const is_html = response_type === REDIRECT || type === 'text/html';
 
 			const parts = decoded_path.split('/');
@@ -444,7 +435,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 			const file = `${out}${parts.join('/')}`;
 
 			if (response_type === REDIRECT) {
-				const location = get_single_valued_header(headers, 'location');
+				const location = rendered.headers.get('location');
 
 				if (location) {
 					mkdirp(dirname(file));
@@ -463,20 +454,22 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 				return;
 			}
 
+			const text = await rendered.text();
+
 			if (rendered.status === 200) {
 				mkdirp(dirname(file));
 
 				log.info(`${rendered.status} ${decoded_path}`);
-				writeFileSync(file, rendered.body || '');
+				writeFileSync(file, text);
 				paths.push(normalize(decoded_path));
 			} else if (response_type !== OK) {
 				error({ status: rendered.status, path, referrer, referenceType: 'linked' });
 			}
 
-			dependencies.forEach((result, dependency_path) => {
+			for (const [dependency_path, result] of dependencies) {
 				const response_type = Math.floor(result.status / 100);
 
-				const is_html = result.headers['content-type'] === 'text/html';
+				const is_html = result.headers.get('content-type') === 'text/html';
 
 				const parts = dependency_path.split('/');
 				if (is_html && parts[parts.length - 1] !== 'index.html') {
@@ -487,7 +480,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 				mkdirp(dirname(file));
 
 				if (result.body) {
-					writeFileSync(file, result.body);
+					writeFileSync(file, await result.text());
 					paths.push(dependency_path);
 				}
 
@@ -501,10 +494,10 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 						referenceType: 'fetched'
 					});
 				}
-			});
+			}
 
 			if (is_html && config.kit.prerender.crawl) {
-				for (const href of crawl(/** @type {string} */ (rendered.body))) {
+				for (const href of crawl(text)) {
 					if (href.startsWith('data:') || href.startsWith('#')) continue;
 
 					const resolved = resolve$1(path, href);
@@ -545,25 +538,17 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	}
 
 	if (fallback) {
-		const rendered = await app.render(
-			{
-				url: `${config.kit.protocol || 'http'}://${config.kit.host || 'prerender'}/[fallback]`,
-				method: 'GET',
-				headers: {},
-				rawBody: null
-			},
-			{
-				prerender: {
-					fallback,
-					all: false,
-					dependencies: new Map()
-				}
+		const rendered = await app.render(new Request('http://sveltekit-prerender/[fallback]'), {
+			prerender: {
+				fallback,
+				all: false,
+				dependencies: new Map()
 			}
-		);
+		});
 
 		const file = join(out, fallback);
 		mkdirp(dirname(file));
-		writeFileSync(file, rendered.body || '');
+		writeFileSync(file, await rendered.text());
 	}
 
 	return {

package/dist/chunks/index6.js

@@ -2,12 +2,13 @@ import fs__default from 'fs';
 import http from 'http';
 import https from 'https';
 import { resolve, join } from 'path';
-import { s as sirv } from './build.js';
+import { s as sirv, t as to_headers } from './http.js';
 import { pathToFileURL } from 'url';
 import { getRawBody } from '../node.js';
 import { __fetch_polyfill } from '../install-fetch.js';
 import { a as SVELTE_KIT, S as SVELTE_KIT_ASSETS } from '../cli.js';
 import 'querystring';
+import 'stream';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -101,18 +102,20 @@ async function preview({
 				return res.end(err.reason || 'Invalid request body');
 			}
 
-			const rendered =
-				initial_url.startsWith(config.kit.paths.base) &&
-				(await app.render({
-					url: initial_url,
-					method: req.method,
-					headers: /** @type {import('types/helper').RequestHeaders} */ (req.headers),
-					rawBody: body
-				}));
-
-			if (rendered) {
-				res.writeHead(rendered.status, rendered.headers);
-				if (rendered.body) res.write(rendered.body);
+			if (initial_url.startsWith(config.kit.paths.base)) {
+				const protocol = use_https ? 'https' : 'http';
+				const host = req.headers['host'];
+
+				const rendered = await app.render(
+					new Request(`${protocol}://${host}${initial_url}`, {
+						method: req.method,
+						headers: to_headers(req.headers),
+						body
+					})
+				);
+
+				res.writeHead(rendered.status, Object.fromEntries(rendered.headers));
+				if (rendered.body) res.write(new Uint8Array(await rendered.arrayBuffer()));
 				res.end();
 			} else {
 				res.statusCode = 404;

package/dist/chunks/url.js

@@ -1,25 +1,3 @@
-/**
- * @param {Record<string, string | string[] | undefined>} headers
- * @param {string} key
- * @returns {string | undefined}
- * @throws {Error}
- */
-function get_single_valued_header(headers, key) {
-	const value = headers[key];
-	if (Array.isArray(value)) {
-		if (value.length === 0) {
-			return undefined;
-		}
-		if (value.length > 1) {
-			throw new Error(
-				`Multiple headers provided for ${key}. Multiple may be provided only for set-cookie`
-			);
-		}
-		return value[0];
-	}
-	return value;
-}
-
 const absolute = /^([a-z]+:)?\/?\//;
 const scheme = /^[a-z]+:/;
 
@@ -59,4 +37,4 @@ function is_root_relative(path) {
 	return path[0] === '/' && path[1] !== '/';
 }
 
-export { get_single_valued_header as g, is_root_relative as i, resolve as r };
+export { is_root_relative as i, resolve as r };

package/dist/cli.js

@@ -501,12 +501,23 @@ const options = object(
 
 			floc: boolean(false),
 
-			headers: object({
-				host: string(null),
-				protocol: string(null)
+			// TODO: remove this for the 1.0 release
+			headers: validate(undefined, (input, keypath) => {
+				if (typeof input !== undefined) {
+					throw new Error(
+						`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
+					);
+				}
 			}),
 
-			host: string(null),
+			// TODO: remove this for the 1.0 release
+			host: validate(undefined, (input, keypath) => {
+				if (typeof input !== undefined) {
+					throw new Error(
+						`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
+					);
+				}
+			}),
 
 			hydrate: boolean(true),
 
@@ -587,6 +598,7 @@ const options = object(
 
 					return input;
 				}),
+
 				// TODO: remove this for the 1.0 release
 				force: validate(undefined, (input, keypath) => {
 					if (typeof input !== undefined) {
@@ -599,6 +611,7 @@ const options = object(
 						);
 					}
 				}),
+
 				onError: validate('fail', (input, keypath) => {
 					if (typeof input === 'function') return input;
 					if (['continue', 'fail'].includes(input)) return input;
@@ -606,6 +619,7 @@ const options = object(
 						`${keypath} should be either a custom function or one of "continue" or "fail"`
 					);
 				}),
+
 				// TODO: remove this for the 1.0 release
 				pages: validate(undefined, (input, keypath) => {
 					if (typeof input !== undefined) {
@@ -614,7 +628,14 @@ const options = object(
 				})
 			}),
 
-			protocol: string(null),
+			// TODO: remove this for the 1.0 release
+			protocol: validate(undefined, (input, keypath) => {
+				if (typeof input !== undefined) {
+					throw new Error(
+						`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
+					);
+				}
+			}),
 
 			router: boolean(true),
 
@@ -912,7 +933,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.233');
+const prog = sade('svelte-kit').version('1.0.0-next.234');
 
 prog
 	.command('dev')
@@ -1064,7 +1085,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.233'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.234'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/hooks.js

@@ -4,22 +4,22 @@
  */
 function sequence(...handlers) {
 	const length = handlers.length;
-	if (!length) return ({ request, resolve }) => resolve(request);
+	if (!length) return ({ event, resolve }) => resolve(event);
 
-	return ({ request, resolve }) => {
-		return apply_handle(0, request);
+	return ({ event, resolve }) => {
+		return apply_handle(0, event);
 
 		/**
 		 * @param {number} i
-		 * @param {import('types/hooks').ServerRequest} request
-		 * @returns {import('types/helper').MaybePromise<import('types/hooks').ServerResponse>}
+		 * @param {import('types/hooks').RequestEvent} event
+		 * @returns {import('types/helper').MaybePromise<Response>}
 		 */
-		function apply_handle(i, request) {
+		function apply_handle(i, event) {
 			const handle = handlers[i];
 
 			return handle({
-				request,
-				resolve: i < length - 1 ? (request) => apply_handle(i + 1, request) : resolve
+				event,
+				resolve: i < length - 1 ? (event) => apply_handle(i + 1, event) : resolve
 			});
 		}
 	};

package/dist/node.js

@@ -1,3 +1,5 @@
+import { Readable } from 'stream';
+
 /** @type {import('@sveltejs/kit/node').GetRawBody} */
 function getRawBody(req) {
 	return new Promise((fulfil, reject) => {
@@ -48,4 +50,28 @@ function getRawBody(req) {
 	});
 }
 
-export { getRawBody };
+/** @type {import('@sveltejs/kit/node').GetRequest} */
+async function getRequest(base, req) {
+	return new Request(base + req.url, {
+		method: req.method,
+		headers: /** @type {Record<string, string>} */ (req.headers),
+		body: await getRawBody(req)
+	});
+}
+
+/** @type {import('@sveltejs/kit/node').SetResponse} */
+async function setResponse(res, response) {
+	res.writeHead(response.status, Object.fromEntries(response.headers));
+
+	if (response.body instanceof Readable) {
+		response.body.pipe(res);
+	} else {
+		if (response.body) {
+			res.write(await response.arrayBuffer());
+		}
+
+		res.end();
+	}
+}
+
+export { getRawBody, getRequest, setResponse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.233",
+  "version": "1.0.0-next.234",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/ambient-modules.d.ts

@@ -174,27 +174,22 @@ declare module '@sveltejs/kit/hooks' {
 }
 
 declare module '@sveltejs/kit/node' {
-	import { IncomingMessage } from 'http';
-	import { RawBody } from '@sveltejs/kit';
+	import { IncomingMessage, ServerResponse } from 'http';
 
 	export interface GetRawBody {
-		(request: IncomingMessage): Promise<RawBody>;
+		(request: IncomingMessage): Promise<Uint8Array | null>;
 	}
 	export const getRawBody: GetRawBody;
-}
 
-declare module '@sveltejs/kit/ssr' {
-	import { IncomingRequest, Response } from '@sveltejs/kit';
-	// TODO import from public types, right now its heavily coupled with internal
-	type Options = import('@sveltejs/kit/types/internal').SSRRenderOptions;
-	type State = import('@sveltejs/kit/types/internal').SSRRenderState;
+	export interface GetRequest {
+		(base: string, request: IncomingMessage): Promise<Request>;
+	}
+	export const getRequest: GetRequest;
 
-	export interface Respond {
-		(incoming: IncomingRequest & { url: URL }, options: Options, state?: State): Promise<
-			Response | undefined
-		>;
+	export interface SetResponse {
+		(res: ServerResponse, response: Response): void;
 	}
-	export const respond: Respond;
+	export const setResponse: SetResponse;
 }
 
 declare module '@sveltejs/kit/install-fetch' {

package/types/app.d.ts

@@ -1,31 +1,17 @@
-import { ReadOnlyFormData, RequestHeaders } from './helper';
-import { ServerResponse } from './hooks';
 import { PrerenderOptions, SSRNodeLoader, SSRRoute } from './internal';
 
 export class App {
 	constructor(manifest: SSRManifest);
-	render(incoming: IncomingRequest): Promise<ServerResponse>;
+	render(request: Request): Promise<Response>;
 }
 
 export class InternalApp extends App {
 	render(
-		incoming: IncomingRequest,
+		request: Request,
 		options?: {
 			prerender: PrerenderOptions;
 		}
-	): Promise<ServerResponse>;
-}
-
-export type RawBody = null | Uint8Array;
-export type ParameterizedBody<Body = unknown> = Body extends FormData
-	? ReadOnlyFormData
-	: (string | RawBody | ReadOnlyFormData) & Body;
-
-export interface IncomingRequest {
-	url: string | URL;
-	method: string;
-	headers: RequestHeaders;
-	rawBody: RawBody;
+	): Promise<Response>;
 }
 
 export interface SSRManifest {

package/types/config.d.ts

@@ -125,11 +125,6 @@ export interface Config {
 			template?: string;
 		};
 		floc?: boolean;
-		headers?: {
-			host?: string;
-			protocol?: string;
-		};
-		host?: string;
 		hydrate?: boolean;
 		inlineStyleThreshold?: number;
 		methodOverride?: {
@@ -153,7 +148,6 @@ export interface Config {
 			entries?: string[];
 			onError?: PrerenderOnErrorValue;
 		};
-		protocol?: string;
 		router?: boolean;
 		serviceWorker?: {
 			register?: boolean;

package/types/endpoint.d.ts

@@ -1,20 +1,19 @@
-import { ServerRequest } from './hooks';
+import { RequestEvent } from './hooks';
 import { JSONString, MaybePromise, ResponseHeaders, Either, Fallthrough } from './helper';
 
 type DefaultBody = JSONString | Uint8Array;
 
 export interface EndpointOutput<Body extends DefaultBody = DefaultBody> {
 	status?: number;
-	headers?: Partial<ResponseHeaders>;
+	headers?: Headers | Partial<ResponseHeaders>;
 	body?: Body;
 }
 
 export interface RequestHandler<
 	Locals = Record<string, any>,
-	Input = unknown,
 	Output extends DefaultBody = DefaultBody
 > {
-	(request: ServerRequest<Locals, Input>): MaybePromise<
-		Either<EndpointOutput<Output>, Fallthrough>
+	(request: RequestEvent<Locals>): MaybePromise<
+		Either<Response | EndpointOutput<Output>, Fallthrough>
 	>;
 }

package/types/helper.d.ts

@@ -21,7 +21,6 @@ export type JSONString =
 
 /** `string[]` is only for set-cookie, everything else must be type of `string` */
 export type ResponseHeaders = Record<string, string | string[]>;
-export type RequestHeaders = Record<string, string>;
 
 // Utility Types
 export type InferValue<T, Key extends keyof T, Default> = T extends Record<Key, infer Val>

package/types/hooks.d.ts

@@ -1,53 +1,40 @@
-import { ParameterizedBody, RawBody } from './app';
-import { MaybePromise, RequestHeaders, ResponseHeaders } from './helper';
+import { MaybePromise } from './helper';
 
 export type StrictBody = string | Uint8Array;
 
-export interface ServerRequest<Locals = Record<string, any>, Body = unknown> {
+export interface RequestEvent<Locals = Record<string, any>> {
+	request: Request;
 	url: URL;
-	method: string;
-	headers: RequestHeaders;
-	rawBody: RawBody;
 	params: Record<string, string>;
-	body: ParameterizedBody<Body>;
 	locals: Locals;
 }
 
-export interface ServerResponse {
-	status: number;
-	headers: Partial<ResponseHeaders>;
-	body?: StrictBody;
-}
-
-export interface GetSession<Locals = Record<string, any>, Body = unknown, Session = any> {
-	(request: ServerRequest<Locals, Body>): MaybePromise<Session>;
+export interface GetSession<Locals = Record<string, any>, Session = any> {
+	(event: RequestEvent<Locals>): MaybePromise<Session>;
 }
 
 export interface ResolveOpts {
 	ssr?: boolean;
 }
 
-export interface Handle<Locals = Record<string, any>, Body = unknown> {
+export interface Handle<Locals = Record<string, any>> {
 	(input: {
-		request: ServerRequest<Locals, Body>;
-		resolve(request: ServerRequest<Locals, Body>, opts?: ResolveOpts): MaybePromise<ServerResponse>;
-	}): MaybePromise<ServerResponse>;
+		event: RequestEvent<Locals>;
+		resolve(event: RequestEvent<Locals>, opts?: ResolveOpts): MaybePromise<Response>;
+	}): MaybePromise<Response>;
 }
 
 // internally, `resolve` could return `undefined`, so we differentiate InternalHandle
 // from the public Handle type
-export interface InternalHandle<Locals = Record<string, any>, Body = unknown> {
+export interface InternalHandle<Locals = Record<string, any>> {
 	(input: {
-		request: ServerRequest<Locals, Body>;
-		resolve(
-			request: ServerRequest<Locals, Body>,
-			opts?: ResolveOpts
-		): MaybePromise<ServerResponse | undefined>;
-	}): MaybePromise<ServerResponse | undefined>;
+		event: RequestEvent<Locals>;
+		resolve(event: RequestEvent<Locals>, opts?: ResolveOpts): MaybePromise<Response | undefined>;
+	}): MaybePromise<Response | undefined>;
 }
 
-export interface HandleError<Locals = Record<string, any>, Body = unknown> {
-	(input: { error: Error & { frame?: string }; request: ServerRequest<Locals, Body> }): void;
+export interface HandleError<Locals = Record<string, any>> {
+	(input: { error: Error & { frame?: string }; event: RequestEvent<Locals> }): void;
 }
 
 export interface ExternalFetch {

package/types/index.d.ts

@@ -3,16 +3,8 @@
 
 import './ambient-modules';
 
-export { App, IncomingRequest, RawBody, SSRManifest } from './app';
+export { App, SSRManifest } from './app';
 export { Adapter, Builder, Config, PrerenderErrorHandler, ValidatedConfig } from './config';
 export { EndpointOutput, RequestHandler } from './endpoint';
 export { ErrorLoad, ErrorLoadInput, Load, LoadInput, LoadOutput } from './page';
-export {
-	ExternalFetch,
-	GetSession,
-	Handle,
-	HandleError,
-	ServerRequest as Request,
-	ServerResponse as Response,
-	ResolveOpts
-} from './hooks';
+export { ExternalFetch, GetSession, Handle, HandleError, RequestEvent, ResolveOpts } from './hooks';