hydrate initial page before starting router (#654)

* hydrate initial page before starting router - fixes #652 * changeset
sveltejs · Mar 25, 2021 · d5071c5 · d5071c5 · vercel · Mar 25, 2021
1 parent 9576137
commit d5071c5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.changeset/sharp-pigs-study.md b/.changeset/sharp-pigs-study.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Hydrate initial page before starting router
diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
@@ -134,7 +134,10 @@ export class Renderer {
 			const hydrated = await this._hydrate(selected);
 
 			if (hydrated.redirect) {
-				throw new Error('TODO client-side redirects');
+				// this is a real edge case — `load` would need to return
+				// a redirect but only in the browser
+				location.href = new URL(hydrated.redirect, location.href).href;
+				return;
 			}
 
 			Object.assign(props, hydrated.props);

diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
@@ -36,8 +36,8 @@ export async function start({ paths, target, session, error, status, nodes, page
 	init({ router, renderer });
 	set_paths(paths);
 
-	router.init(renderer);
 	await renderer.start({ nodes, page }, status, error);
+	router.init(renderer);
 
 	dispatchEvent(new CustomEvent('sveltekit:start'));
 }