@sveltejs/kit 1.0.0-next.290 → 1.0.0-next.291

package/assets/app/navigation.js

@@ -1,5 +1,4 @@
-import { renderer, router } from '../client/singletons.js';
-import { g as get_base_uri } from '../chunks/utils.js';
+import { client } from '../client/singletons.js';
 
 /**
  * @param {string} name
@@ -10,70 +9,16 @@ function guard(name) {
 	};
 }
 
-const disableScrollHandling = import.meta.env.SSR
-	? guard('disableScrollHandling')
-	: disableScrollHandling_;
-const goto = import.meta.env.SSR ? guard('goto') : goto_;
-const invalidate = import.meta.env.SSR ? guard('invalidate') : invalidate_;
-const prefetch = import.meta.env.SSR ? guard('prefetch') : prefetch_;
-const prefetchRoutes = import.meta.env.SSR ? guard('prefetchRoutes') : prefetchRoutes_;
-const beforeNavigate = import.meta.env.SSR ? () => {} : beforeNavigate_;
-const afterNavigate = import.meta.env.SSR ? () => {} : afterNavigate_;
-
-/**
- * @type {import('$app/navigation').goto}
- */
-async function disableScrollHandling_() {
-	renderer.disable_scroll_handling();
-}
-
-/**
- * @type {import('$app/navigation').goto}
- */
-async function goto_(href, opts) {
-	return router.goto(href, opts, []);
-}
-
-/**
- * @type {import('$app/navigation').invalidate}
- */
-async function invalidate_(resource) {
-	const { href } = new URL(resource, location.href);
-	return router.renderer.invalidate(href);
-}
+const ssr = import.meta.env.SSR;
 
-/**
- * @type {import('$app/navigation').prefetch}
- */
-async function prefetch_(href) {
-	await router.prefetch(new URL(href, get_base_uri(document)));
-}
-
-/**
- * @type {import('$app/navigation').prefetchRoutes}
- */
-async function prefetchRoutes_(pathnames) {
-	const matching = pathnames
-		? router.routes.filter((route) => pathnames.some((pathname) => route[0].test(pathname)))
-		: router.routes;
-
-	const promises = matching.map((r) => Promise.all(r[1].map((load) => load())));
-
-	await Promise.all(promises);
-}
-
-/**
- * @type {import('$app/navigation').beforeNavigate}
- */
-function beforeNavigate_(fn) {
-	if (router) router.before_navigate(fn);
-}
-
-/**
- * @type {import('$app/navigation').afterNavigate}
- */
-function afterNavigate_(fn) {
-	if (router) router.after_navigate(fn);
-}
+const disableScrollHandling = ssr
+	? guard('disableScrollHandling')
+	: client.disable_scroll_handling;
+const goto = ssr ? guard('goto') : client.goto;
+const invalidate = ssr ? guard('invalidate') : client.invalidate;
+const prefetch = ssr ? guard('prefetch') : client.prefetch;
+const prefetchRoutes = ssr ? guard('prefetchRoutes') : client.prefetch_routes;
+const beforeNavigate = ssr ? () => {} : client.before_navigate;
+const afterNavigate = ssr ? () => {} : client.after_navigate;
 
 export { afterNavigate, beforeNavigate, disableScrollHandling, goto, invalidate, prefetch, prefetchRoutes };

package/assets/client/singletons.js

@@ -1,21 +1,13 @@
-/**
- * The router is nullable, but not typed that way for ease-of-use
- * @type {import('./router').Router}
- */
-let router;
-
-/** @type {import('./renderer').Renderer} */
-let renderer;
+/** @type {import('./types').Client} */
+let client;
 
 /**
  * @param {{
- *   router: import('./router').Router?;
- *   renderer: import('./renderer').Renderer;
+ *   client: import('./types').Client;
  * }} opts
  */
 function init(opts) {
-	router = /** @type {import('../client/router').Router} */ (opts.router);
-	renderer = opts.renderer;
+	client = opts.client;
 }
 
-export { init, renderer, router };
+export { client, init };