minor tidy up

packages/kit/src/runtime/server/index.js

@@ -1,5 +1,5 @@
 import { createHash } from 'crypto';
-import render_page from './page.js';
+import render_page from './page/index.js';
 import render_endpoint from './endpoint.js';
 
 /** @param {string} body */

packages/kit/src/runtime/server/page.js → packages/kit/src/runtime/server/page/index.js

@@ -2,8 +2,8 @@ import devalue from 'devalue';
 import fetch, { Response } from 'node-fetch';
 import { writable } from 'svelte/store';
 import { parse, resolve, URLSearchParams } from 'url';
-import { normalize } from '../load.js';
-import { ssr } from './index.js';
+import { normalize } from '../../load.js';
+import { ssr } from '../index.js';
 
 const s = JSON.stringify;
 
@@ -18,7 +18,7 @@ const s = JSON.stringify;
  * }} opts
  * @returns {Promise<import('types').Response>}
  */
-async function get_response({ request, options, $session, route, status = 200, error }) {
+async function respond({ request, options, $session, route, status = 200, error }) {
 	const serialized_session = try_serialize($session, (error) => {
 		throw new Error(`Failed to serialize session data: ${error.message}`);
 	});
@@ -220,7 +220,7 @@ async function get_response({ request, options, $session, route, status = 200, e
 			? { ssr: options.ssr, router: options.router, hydrate: options.hydrate }
 			: await component_promises[component_promises.length - 1];
 	} catch (e) {
-		return await get_response({
+		return await respond({
 			request,
 			options,
 			$session,
@@ -267,12 +267,6 @@ async function get_response({ request, options, $session, route, status = 200, e
 				const mod = await component_promises[i];
 				components[i] = mod.default;
 
-				if (mod.preload) {
-					throw new Error(
-						'preload has been deprecated in favour of load. Please consult the documentation: https://kit.svelte.dev/docs#loading'
-					);
-				}
-
 				if (mod.load) {
 					loaded = await mod.load.call(null, {
 						page,
@@ -303,7 +297,7 @@ async function get_response({ request, options, $session, route, status = 200, e
 				// TODO there's some logic that's duplicated in the client runtime,
 				// it would be nice to DRY it out if possible
 				if (loaded.error) {
-					return await get_response({
+					return await respond({
 						request,
 						options,
 						$session,
@@ -375,17 +369,17 @@ async function get_response({ request, options, $session, route, status = 200, e
 		} catch (e) {
 			if (error) throw e instanceof Error ? e : new Error(e);
 
-			return await get_response({
+			return await respond({
 				request,
 				options,
 				$session,
 				route: null,
 				status: 500,
 				error: e instanceof Error ? e : { name: 'Error', message: e.toString() }
 			});
+		} finally {
+			unsubscribe();
 		}
-
-		unsubscribe();
 	} else {
 		rendered = {
 			head: '',
@@ -499,7 +493,7 @@ export default async function render_page(request, route, options) {
 
 	const $session = await options.hooks.getSession({ context: request.context });
 
-	const response = await get_response({
+	const response = await respond({
 		request,
 		options,
 		$session,

packages/kit/test/test.js

@@ -19,6 +19,9 @@ async function setup({ port }) {
 		nojs: await browser.newContext({ javaScriptEnabled: false })
 	};
 
+	contexts.js.setDefaultTimeout(5000);
+	contexts.nojs.setDefaultTimeout(5000);
+
 	const cookie = {
 		name: 'name',
 		value: 'SvelteKit',