From 09ac803f337c01db1d4610ed3024e2332ec1075d Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 19 Apr 2022 18:59:17 -0400
Subject: [PATCH 1/6] failing test for #4659

---
 .../kit/test/apps/basics/src/routes/__layout.svelte    | 10 +++++++++-
 .../src/routes/errors/error-in-layout/index.svelte     |  1 +
 packages/kit/test/apps/basics/test/test.js             |  9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 packages/kit/test/apps/basics/src/routes/errors/error-in-layout/index.svelte

diff --git a/packages/kit/test/apps/basics/src/routes/__layout.svelte b/packages/kit/test/apps/basics/src/routes/__layout.svelte
index c5421be53848..1cb9805e3ec6 100644
--- a/packages/kit/test/apps/basics/src/routes/__layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/__layout.svelte
@@ -1,6 +1,14 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load() {
+	export async function load({ fetch, url }) {
+		if (url.pathname.startsWith('/errors/error-in-layout')) {
+			const res = await fetch('/errors/error-in-layout/non-existent');
+
+			return {
+				status: res.status
+			};
+		}
+
 		return {
 			props: {
 				foo: {
diff --git a/packages/kit/test/apps/basics/src/routes/errors/error-in-layout/index.svelte b/packages/kit/test/apps/basics/src/routes/errors/error-in-layout/index.svelte
new file mode 100644
index 000000000000..6e7c1e6ac83f
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/errors/error-in-layout/index.svelte
@@ -0,0 +1 @@
+<h1>hello</h1>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index c0d6e935a838..e7ce698fe13c 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -1384,6 +1384,15 @@ test.describe.parallel('Load', () => {
 		expect(cookies.answer).toBe('42');
 		expect(cookies.doubled).toBe('84');
 	});
+
+	test('fetching a non-existent resource in root layout fails without hanging', async ({
+		page
+	}) => {
+		await page.goto('/errors/error-in-layout');
+		expect(await page.textContent('#message')).toBe(
+			'This is your custom error page saying: "Error"'
+		);
+	});
 });
 
 test.describe.parallel('Method overrides', () => {

From 0fb41d6fe0f87599c1a2953d7e1bedf4377abbc0 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 11 Jul 2022 14:51:58 -0400
Subject: [PATCH 2/6] prevent infinite loop when loading non-existent route in
 __layout

---
 packages/kit/src/runtime/load.js                       |  5 ++++-
 packages/kit/src/runtime/server/index.js               |  9 ++++++++-
 packages/kit/src/runtime/server/page/load_node.js      |  2 +-
 .../kit/src/runtime/server/page/respond_with_error.js  |  9 +++++++--
 packages/kit/src/runtime/server/utils.js               |  5 +++++
 packages/kit/test/apps/basics/test/test.js             | 10 ++++------
 packages/kit/types/internal.d.ts                       |  6 +++++-
 7 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/packages/kit/src/runtime/load.js b/packages/kit/src/runtime/load.js
index 099e3ccafc98..468b2c725a6b 100644
--- a/packages/kit/src/runtime/load.js
+++ b/packages/kit/src/runtime/load.js
@@ -22,7 +22,10 @@ export function normalize(loaded) {
 		const status = loaded.status;
 
 		if (!loaded.error && has_error_status) {
-			return { status: status || 500, error: new Error() };
+			return {
+				status: status || 500,
+				error: new Error(`${status}`)
+			};
 		}
 
 		const error = typeof loaded.error === 'string' ? new Error(loaded.error) : loaded.error;
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
index 9140a00018fb..16b90f07537e 100644
--- a/packages/kit/src/runtime/server/index.js
+++ b/packages/kit/src/runtime/server/index.js
@@ -3,7 +3,7 @@ import { render_page } from './page/index.js';
 import { render_response } from './page/render.js';
 import { respond_with_error } from './page/respond_with_error.js';
 import { coalesce_to_error } from '../../utils/error.js';
-import { decode_params, serialize_error } from './utils.js';
+import { decode_params, serialize_error, GENERIC_ERROR } from './utils.js';
 import { normalize_path } from '../../utils/url.js';
 import { exec } from '../../utils/routing.js';
 import { negotiate } from '../../utils/http.js';
@@ -274,6 +274,12 @@ export async function respond(request, options, state) {
 					}
 				}
 
+				if (state.initiator === GENERIC_ERROR) {
+					return new Response('Internal Server Error', {
+						status: 500
+					});
+				}
+
 				// if this request came direct from the user, rather than
 				// via a `fetch` in a `load`, render a 404 page
 				if (!state.initiator) {
@@ -328,6 +334,7 @@ export async function respond(request, options, state) {
 			});
 		}
 
+		// TODO is this necessary? should we just return a plain 500 at this point?
 		try {
 			const $session = await options.hooks.getSession(event);
 			return await respond_with_error({
diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
index d154dd65daaa..2ff9f9f39dc3 100644
--- a/packages/kit/src/runtime/server/page/load_node.js
+++ b/packages/kit/src/runtime/server/page/load_node.js
@@ -13,7 +13,7 @@ import { domain_matches, path_matches } from './cookie.js';
  *   event: import('types').RequestEvent;
  *   options: import('types').SSROptions;
  *   state: import('types').SSRState;
- *   route: import('types').SSRPage | null;
+ *   route: import('types').SSRPage | import('types').SSRErrorPage | null;
  *   node: import('types').SSRNode;
  *   $session: any;
  *   stuff: Record<string, any>;
diff --git a/packages/kit/src/runtime/server/page/respond_with_error.js b/packages/kit/src/runtime/server/page/respond_with_error.js
index cac5b4fc34b8..c3defa2d244e 100644
--- a/packages/kit/src/runtime/server/page/respond_with_error.js
+++ b/packages/kit/src/runtime/server/page/respond_with_error.js
@@ -1,6 +1,7 @@
 import { render_response } from './render.js';
 import { load_node } from './load_node.js';
 import { coalesce_to_error } from '../../../utils/error.js';
+import { GENERIC_ERROR } from '../utils.js';
 
 /**
  * @typedef {import('./types.js').Loaded} Loaded
@@ -41,7 +42,7 @@ export async function respond_with_error({
 					event,
 					options,
 					state,
-					route: null,
+					route: GENERIC_ERROR,
 					node: default_layout,
 					$session,
 					stuff: {},
@@ -50,12 +51,16 @@ export async function respond_with_error({
 				})
 			);
 
+			if (layout_loaded.loaded.error) {
+				throw layout_loaded.loaded.error;
+			}
+
 			const error_loaded = /** @type {Loaded} */ (
 				await load_node({
 					event,
 					options,
 					state,
-					route: null,
+					route: GENERIC_ERROR,
 					node: default_error,
 					$session,
 					stuff: layout_loaded ? layout_loaded.stuff : {},
diff --git a/packages/kit/src/runtime/server/utils.js b/packages/kit/src/runtime/server/utils.js
index de9da9cf660c..6e68070b54b5 100644
--- a/packages/kit/src/runtime/server/utils.js
+++ b/packages/kit/src/runtime/server/utils.js
@@ -96,3 +96,8 @@ function clone_error(error, get_stack) {
 
 	return object;
 }
+
+/** @type {import('types').SSRErrorPage} */
+export const GENERIC_ERROR = {
+	id: '__error'
+};
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 635d28682c45..4b0a9ef3ec7d 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -1620,14 +1620,12 @@ test.describe('Load', () => {
 	});
 
 	test('fetching a non-existent resource in root layout fails without hanging', async ({
-		page
+		request
 	}) => {
-		await page.goto('/errors/error-in-layout');
-		expect(await page.textContent('#message')).toBe(
-			'This is your custom error page saying: "Error"'
-		);
+		const response = await request.get('/errors/error-in-layout');
+		expect(await response.text()).toContain('Error: 500');
 	});
- 
+
 	test('accessing url.hash from load errors and suggests using page store', async ({
 		page,
 		javaScriptEnabled
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index 7b61ed1451db..03597da53c9d 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -293,6 +293,10 @@ export interface SSRPage {
 	b: Array<number | undefined>;
 }
 
+export interface SSRErrorPage {
+	id: '__error';
+}
+
 export interface SSRPagePart {
 	id: string;
 	load: SSRComponentLoader;
@@ -303,7 +307,7 @@ export type SSRRoute = SSREndpoint | SSRPage;
 export interface SSRState {
 	fallback?: string;
 	getClientAddress: () => string;
-	initiator?: SSRPage | null;
+	initiator?: SSRPage | SSRErrorPage | null;
 	platform?: any;
 	prerendering?: PrerenderOptions;
 }

From ca38d670098763307c5e8048d26146f61968f0f4 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 11 Jul 2022 16:06:33 -0400
Subject: [PATCH 3/6] update test

---
 packages/kit/test/apps/basics/test/test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 0a87a130f3ea..58006e2d7769 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -1098,7 +1098,7 @@ test.describe('Errors', () => {
 		const response = await page.goto('/errors/load-status-without-error-server');
 
 		expect(await page.textContent('footer')).toBe('Custom layout');
-		expect(await page.textContent('#message')).toBe('This is your custom error page saying: ""');
+		expect(await page.textContent('#message')).toBe('This is your custom error page saying: "401"');
 		expect(/** @type {Response} */ (response).status()).toBe(401);
 	});
 
@@ -1107,7 +1107,9 @@ test.describe('Errors', () => {
 
 		if (javaScriptEnabled) {
 			expect(await page.textContent('footer')).toBe('Custom layout');
-			expect(await page.textContent('#message')).toBe('This is your custom error page saying: ""');
+			expect(await page.textContent('#message')).toBe(
+				'This is your custom error page saying: "401"'
+			);
 			expect(await page.innerHTML('h1')).toBe('401');
 		}
 	});

From 8f7bc9ad91588089e87dd3bad6ba4fcc67c2471e Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 12 Jul 2022 14:11:15 -0400
Subject: [PATCH 4/6] tighten up

---
 packages/kit/src/runtime/server/page/load_node.js | 2 +-
 packages/kit/types/internal.d.ts                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
index 2ff9f9f39dc3..7c86db062b9e 100644
--- a/packages/kit/src/runtime/server/page/load_node.js
+++ b/packages/kit/src/runtime/server/page/load_node.js
@@ -13,7 +13,7 @@ import { domain_matches, path_matches } from './cookie.js';
  *   event: import('types').RequestEvent;
  *   options: import('types').SSROptions;
  *   state: import('types').SSRState;
- *   route: import('types').SSRPage | import('types').SSRErrorPage | null;
+ *   route: import('types').SSRPage | import('types').SSRErrorPage;
  *   node: import('types').SSRNode;
  *   $session: any;
  *   stuff: Record<string, any>;
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index 03597da53c9d..faf59f226730 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -307,7 +307,7 @@ export type SSRRoute = SSREndpoint | SSRPage;
 export interface SSRState {
 	fallback?: string;
 	getClientAddress: () => string;
-	initiator?: SSRPage | SSRErrorPage | null;
+	initiator?: SSRPage | SSRErrorPage;
 	platform?: any;
 	prerendering?: PrerenderOptions;
 }

From 837fa94cd59d271513afa5a97ad455085f7971f9 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 14 Jul 2022 12:14:43 -0400
Subject: [PATCH 5/6] changeset

---
 .changeset/purple-rats-wink.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/purple-rats-wink.md

diff --git a/.changeset/purple-rats-wink.md b/.changeset/purple-rats-wink.md
new file mode 100644
index 000000000000..426cb612d2c1
--- /dev/null
+++ b/.changeset/purple-rats-wink.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Render generic error page if \_\_layout returns error while rendering full error page

From bc1bd76091345f64b9719f40d03208fee355b24a Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 14 Jul 2022 14:47:59 -0400
Subject: [PATCH 6/6] expose status to __layout, if already set (#4815)

---
 .../kit/src/runtime/server/page/load_node.js  | 10 ++++-----
 .../kit/src/runtime/server/page/render.js     |  6 ++---
 .../kit/src/runtime/server/page/respond.js    | 22 +++++++++++++------
 .../runtime/server/page/respond_with_error.js |  4 ++--
 .../apps/basics/src/routes/__layout.svelte    | 16 +++++++++++++-
 .../errors/status-in-layout/index.svelte      |  2 ++
 packages/kit/test/apps/basics/test/test.js    |  7 ++++++
 7 files changed, 48 insertions(+), 19 deletions(-)
 create mode 100644 packages/kit/test/apps/basics/src/routes/errors/status-in-layout/index.svelte

diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
index 40789d1c790a..1cab2f9c71c0 100644
--- a/packages/kit/src/runtime/server/page/load_node.js
+++ b/packages/kit/src/runtime/server/page/load_node.js
@@ -17,10 +17,9 @@ import { domain_matches, path_matches } from './cookie.js';
  *   node: import('types').SSRNode;
  *   $session: any;
  *   stuff: Record<string, any>;
- *   is_error: boolean;
  *   is_leaf: boolean;
- *   status?: number;
- *   error?: Error;
+ *   status: number | null;
+ *   error: Error | null;
  * }} opts
  * @returns {Promise<import('./types').Loaded>}
  */
@@ -32,7 +31,6 @@ export async function load_node({
 	node,
 	$session,
 	stuff,
-	is_error,
 	is_leaf,
 	status,
 	error
@@ -344,8 +342,8 @@ export async function load_node({
 				return proxy;
 			},
 			stuff: { ...stuff },
-			status: (is_error ? status : shadow.status) ?? null,
-			error: is_error ? error ?? null : null
+			status: shadow.status ?? status ?? null,
+			error: error ?? null
 		};
 
 		if (options.dev) {
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index 6238e4270e5a..512162b5f715 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -23,7 +23,7 @@ const updated = {
  *   state: import('types').SSRState;
  *   $session: any;
  *   page_config: { hydrate: boolean, router: boolean };
- *   status: number;
+ *   status: number | null;
  *   error: Error | null;
  *   event: import('types').RequestEvent;
  *   resolve_opts: import('types').RequiredResolveOptions;
@@ -128,7 +128,7 @@ export async function render_response({
 				error,
 				params: event.params,
 				routeId: event.routeId,
-				status,
+				status: status || 200,
 				stuff,
 				url: state.prerendering ? new PrerenderingURL(event.url) : event.url
 			},
@@ -321,7 +321,7 @@ export async function render_response({
 	}
 
 	return new Response(html, {
-		status,
+		status: status || 200,
 		headers
 	});
 }
diff --git a/packages/kit/src/runtime/server/page/respond.js b/packages/kit/src/runtime/server/page/respond.js
index 961a6b1680be..ed9ad09df2b8 100644
--- a/packages/kit/src/runtime/server/page/respond.js
+++ b/packages/kit/src/runtime/server/page/respond.js
@@ -36,7 +36,7 @@ export async function respond(opts) {
 				hydrate: true,
 				router: true
 			},
-			status: 200,
+			status: null,
 			error: null,
 			event,
 			stuff: {}
@@ -84,8 +84,8 @@ export async function respond(opts) {
 	/** @type {Array<Loaded>} */
 	let branch = [];
 
-	/** @type {number} */
-	let status = 200;
+	/** @type {number | null} */
+	let status = null;
 
 	/** @type {Error | null} */
 	let error = null;
@@ -105,10 +105,15 @@ export async function respond(opts) {
 			if (node) {
 				try {
 					loaded = await load_node({
-						...opts,
+						event,
+						options,
+						state,
+						route,
 						node,
+						$session,
 						stuff,
-						is_error: false,
+						status,
+						error,
 						is_leaf: i === nodes.length - 1
 					});
 
@@ -159,10 +164,13 @@ export async function respond(opts) {
 							try {
 								const error_loaded = /** @type {import('./types').Loaded} */ (
 									await load_node({
-										...opts,
+										event,
+										options,
+										state,
+										route,
+										$session,
 										node: error_node,
 										stuff: node_loaded.stuff,
-										is_error: true,
 										is_leaf: false,
 										status,
 										error
diff --git a/packages/kit/src/runtime/server/page/respond_with_error.js b/packages/kit/src/runtime/server/page/respond_with_error.js
index c3defa2d244e..bc9532e2ce9a 100644
--- a/packages/kit/src/runtime/server/page/respond_with_error.js
+++ b/packages/kit/src/runtime/server/page/respond_with_error.js
@@ -46,7 +46,8 @@ export async function respond_with_error({
 					node: default_layout,
 					$session,
 					stuff: {},
-					is_error: false,
+					status,
+					error,
 					is_leaf: false
 				})
 			);
@@ -64,7 +65,6 @@ export async function respond_with_error({
 					node: default_error,
 					$session,
 					stuff: layout_loaded ? layout_loaded.stuff : {},
-					is_error: true,
 					is_leaf: false,
 					status,
 					error
diff --git a/packages/kit/test/apps/basics/src/routes/__layout.svelte b/packages/kit/test/apps/basics/src/routes/__layout.svelte
index 1cb9805e3ec6..79f8f93df801 100644
--- a/packages/kit/test/apps/basics/src/routes/__layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/__layout.svelte
@@ -1,6 +1,6 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ fetch, url }) {
+	export async function load({ fetch, url, status }) {
 		if (url.pathname.startsWith('/errors/error-in-layout')) {
 			const res = await fetch('/errors/error-in-layout/non-existent');
 
@@ -9,8 +9,18 @@
 			};
 		}
 
+		if (url.pathname === '/errors/status-in-layout' && !status) {
+			console.log('returning 500');
+
+			return {
+				status: 500,
+				error: new Error('status is accessible in __layout')
+			};
+		}
+
 		return {
 			props: {
+				status,
 				foo: {
 					bar: 'Custom layout'
 				}
@@ -42,10 +52,14 @@
 
 	/** @type {{ bar: string }} */
 	export let foo;
+
+	/** @type {number} */
+	export let status;
 </script>
 
 <slot />
 
+<p id="status">layout status: {status}</p>
 <footer>{foo.bar}</footer>
 
 <style>
diff --git a/packages/kit/test/apps/basics/src/routes/errors/status-in-layout/index.svelte b/packages/kit/test/apps/basics/src/routes/errors/status-in-layout/index.svelte
new file mode 100644
index 000000000000..9f2f65a59c9d
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/errors/status-in-layout/index.svelte
@@ -0,0 +1,2 @@
+<!-- this file exists only so that /errors/status-in-layout is a valid route -->
+<h1>this should not be visible</h1>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 0b84849af70a..688719a9a8cb 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -1303,6 +1303,13 @@ test.describe('Errors', () => {
 			expect(/** @type {Response} */ (response).status()).toBe(400);
 		}
 	});
+
+	test('status is accessible in __layout, if set', async ({ page }) => {
+		await page.goto('/errors/status-in-layout');
+		expect(await page.textContent('#message')).toBe(
+			'This is your custom error page saying: "status is accessible in __layout"'
+		);
+	});
 });
 
 test.describe('ETags', () => {