@sveltejs/kit 1.0.0-next.2 → 1.0.0-next.202

package/README.md

@@ -1,15 +1,18 @@
-# @sveltejs/kit
+# The fastest way to build Svelte apps
 
-Here be dragons, etc etc.
+This is the [SvelteKit](https://kit.svelte.dev) framework and CLI.
 
-This project aims to replicate Sapper's functionality in its entirety, minus building for deployment (which can be handled by 'adapters' that do various opinionated things with the output of `snowpack build`).
+The quickest way to get started is via the [create-svelte](https://github.com/sveltejs/kit/tree/master/packages/create-svelte) package:
 
-It's currently missing a ton of stuff but I figured I'd throw it up on GitHub anyway partly for the sake of 'working in the open' but mostly because I need an issue tracker to organise my thoughts.
+```bash
+npm init svelte@next my-app
+cd my-app
+npm install
+npm run dev
+```
 
-There are no tests yet or anything like that. Some of the code has just been straight copied over from the existing Sapper repo, but a pleasing amount of it can safely be left behind.
+See the [documentation](https://kit.svelte.dev/docs) to learn more.
 
-## Trying it out
+## Changelog
 
-Clone this repo, `npm install`, and `npm link`. That will create a global link to the `svelte` bin. You can then either `npm run build` or `npm run dev`, if you intend to make changes and see them immediately reflected.
-
-Then, clone the corresponding [svelte-app-demo](https://github.com/sveltejs/svelte-app-demo) repo and follow the instructions therein.
+[The Changelog for this package is available on GitHub](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md).

package/assets/components/error.svelte

@@ -1,13 +1,29 @@
+<script context="module">
+	/** @type {import('@sveltejs/kit').ErrorLoad} */
+	export function load({ error, status }) {
+		return {
+			props: { error, status }
+		};
+	}
+</script>
+
 <script>
+	/** @type {number} */
 	export let status;
+
+	/** @type {Error & {frame?: string} & {loc?: object}} */
 	export let error;
 </script>
 
 <h1>{status}</h1>
 
-<p>{error.message}</p>
+<pre>{error.message}</pre>
 
-<!-- TODO figure out what to do with stacktraces in prod -->
+<!-- TODO figure out what to do with frames/stacktraces in prod -->
+<!-- frame is populated by Svelte in its CompileError and is a Rollup/Vite convention -->
+{#if error.frame}
+	<pre>{error.frame}</pre>
+{/if}
 {#if error.stack}
 	<pre>{error.stack}</pre>
-{/if}
+{/if}

package/assets/runtime/app/env.js

@@ -0,0 +1,20 @@
+export { prerendering } from '../env.js';
+
+/**
+ * @type {import('$app/env').browser}
+ */
+const browser = !import.meta.env.SSR;
+/**
+ * @type {import('$app/env').dev}
+ */
+const dev = !!import.meta.env.DEV;
+/**
+ * @type {import('$app/env').mode}
+ */
+const mode = import.meta.env.MODE;
+/**
+ * @type {import('$app/env').amp}
+ */
+const amp = !!import.meta.env.VITE_SVELTEKIT_AMP;
+
+export { amp, browser, dev, mode };

package/assets/runtime/app/navigation.js

@@ -1,47 +1,55 @@
-import { router, renderer } from '../internal/singletons.js';
-
-function get_base_uri(window_document) {
-	let baseURI = window_document.baseURI;
-
-	if (!baseURI) {
-		const baseTags = window_document.getElementsByTagName('base');
-		baseURI = baseTags.length ? baseTags[0].href : window_document.URL;
-	}
-
-	return baseURI;
+import { router as router$1 } from '../internal/singletons.js';
+import { g as get_base_uri } from '../chunks/utils.js';
+
+const router = /** @type {import('../client/router').Router} */ (router$1);
+
+/**
+ * @param {string} name
+ */
+function guard(name) {
+	return () => {
+		throw new Error(`Cannot call ${name}(...) on the server`);
+	};
 }
 
-function goto(href, { noscroll = false, replaceState = false } = {}) {
-	const url = new URL(href, get_base_uri(document));
-	const page = router.select(url);
+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_;
 
-	if (page) {
-		// TODO this logic probably belongs inside router? cid should be private
-		history[replaceState ? 'replaceState' : 'pushState']({ id: router.cid }, '', href);
-
-		// TODO shouldn't need to pass the hash here
-		return router.navigate(page, null, noscroll, url.hash);
-	}
+/**
+ * @type {import('$app/navigation').goto}
+ */
+async function goto_(href, opts) {
+	return router.goto(href, opts, []);
+}
 
-	location.href = href;
-	return new Promise(() => {
-		/* never resolves */
-	});
+/**
+ * @type {import('$app/navigation').invalidate}
+ */
+async function invalidate_(resource) {
+	const { href } = new URL(resource, location.href);
+	return router.renderer.invalidate(href);
 }
 
-function prefetch(href) {
-	return renderer.prefetch(new URL(href, get_base_uri(document)));
+/**
+ * @type {import('$app/navigation').prefetch}
+ */
+function prefetch_(href) {
+	return router.prefetch(new URL(href, get_base_uri(document)));
 }
 
-async function prefetchRoutes(pathnames) {
-	const path_routes = pathnames
-		? router.pages.filter((page) => pathnames.some((pathname) => page.pattern.test(pathname)))
-		: router.pages;
+/**
+ * @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 = path_routes.map((r) => Promise.all(r.parts.map((p) => p[0]())));
+	const promises = matching.map((r) => Promise.all(r[1].map((load) => load())));
 
 	await Promise.all(promises);
 }
 
-export { goto, prefetch, prefetchRoutes };
-//# sourceMappingURL=navigation.js.map
+export { goto, invalidate, prefetch, prefetchRoutes };

package/assets/runtime/app/paths.js

@@ -0,0 +1 @@
+export { assets, base } from '../paths.js';

package/assets/runtime/app/stores.js

@@ -1,7 +1,8 @@
 import { getContext } from 'svelte';
+import { browser } from './env.js';
+import '../env.js';
 
-// const ssr = (import.meta as any).env.SSR;
-const ssr = typeof window === 'undefined'; // TODO why doesn't previous line work in build?
+const ssr = !browser;
 
 // TODO remove this (for 1.0? after 1.0?)
 let warned = false;
@@ -13,6 +14,9 @@ function stores() {
 	return getStores();
 }
 
+/**
+ * @type {import('$app/stores').getStores}
+ */
 const getStores = () => {
 	const stores = getContext('__svelte__');
 
@@ -23,6 +27,8 @@ const getStores = () => {
 		navigating: {
 			subscribe: stores.navigating.subscribe
 		},
+		// TODO remove this (for 1.0? after 1.0?)
+		// @ts-expect-error - deprecated, not part of type definitions, but still callable
 		get preloading() {
 			console.error('stores.preloading is deprecated; use stores.navigating instead');
 			return {
@@ -33,13 +39,16 @@ const getStores = () => {
 	};
 };
 
+/** @type {typeof import('$app/stores').page} */
 const page = {
+	/** @param {(value: any) => void} fn */
 	subscribe(fn) {
 		const store = getStores().page;
 		return store.subscribe(fn);
 	}
 };
 
+/** @type {typeof import('$app/stores').navigating} */
 const navigating = {
 	subscribe(fn) {
 		const store = getStores().navigating;
@@ -47,6 +56,7 @@ const navigating = {
 	}
 };
 
+/** @param {string} verb */
 const error = (verb) => {
 	throw new Error(
 		ssr
@@ -55,6 +65,7 @@ const error = (verb) => {
 	);
 };
 
+/** @type {typeof import('$app/stores').session} */
 const session = {
 	subscribe(fn) {
 		const store = getStores().session;
@@ -66,13 +77,8 @@ const session = {
 
 		return store.subscribe(fn);
 	},
-	set: (value) => {
-		error('set');
-	},
-	update: (updater) => {
-		error('update');
-	}
+	set: () => error('set'),
+	update: () => error('update')
 };
 
 export { getStores, navigating, page, session, stores };
-//# sourceMappingURL=stores.js.map

package/assets/runtime/chunks/utils.js

@@ -0,0 +1,13 @@
+/** @param {HTMLDocument} doc */
+function get_base_uri(doc) {
+	let baseURI = doc.baseURI;
+
+	if (!baseURI) {
+		const baseTags = doc.getElementsByTagName('base');
+		baseURI = baseTags.length ? baseTags[0].href : doc.URL;
+	}
+
+	return baseURI;
+}
+
+export { get_base_uri as g };

package/assets/runtime/env.js

@@ -0,0 +1,8 @@
+let prerendering = false;
+
+/** @param {boolean} value */
+function set_prerendering(value) {
+	prerendering = value;
+}
+
+export { prerendering, set_prerendering };

package/assets/runtime/internal/singletons.js

@@ -1,10 +1,9 @@
+/** @type {import('./router').Router?} */
 let router;
-let renderer;
 
-function init(opts) {
-	router = opts.router;
-	renderer = opts.renderer;
+/** @param {import('./router').Router?} _ */
+function init(_) {
+	router = _;
 }
 
-export { init, renderer, router };
-//# sourceMappingURL=singletons.js.map
+export { init, router };