@sveltejs/kit 1.0.0-next.414 → 1.0.0-next.417

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.414",
+  "version": "1.0.0-next.417",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/core/sync/create_manifest_data/index.js

@@ -172,12 +172,22 @@ export default function create_manifest_data({
 			if (item.is_page) {
 				const route = /** @type {import('types').PageData} */ (route_map.get(id));
 
-				if (item.kind === 'component') {
-					route.leaf.component = project_relative;
-
-					const { layouts, errors } = trace(tree, id, item.uses_layout, project_relative);
+				// This ensures that layouts and errors are set for pages that have no Svelte file
+				// and only redirect or throw an error, but are set to the Svelte file definition if it exists.
+				// This ensures the proper error page is used and rendered in the proper layout.
+				if (item.kind === 'component' || route.layouts.length === 0) {
+					const { layouts, errors } = trace(
+						tree,
+						id,
+						item.kind === 'component' ? item.uses_layout : undefined,
+						project_relative
+					);
 					route.layouts = layouts;
 					route.errors = errors;
+				}
+
+				if (item.kind === 'component') {
+					route.leaf.component = project_relative;
 				} else if (item.kind === 'server') {
 					route.leaf.server = project_relative;
 				} else {

package/src/runtime/app/stores.js

@@ -32,7 +32,10 @@ export const getStores = () => {
 				subscribe: stores.navigating.subscribe
 			};
 		},
-		session: stores.session,
+		get session() {
+			removed_session();
+			return {};
+		},
 		updated: stores.updated
 	};
 };
@@ -54,29 +57,17 @@ export const navigating = {
 	}
 };
 
-/** @param {string} verb */
-const throw_error = (verb) => {
+function removed_session() {
+	// TODO remove for 1.0
 	throw new Error(
-		browser
-			? `Cannot ${verb} session store before subscribing`
-			: `Can only ${verb} session store in browser`
+		'stores.session is no longer available. See https://github.com/sveltejs/kit/discussions/5883'
 	);
-};
+}
 
-/** @type {typeof import('$app/stores').session} */
 export const session = {
-	subscribe(fn) {
-		const store = getStores().session;
-
-		if (browser) {
-			session.set = store.set;
-			session.update = store.update;
-		}
-
-		return store.subscribe(fn);
-	},
-	set: () => throw_error('set'),
-	update: () => throw_error('update')
+	subscribe: removed_session,
+	set: removed_session,
+	update: removed_session
 };
 
 /** @type {typeof import('$app/stores').updated} */
@@ -90,5 +81,11 @@ export const updated = {
 
 		return store.subscribe(fn);
 	},
-	check: () => throw_error('check')
+	check: () => {
+		throw new Error(
+			browser
+				? `Cannot check updated store before subscribing`
+				: `Can only check updated store in browser`
+		);
+	}
 };

package/src/runtime/client/client.js

@@ -50,13 +50,12 @@ function update_scroll_positions(index) {
 /**
  * @param {{
  *   target: Element;
- *   session: App.Session;
  *   base: string;
  *   trailing_slash: import('types').TrailingSlash;
  * }} opts
  * @returns {import('./types').Client}
  */
-export function create_client({ target, session, base, trailing_slash }) {
+export function create_client({ target, base, trailing_slash }) {
 	/** @type {Array<((href: string) => boolean)>} */
 	const invalidated = [];
 
@@ -64,7 +63,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 		url: notifiable_store({}),
 		page: notifiable_store({}),
 		navigating: writable(/** @type {import('types').Navigation | null} */ (null)),
-		session: writable(session),
 		updated: create_updated_store()
 	};
 
@@ -102,23 +100,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 	/** @type {import('svelte').SvelteComponent} */
 	let root;
 
-	/** @type {App.Session} */
-	let $session;
-
-	let ready = false;
-	stores.session.subscribe(async (value) => {
-		$session = value;
-
-		if (!ready) return;
-		session_id += 1;
-
-		const current_load_uses_session = current.branch.some((node) => node?.uses.session);
-		if (!current_load_uses_session) return;
-
-		update(new URL(location.href), []);
-	});
-	ready = true;
-
 	let router_enabled = true;
 
 	// keeping track of the history index in order to prevent popstate navigation events if needed
@@ -475,7 +456,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 		const uses = {
 			params: new Set(),
 			url: false,
-			session: false,
 			dependencies: new Set(),
 			parent: false
 		};
@@ -511,7 +491,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 			});
 		}
 
-		const session = $session;
 		const load_url = new LoadURL(url);
 
 		if (node.shared?.load) {
@@ -524,10 +503,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 					uses.url = true;
 					return load_url;
 				},
-				get session() {
-					uses.session = true;
-					return session;
-				},
 				async fetch(resource, init) {
 					let requested;
 
@@ -581,6 +556,12 @@ export function create_client({ target, session, base, trailing_slash }) {
 						'@migration task: Replace `props` with `data` stuff https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693'
 					);
 				},
+				get session() {
+					// TODO remove this for 1.0
+					throw new Error(
+						'session is no longer available. See https://github.com/sveltejs/kit/discussions/5883'
+					);
+				},
 				get stuff() {
 					throw new Error(
 						'@migration task: Remove stuff https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693'
@@ -620,8 +601,7 @@ export function create_client({ target, session, base, trailing_slash }) {
 
 		const changed = current.url && {
 			url: id !== current.url.pathname + current.url.search,
-			params: Object.keys(params).filter((key) => current.params[key] !== params[key]),
-			session: session_id !== current.session_id
+			params: Object.keys(params).filter((key) => current.params[key] !== params[key])
 		};
 
 		// preload modules to avoid waterfall, but handle rejections
@@ -643,7 +623,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 					!previous ||
 					(changed.url && previous.uses.url) ||
 					changed.params.some((param) => previous.uses.params.has(param)) ||
-					(changed.session && previous.uses.session) ||
 					Array.from(previous.uses.dependencies).some((dep) => invalidated.some((fn) => fn(dep))) ||
 					(previous.uses.parent && nodes_changed_since_last_render.includes(true));
 				nodes_changed_since_last_render.push(changed_since_last_render);
@@ -753,7 +732,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 									uses: {
 										params: new Set(),
 										url: false,
-										session: false,
 										dependencies: new Set(),
 										parent: false
 									}
@@ -825,7 +803,6 @@ export function create_client({ target, session, base, trailing_slash }) {
 			uses: {
 				params: new Set(),
 				url: false,
-				session: false,
 				dependencies: new Set(),
 				parent: false
 			}

package/src/runtime/client/start.js

@@ -11,7 +11,6 @@ export { set_public_env } from '../env-public.js';
  *     base: string;
  *   },
  *   target: Element;
- *   session: any;
  *   route: boolean;
  *   spa: boolean;
  *   trailing_slash: import('types').TrailingSlash;
@@ -24,10 +23,9 @@ export { set_public_env } from '../env-public.js';
  *   };
  * }} opts
  */
-export async function start({ paths, target, session, route, spa, trailing_slash, hydrate }) {
+export async function start({ paths, target, route, spa, trailing_slash, hydrate }) {
 	const client = create_client({
 		target,
-		session,
 		base: paths.base,
 		trailing_slash
 	});

package/src/runtime/client/types.d.ts

@@ -69,7 +69,6 @@ export type BranchNode = {
 	uses: {
 		params: Set<string>;
 		url: boolean; // TODO make more granular?
-		session: boolean;
 		dependencies: Set<string>;
 		parent: boolean;
 	};

package/src/runtime/server/index.js

@@ -222,7 +222,6 @@ export async function respond(request, options, state) {
 						event,
 						options,
 						state,
-						$session: await options.hooks.getSession(event),
 						page_config: { router: true, hydrate: true },
 						status: 200,
 						error: null,
@@ -365,12 +364,10 @@ export async function respond(request, options, state) {
 				// if this request came direct from the user, rather than
 				// via a `fetch` in a `load`, render a 404 page
 				if (!state.initiator) {
-					const $session = await options.hooks.getSession(event);
 					return await respond_with_error({
 						event,
 						options,
 						state,
-						$session,
 						status: 404,
 						error: new Error(`Not found: ${event.url.pathname}`),
 						resolve_opts
@@ -418,12 +415,10 @@ 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({
 				event,
 				options,
 				state,
-				$session,
 				status: 500,
 				error,
 				resolve_opts

package/src/runtime/server/page/index.js

@@ -43,8 +43,6 @@ export async function render_page(event, route, options, state, resolve_opts) {
 		}
 	}
 
-	const $session = await options.hooks.getSession(event);
-
 	const { fetcher, fetched, cookies } = create_fetch({ event, options, state, route });
 
 	try {
@@ -112,7 +110,6 @@ export async function render_page(event, route, options, state, resolve_opts) {
 				event,
 				options,
 				state,
-				$session,
 				resolve_opts
 			});
 		}
@@ -180,11 +177,9 @@ export async function render_page(event, route, options, state, resolve_opts) {
 			return Promise.resolve().then(async () => {
 				try {
 					return await load_data({
-						$session,
 						event,
 						fetcher,
 						node,
-						options,
 						parent: async () => {
 							const data = {};
 							for (let j = 0; j < i; j += 1) {
@@ -240,7 +235,6 @@ export async function render_page(event, route, options, state, resolve_opts) {
 								event,
 								options,
 								state,
-								$session,
 								resolve_opts,
 								page_config: { router: true, hydrate: true },
 								status,
@@ -294,7 +288,6 @@ export async function render_page(event, route, options, state, resolve_opts) {
 			event,
 			options,
 			state,
-			$session,
 			resolve_opts,
 			page_config: get_page_config(leaf_node, options),
 			status,
@@ -313,7 +306,6 @@ export async function render_page(event, route, options, state, resolve_opts) {
 			event,
 			options,
 			state,
-			$session,
 			status: 500,
 			error: /** @type {Error} */ (error),
 			resolve_opts

package/src/runtime/server/page/load_data.js

@@ -33,26 +33,15 @@ export async function load_server_data({ event, node, parent }) {
 /**
  * Calls the user's `load` function.
  * @param {{
- *   $session: Record<string, any>;
  *   event: import('types').RequestEvent;
  *   fetcher: typeof fetch;
  *   node: import('types').SSRNode | undefined;
- *   options: import('types').SSROptions;
  *   parent: () => Promise<Record<string, any>>;
  *   server_data_promise: Promise<import('types').JSONObject | null>;
  *   state: import('types').SSRState;
  * }} opts
  */
-export async function load_data({
-	$session,
-	event,
-	fetcher,
-	node,
-	options,
-	parent,
-	server_data_promise,
-	state
-}) {
+export async function load_data({ event, fetcher, node, parent, server_data_promise, state }) {
 	const server_data = await server_data_promise;
 
 	if (!node?.shared?.load) {
@@ -65,12 +54,10 @@ export async function load_data({
 		data: server_data,
 		routeId: event.routeId,
 		get session() {
-			if (node.shared.prerender ?? options.prerender.default) {
-				throw Error(
-					'Attempted to access session from a prerendered page. Session would never be populated.'
-				);
-			}
-			return $session;
+			// TODO remove for 1.0
+			throw new Error(
+				'session is no longer available. See https://github.com/sveltejs/kit/discussions/5883'
+			);
 		},
 		fetch: fetcher,
 		setHeaders: event.setHeaders,

package/src/runtime/server/page/render.js

@@ -1,7 +1,6 @@
 import devalue from 'devalue';
 import { readable, writable } from 'svelte/store';
 import * as cookie from 'cookie';
-import { coalesce_to_error } from '../../../utils/error.js';
 import { hash } from '../../hash.js';
 import { render_json_payload_script } from '../../../utils/escape.js';
 import { s } from '../../../utils/misc.js';
@@ -25,7 +24,6 @@ const updated = {
  *   cookies: import('set-cookie-parser').Cookie[];
  *   options: import('types').SSROptions;
  *   state: import('types').SSRState;
- *   $session: any;
  *   page_config: { hydrate: boolean, router: boolean };
  *   status: number;
  *   error: HttpError | Error | null;
@@ -40,7 +38,6 @@ export async function render_response({
 	cookies,
 	options,
 	state,
-	$session,
 	page_config,
 	status,
 	error = null,
@@ -79,14 +76,11 @@ export async function render_response({
 	}
 
 	if (resolve_opts.ssr) {
-		const session = writable($session);
-
 		/** @type {Record<string, any>} */
 		const props = {
 			stores: {
 				page: writable(null),
 				navigating: writable(null),
-				session,
 				updated
 			},
 			/** @type {import('types').Page} */
@@ -165,9 +159,6 @@ export async function render_response({
 		start({
 			target: document.querySelector('[data-sveltekit-hydrate="${target}"]').parentNode,
 			paths: ${s(options.paths)},
-			session: ${try_serialize($session, (error) => {
-				throw new Error(`Failed to serialize session data: ${error.message}`);
-			})},
 			route: ${!!page_config.router},
 			spa: ${!resolve_opts.ssr},
 			trailing_slash: ${s(options.trailing_slash)},
@@ -348,16 +339,3 @@ export async function render_response({
 		headers
 	});
 }
-
-/**
- * @param {any} data
- * @param {(error: Error) => void} [fail]
- */
-function try_serialize(data, fail) {
-	try {
-		return devalue(data);
-	} catch (err) {
-		if (fail) fail(coalesce_to_error(err));
-		return null;
-	}
-}

package/src/runtime/server/page/respond_with_error.js

@@ -15,21 +15,12 @@ import { create_fetch } from './fetch.js';
  *   event: import('types').RequestEvent;
  *   options: SSROptions;
  *   state: SSRState;
- *   $session: any;
  *   status: number;
  *   error: Error;
  *   resolve_opts: import('types').RequiredResolveOptions;
  * }} opts
  */
-export async function respond_with_error({
-	event,
-	options,
-	state,
-	$session,
-	status,
-	error,
-	resolve_opts
-}) {
+export async function respond_with_error({ event, options, state, status, error, resolve_opts }) {
 	const { fetcher, fetched, cookies } = create_fetch({
 		event,
 		options,
@@ -52,11 +43,9 @@ export async function respond_with_error({
 			const server_data = await server_data_promise;
 
 			const data = await load_data({
-				$session,
 				event,
 				fetcher,
 				node: default_layout,
-				options,
 				parent: async () => ({}),
 				server_data_promise,
 				state
@@ -79,7 +68,6 @@ export async function respond_with_error({
 		return await render_response({
 			options,
 			state,
-			$session,
 			page_config: {
 				hydrate: options.hydrate,
 				router: options.router

package/src/vite/build/build_server.js

@@ -110,7 +110,6 @@ export class Server {
 		if (!this.options.hooks) {
 			const module = await import(${s(hooks)});
 			this.options.hooks = {
-				getSession: module.getSession || (() => ({})),
 				handle: module.handle || (({ event, resolve }) => resolve(event)),
 				handleError: module.handleError || (({ error }) => console.error(error.stack)),
 				externalFetch: module.externalFetch || fetch

package/src/vite/dev/index.js

@@ -343,7 +343,6 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 
 				/** @type {import('types').Hooks} */
 				const hooks = {
-					getSession: user_hooks.getSession || (() => ({})),
 					handle,
 					handleError:
 						user_hooks.handleError ||

package/types/ambient.d.ts

@@ -12,12 +12,10 @@
  * 	interface PrivateEnv {}
  *
  * 	interface PublicEnv {}
- *
- * 	interface Session {}
  * }
  * ```
  *
- * By populating these interfaces, you will gain type safety when using `env`, `event.locals`, `event.platform`, `session` and `stuff`.
+ * By populating these interfaces, you will gain type safety when using `env`, `event.locals` and `event.platform`.
  *
  * Note that since it's an ambient declaration file, you have to be careful when using `import` statements. Once you add an `import`
  * at the top level, the declaration file is no longer considered ambient and you lose access to these typings in other files.
@@ -45,7 +43,7 @@
  */
 declare namespace App {
 	/**
-	 * The interface that defines `event.locals`, which can be accessed in [hooks](https://kit.svelte.dev/docs/hooks) (`handle`, `handleError` and `getSession`) and [endpoints](https://kit.svelte.dev/docs/routing#endpoints).
+	 * The interface that defines `event.locals`, which can be accessed in [hooks](https://kit.svelte.dev/docs/hooks) (`handle`, and `handleError`), server-only `load` functions, and `+server.js` files.
 	 */
 	export interface Locals {}
 
@@ -63,11 +61,6 @@ declare namespace App {
 	 * The interface that defines the dynamic environment variables exported from `$env/dynamic/public`.
 	 */
 	export interface PublicEnv extends Record<string, string> {}
-
-	/**
-	 * The interface that defines `session`, both as an argument to [`load`](https://kit.svelte.dev/docs/load) functions and the value of the [session store](https://kit.svelte.dev/docs/modules#$app-stores).
-	 */
-	export interface Session {}
 }
 
 /**
@@ -220,15 +213,15 @@ declare module '$app/paths' {
 
 /**
  * ```ts
- * import { getStores, navigating, page, session, updated } from '$app/stores';
+ * import { getStores, navigating, page, updated } from '$app/stores';
  * ```
  *
- * Stores are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `session` and `page` are unique to each request on the server, rather than shared between multiple requests handled by the same server simultaneously, which is what makes it safe to include user-specific data in `session`.
+ * Stores are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `page` is unique to each request on the server, rather than shared between multiple requests handled by the same server simultaneously.
  *
  * Because of that, you must subscribe to the stores during component initialization (which happens automatically if you reference the store value, e.g. as `$page`, in a component) before you can use them.
  */
 declare module '$app/stores' {
-	import { Readable, Writable } from 'svelte/store';
+	import { Readable } from 'svelte/store';
 	import { Navigation, Page } from '@sveltejs/kit';
 
 	/**
@@ -238,7 +231,6 @@ declare module '$app/stores' {
 	export function getStores(): {
 		navigating: typeof navigating;
 		page: typeof page;
-		session: typeof session;
 		updated: typeof updated;
 	};
 
@@ -252,11 +244,6 @@ declare module '$app/stores' {
 	 * When navigating finishes, its value reverts to `null`.
 	 */
 	export const navigating: Readable<Navigation | null>;
-	/**
-	 * A writable store whose initial value is whatever was returned from [`getSession`](https://kit.svelte.dev/docs/hooks#getsession).
-	 * It can be written to, but this will not cause changes to persist on the server — this is something you must implement yourself.
-	 */
-	export const session: Writable<App.Session>;
 	/**
 	 *  A readable store whose initial value is `false`. If [`version.pollInterval`](https://kit.svelte.dev/docs/configuration#version) is a non-zero value, SvelteKit will poll for new versions of the app and update the store value to `true` when it detects one. `updated.check()` will force an immediate check, regardless of polling.
 	 */

package/types/index.d.ts

@@ -109,6 +109,7 @@ export interface Config {
 	extensions?: string[];
 	kit?: KitConfig;
 	preprocess?: any;
+	[key: string]: any;
 }
 
 export interface KitConfig {
@@ -177,10 +178,6 @@ export interface ExternalFetch {
 	(req: Request): Promise<Response>;
 }
 
-export interface GetSession {
-	(event: RequestEvent): MaybePromise<App.Session>;
-}
-
 export interface Handle {
 	(input: {
 		event: RequestEvent;
@@ -214,7 +211,6 @@ export interface LoadEvent<
 	params: Params;
 	data: Data;
 	routeId: string | null;
-	session: App.Session;
 	setHeaders: (headers: ResponseHeaders) => void;
 	url: URL;
 	parent: () => Promise<ParentData>;

package/types/internal.d.ts

@@ -5,7 +5,6 @@ import {
 	Config,
 	ExternalFetch,
 	ServerLoad,
-	GetSession,
 	Handle,
 	HandleError,
 	KitConfig,
@@ -92,7 +91,6 @@ export type GetParams = (match: RegExpExecArray) => Record<string, string>;
 
 export interface Hooks {
 	externalFetch: ExternalFetch;
-	getSession: GetSession;
 	handle: Handle;
 	handleError: HandleError;
 }