Fix two more type errors (#527)

sveltejs · Mar 14, 2021 · 6c4e153 · 6c4e153
1 parent 12a885b
commit 6c4e153
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
@@ -168,7 +168,7 @@ export class Renderer {
 
 	/**
 	 * @param {import('./types').NavigationTarget} selected
-	 * @param {string[]} chain
+	 * @param {string[]} [chain]
 	 */
 	async render(selected, chain) {
 		const token = (this.token = {});
@@ -182,7 +182,7 @@ export class Renderer {
 					hydrated.props.error = new Error('Redirect loop');
 				} else {
 					this.router.goto(hydrated.redirect, { replaceState: true }, [
-						...chain,
+						...(chain || []),
 						this.current.page.path
 					]);
 

diff --git a/packages/kit/src/runtime/server/page.js b/packages/kit/src/runtime/server/page.js
@@ -187,7 +187,7 @@ async function get_response({ request, options, $session, route, status = 200, e
 			// error page, there's not a lot we can do
 			if (error) throw e instanceof Error ? e : new Error(e);
 
-			loaded = { error: e instanceof Error ? e : { message: e.toString() }, status: 500 };
+			loaded = { error: e instanceof Error ? e : { name: 'Error', message: e.toString() }, status: 500 };
 		}
 
 		if (loaded) {
@@ -276,7 +276,7 @@ async function get_response({ request, options, $session, route, status = 200, e
 			$session,
 			route,
 			status: 500,
-			error: e instanceof Error ? e : { message: e.toString() }
+			error: e instanceof Error ? e : { name: 'Error', message: e.toString() }
 		});
 	}