@sveltejs/kit 1.17.1 → 1.19.0

package/src/runtime/client/utils.js

@@ -32,10 +32,10 @@ const warned = new WeakSet();
 const valid_link_options = /** @type {const} */ ({
 	'preload-code': ['', 'off', 'tap', 'hover', 'viewport', 'eager'],
 	'preload-data': ['', 'off', 'tap', 'hover'],
-	keepfocus: ['', 'off'],
-	noscroll: ['', 'off'],
-	reload: ['', 'off'],
-	replacestate: ['', 'off']
+	keepfocus: ['', 'true', 'off', 'false'],
+	noscroll: ['', 'true', 'off', 'false'],
+	reload: ['', 'true', 'off', 'false'],
+	replacestate: ['', 'true', 'off', 'false']
 });
 
 /**
@@ -176,13 +176,27 @@ export function get_router_options(element) {
 		el = /** @type {Element} */ (parent_element(el));
 	}
 
+	/** @param {string | null} value */
+	function get_option_state(value) {
+		switch (value) {
+			case '':
+			case 'true':
+				return true;
+			case 'off':
+			case 'false':
+				return false;
+			default:
+				return null;
+		}
+	}
+
 	return {
 		preload_code: levels[preload_code ?? 'off'],
 		preload_data: levels[preload_data ?? 'off'],
-		keep_focus: keep_focus === 'off' ? false : keep_focus === '' ? true : null,
-		noscroll: noscroll === 'off' ? false : noscroll === '' ? true : null,
-		reload: reload === 'off' ? false : reload === '' ? true : null,
-		replace_state: replace_state === 'off' ? false : replace_state === '' ? true : null
+		keep_focus: get_option_state(keep_focus),
+		noscroll: get_option_state(noscroll),
+		reload: get_option_state(reload),
+		replace_state: get_option_state(replace_state)
 	};
 }
 
@@ -219,6 +233,13 @@ export function notifiable_store(value) {
 export function create_updated_store() {
 	const { set, subscribe } = writable(false);
 
+	if (DEV || !BROWSER) {
+		return {
+			subscribe,
+			check: async () => false
+		};
+	}
+
 	const interval = __SVELTEKIT_APP_VERSION_POLL_INTERVAL__;
 
 	/** @type {NodeJS.Timeout} */
@@ -226,8 +247,6 @@ export function create_updated_store() {
 
 	/** @type {() => Promise<boolean>} */
 	async function check() {
-		if (DEV || !BROWSER) return false;
-
 		clearTimeout(timeout);
 
 		if (interval) timeout = setTimeout(check, interval);

package/src/runtime/control.js

@@ -1,4 +1,4 @@
-export let HttpError = class HttpError {
+export class HttpError {
 	/**
 	 * @param {number} status
 	 * @param {{message: string} extends App.Error ? (App.Error | string | undefined) : App.Error} body
@@ -17,9 +17,9 @@ export let HttpError = class HttpError {
 	toString() {
 		return JSON.stringify(this.body);
 	}
-};
+}
 
-export let Redirect = class Redirect {
+export class Redirect {
 	/**
 	 * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308} status
 	 * @param {string} location
@@ -28,12 +28,12 @@ export let Redirect = class Redirect {
 		this.status = status;
 		this.location = location;
 	}
-};
+}
 
 /**
  * @template {Record<string, unknown> | undefined} [T=undefined]
  */
-export let ActionFailure = class ActionFailure {
+export class ActionFailure {
 	/**
 	 * @param {number} status
 	 * @param {T} [data]
@@ -42,7 +42,7 @@ export let ActionFailure = class ActionFailure {
 		this.status = status;
 		this.data = data;
 	}
-};
+}
 
 /**
  * This is a grotesque hack that, in dev, allows us to replace the implementations
@@ -57,7 +57,10 @@ export let ActionFailure = class ActionFailure {
  * }} implementations
  */
 export function replace_implementations(implementations) {
-	ActionFailure = implementations.ActionFailure;
-	HttpError = implementations.HttpError;
-	Redirect = implementations.Redirect;
+	// @ts-expect-error
+	ActionFailure = implementations.ActionFailure; // eslint-disable-line no-class-assign
+	// @ts-expect-error
+	HttpError = implementations.HttpError; // eslint-disable-line no-class-assign
+	// @ts-expect-error
+	Redirect = implementations.Redirect; // eslint-disable-line no-class-assign
 }

package/src/runtime/server/ambient.d.ts

@@ -1,8 +1,8 @@
 declare module '__SERVER__/internal.js' {
 	export const options: import('types').SSROptions;
 	export const get_hooks: () => Promise<{
-		handle?: import('types').Handle;
-		handleError?: import('types').HandleServerError;
-		handleFetch?: import('types').HandleFetch;
+		handle?: import('@sveltejs/kit').Handle;
+		handleError?: import('@sveltejs/kit').HandleServerError;
+		handleFetch?: import('@sveltejs/kit').HandleFetch;
 	}>;
 }

package/src/runtime/server/cookie.js

@@ -37,11 +37,11 @@ export function get_cookies(request, url, trailing_slash) {
 		secure: url.hostname === 'localhost' && url.protocol === 'http:' ? false : true
 	};
 
-	/** @type {import('types').Cookies} */
+	/** @type {import('@sveltejs/kit').Cookies} */
 	const cookies = {
 		// The JSDoc param annotations appearing below for get, set and delete
 		// are necessary to expose the `cookie` library types to
-		// typescript users. `@type {import('types').Cookies}` above is not
+		// typescript users. `@type {import('@sveltejs/kit').Cookies}` above is not
 		// sufficient to do so.
 
 		/**
@@ -174,7 +174,7 @@ export function get_cookies(request, url, trailing_slash) {
 	 * @param {import('cookie').CookieSerializeOptions} opts
 	 */
 	function set_internal(name, value, opts) {
-		let path = opts.path ?? default_path;
+		const path = opts.path ?? default_path;
 
 		new_cookies[name] = {
 			name,

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

@@ -11,10 +11,10 @@ import { create_async_iterator } from '../../../utils/streaming.js';
 const encoder = new TextEncoder();
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').SSRRoute} route
  * @param {import('types').SSROptions} options
- * @param {import('types').SSRManifest} manifest
+ * @param {import('@sveltejs/kit').SSRManifest} manifest
  * @param {import('types').SSRState} state
  * @param {boolean[] | undefined} invalidated_data_nodes
  * @param {import('types').TrailingSlash} trailing_slash
@@ -76,7 +76,8 @@ export async function render_data(
 								}
 							}
 							return data;
-						}
+						},
+						track_server_fetches: options.track_server_fetches
 					});
 				} catch (e) {
 					aborted = true;
@@ -182,7 +183,7 @@ export function redirect_json_response(redirect) {
 /**
  * If the serialized data contains promises, `chunks` will be an
  * async iterable containing their resolutions
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').SSROptions} options
  * @param {Array<import('types').ServerDataSkippedNode | import('types').ServerDataNode | import('types').ServerErrorNode | null | undefined>} nodes
  *  @returns {{ data: string, chunks: AsyncIterable<string> | null }}

package/src/runtime/server/endpoint.js

@@ -3,7 +3,7 @@ import { Redirect } from '../control.js';
 import { method_not_allowed } from './utils.js';
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').SSREndpoint} mod
  * @param {import('types').SSRState} state
  * @returns {Promise<Response>}
@@ -39,8 +39,8 @@ export async function render_endpoint(event, mod, state) {
 	}
 
 	try {
-		const response = await handler(
-			/** @type {import('types').RequestEvent<Record<string, any>>} */ (event)
+		let response = await handler(
+			/** @type {import('@sveltejs/kit').RequestEvent<Record<string, any>>} */ (event)
 		);
 
 		if (!(response instanceof Response)) {
@@ -50,6 +50,13 @@ export async function render_endpoint(event, mod, state) {
 		}
 
 		if (state.prerendering) {
+			// the returned Response might have immutable Headers
+			// so we should clone them before trying to mutate them
+			response = new Response(response.body, {
+				status: response.status,
+				statusText: response.statusText,
+				headers: new Headers(response.headers)
+			});
 			response.headers.set('x-sveltekit-prerender', String(prerender));
 		}
 
@@ -67,7 +74,7 @@ export async function render_endpoint(event, mod, state) {
 }
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  */
 export function is_endpoint_request(event) {
 	const { method, headers } = event.request;

package/src/runtime/server/fetch.js

@@ -4,9 +4,9 @@ import * as paths from '__sveltekit/paths';
 
 /**
  * @param {{
- *   event: import('types').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   options: import('types').SSROptions;
- *   manifest: import('types').SSRManifest;
+ *   manifest: import('@sveltejs/kit').SSRManifest;
  *   state: import('types').SSRState;
  *   get_cookie_header: (url: URL, header: string | null) => string;
  *   set_internal: (name: string, value: string, opts: import('cookie').CookieSerializeOptions) => void;
@@ -67,9 +67,6 @@ export function create_fetch({ event, options, manifest, state, get_cookie_heade
 					return fetch(request);
 				}
 
-				/** @type {Response} */
-				let response;
-
 				// handle fetch requests for static assets. e.g. prebaked data, etc.
 				// we need to support everything the browser's fetch supports
 				const prefix = paths.assets || paths.base;
@@ -121,7 +118,8 @@ export function create_fetch({ event, options, manifest, state, get_cookie_heade
 					);
 				}
 
-				response = await respond(request, options, manifest, {
+				/** @type {Response} */
+				const response = await respond(request, options, manifest, {
 					...state,
 					depth: state.depth + 1
 				});

package/src/runtime/server/index.js

@@ -7,10 +7,10 @@ export class Server {
 	/** @type {import('types').SSROptions} */
 	#options;
 
-	/** @type {import('types').SSRManifest} */
+	/** @type {import('@sveltejs/kit').SSRManifest} */
 	#manifest;
 
-	/** @param {import('types').SSRManifest} manifest */
+	/** @param {import('@sveltejs/kit').SSRManifest} manifest */
 	constructor(manifest) {
 		/** @type {import('types').SSROptions} */
 		this.#options = options;

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

@@ -5,7 +5,7 @@ import { is_form_content_type, negotiate } from '../../../utils/http.js';
 import { HttpError, Redirect, ActionFailure } from '../../control.js';
 import { handle_error_and_jsonify } from '../utils.js';
 
-/** @param {import('types').RequestEvent} event */
+/** @param {import('@sveltejs/kit').RequestEvent} event */
 export function is_action_json_request(event) {
 	const accept = negotiate(event.request.headers.get('accept') ?? '*/*', [
 		'application/json',
@@ -16,7 +16,7 @@ export function is_action_json_request(event) {
 }
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').SSROptions} options
  * @param {import('types').SSRNode['server'] | undefined} server
  */
@@ -92,12 +92,12 @@ export async function handle_action_json_request(event, options, server) {
  */
 function check_incorrect_fail_use(error) {
 	return error instanceof ActionFailure
-		? new Error(`Cannot "throw fail()". Use "return fail()"`)
+		? new Error('Cannot "throw fail()". Use "return fail()"')
 		: error;
 }
 
 /**
- * @param {import('types').Redirect} redirect
+ * @param {import('@sveltejs/kit').Redirect} redirect
  */
 export function action_json_redirect(redirect) {
 	return action_json({
@@ -108,7 +108,7 @@ export function action_json_redirect(redirect) {
 }
 
 /**
- * @param {import('types').ActionResult} data
+ * @param {import('@sveltejs/kit').ActionResult} data
  * @param {ResponseInit} [init]
  */
 function action_json(data, init) {
@@ -116,16 +116,16 @@ function action_json(data, init) {
 }
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  */
 export function is_action_request(event) {
 	return event.request.method === 'POST';
 }
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').SSRNode['server'] | undefined} server
- * @returns {Promise<import('types').ActionResult>}
+ * @returns {Promise<import('@sveltejs/kit').ActionResult>}
  */
 export async function handle_action_request(event, server) {
 	const actions = server?.actions;
@@ -185,18 +185,18 @@ export async function handle_action_request(event, server) {
 }
 
 /**
- * @param {import('types').Actions} actions
+ * @param {import('@sveltejs/kit').Actions} actions
  */
 function check_named_default_separate(actions) {
 	if (actions.default && Object.keys(actions).length > 1) {
 		throw new Error(
-			`When using named actions, the default action cannot be used. See the docs for more info: https://kit.svelte.dev/docs/form-actions#named-actions`
+			'When using named actions, the default action cannot be used. See the docs for more info: https://kit.svelte.dev/docs/form-actions#named-actions'
 		);
 	}
 }
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {NonNullable<import('types').SSRNode['server']['actions']>} actions
  * @throws {Redirect | ActionFailure | HttpError | Error}
  */
@@ -231,12 +231,12 @@ async function call_action(event, actions) {
 /** @param {any} data */
 function validate_action_return(data) {
 	if (data instanceof Redirect) {
-		throw new Error(`Cannot \`return redirect(...)\` — use \`throw redirect(...)\` instead`);
+		throw new Error('Cannot `return redirect(...)` — use `throw redirect(...)` instead');
 	}
 
 	if (data instanceof HttpError) {
 		throw new Error(
-			`Cannot \`return error(...)\` — use \`throw error(...)\` or \`return fail(...)\` instead`
+			'Cannot `return error(...)` — use `throw error(...)` or `return fail(...)` instead'
 		);
 	}
 }

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

@@ -178,8 +178,13 @@ class BaseProvider {
 
 class CspProvider extends BaseProvider {
 	get_meta() {
-		const content = escape_html_attr(this.get_header(true));
-		return `<meta http-equiv="content-security-policy" content=${content}>`;
+		const content = this.get_header(true);
+
+		if (!content) {
+			return;
+		}
+
+		return `<meta http-equiv="content-security-policy" content=${escape_html_attr(content)}>`;
 	}
 }
 

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

@@ -22,10 +22,10 @@ import { get_data_json } from '../data/index.js';
 const MAX_DEPTH = 10;
 
 /**
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').PageNodeIndexes} page
  * @param {import('types').SSROptions} options
- * @param {import('types').SSRManifest} manifest
+ * @param {import('@sveltejs/kit').SSRManifest} manifest
  * @param {import('types').SSRState} state
  * @param {import('types').RequiredResolveOptions} resolve_opts
  * @returns {Promise<Response>}
@@ -54,7 +54,7 @@ export async function render_page(event, page, options, manifest, state, resolve
 
 		let status = 200;
 
-		/** @type {import('types').ActionResult | undefined} */
+		/** @type {import('@sveltejs/kit').ActionResult | undefined} */
 		let action_result = undefined;
 
 		if (is_action_request(event)) {
@@ -118,7 +118,7 @@ export async function render_page(event, page, options, manifest, state, resolve
 		}
 
 		/** @type {Array<import('./types.js').Loaded | null>} */
-		let branch = [];
+		const branch = [];
 
 		/** @type {Error | null} */
 		let load_error = null;
@@ -150,7 +150,8 @@ export async function render_page(event, page, options, manifest, state, resolve
 								if (parent) Object.assign(data, await parent.data);
 							}
 							return data;
-						}
+						},
+						track_server_fetches: options.track_server_fetches
 					});
 				} catch (e) {
 					load_error = /** @type {Error} */ (e);

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

@@ -6,14 +6,22 @@ import { validate_depends } from '../../shared.js';
 /**
  * Calls the user's server `load` function.
  * @param {{
- *   event: import('types').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   state: import('types').SSRState;
  *   node: import('types').SSRNode | undefined;
  *   parent: () => Promise<Record<string, any>>;
+ *   track_server_fetches: boolean;
  * }} opts
  * @returns {Promise<import('types').ServerDataNode | null>}
  */
-export async function load_server_data({ event, state, node, parent }) {
+export async function load_server_data({
+	event,
+	state,
+	node,
+	parent,
+	// TODO 2.0: Remove this
+	track_server_fetches
+}) {
 	if (!node?.server) return null;
 
 	let done = false;
@@ -51,7 +59,10 @@ export async function load_server_data({ event, state, node, parent }) {
 				);
 			}
 
-			uses.dependencies.add(url.href);
+			// TODO 2.0: Remove this
+			if (track_server_fetches) {
+				uses.dependencies.add(url.href);
+			}
 
 			return event.fetch(info, init);
 		},
@@ -132,7 +143,7 @@ export async function load_server_data({ event, state, node, parent }) {
 /**
  * Calls the user's `load` function.
  * @param {{
- *   event: import('types').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   fetched: import('./types').Fetched[];
  *   node: import('types').SSRNode | undefined;
  *   parent: () => Promise<Record<string, any>>;
@@ -179,11 +190,11 @@ export async function load_data({
 }
 
 /**
- * @param {Pick<import('types').RequestEvent, 'fetch' | 'url' | 'request' | 'route'>} event
- * @param {import("types").SSRState} state
- * @param {import("./types").Fetched[]} fetched
+ * @param {Pick<import('@sveltejs/kit').RequestEvent, 'fetch' | 'url' | 'request' | 'route'>} event
+ * @param {import('types').SSRState} state
+ * @param {import('./types').Fetched[]} fetched
  * @param {boolean} csr
- * @param {Pick<Required<import("types").ResolveOptions>, 'filterSerializedResponseHeaders'>} resolve_opts
+ * @param {Pick<Required<import('@sveltejs/kit').ResolveOptions>, 'filterSerializedResponseHeaders'>} resolve_opts
  */
 export function create_universal_fetch(event, state, fetched, csr, resolve_opts) {
 	/**
@@ -251,7 +262,7 @@ export function create_universal_fetch(event, state, fetched, csr, resolve_opts)
 							),
 							request_headers: init?.headers,
 							response_body: body,
-							response: response
+							response
 						});
 					}
 

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

@@ -28,14 +28,14 @@ const encoder = new TextEncoder();
  *   branch: Array<import('./types').Loaded>;
  *   fetched: Array<import('./types').Fetched>;
  *   options: import('types').SSROptions;
- *   manifest: import('types').SSRManifest;
+ *   manifest: import('@sveltejs/kit').SSRManifest;
  *   state: import('types').SSRState;
  *   page_config: { ssr: boolean; csr: boolean };
  *   status: number;
  *   error: App.Error | null;
- *   event: import('types').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   resolve_opts: import('types').RequiredResolveOptions;
- *   action_result?: import('types').ActionResult;
+ *   action_result?: import('@sveltejs/kit').ActionResult;
  * }} opts
  */
 export async function render_response({
@@ -157,7 +157,7 @@ export async function render_response({
 					);
 				} else if (!warned) {
 					console.warn(
-						`Avoid calling \`fetch\` eagerly during server side rendering — put your \`fetch\` calls inside \`onMount\` or a \`load\` function instead`
+						'Avoid calling `fetch` eagerly during server side rendering — put your `fetch` calls inside `onMount` or a `load` function instead'
 					);
 					warned = true;
 				}
@@ -257,7 +257,7 @@ export async function render_response({
 		}
 	}
 
-	const global = __SVELTEKIT_DEV__ ? `__sveltekit_dev` : `__sveltekit_${options.version_hash}`;
+	const global = __SVELTEKIT_DEV__ ? '__sveltekit_dev' : `__sveltekit_${options.version_hash}`;
 
 	const { data, chunks } = get_data(
 		event,
@@ -298,7 +298,7 @@ export async function render_response({
 		].filter(Boolean);
 
 		if (chunks) {
-			blocks.push(`const deferred = new Map();`);
+			blocks.push('const deferred = new Map();');
 
 			properties.push(`defer: (id) => new Promise((fulfil, reject) => {
 							deferred.set(id, { fulfil, reject });
@@ -317,9 +317,9 @@ export async function render_response({
 						${properties.join(',\n\t\t\t\t\t\t')}
 					};`);
 
-		const args = [`app`, `element`];
+		const args = ['app', 'element'];
 
-		blocks.push(`const element = document.currentScript.parentElement;`);
+		blocks.push('const element = document.currentScript.parentElement;');
 
 		if (page_config.ssr) {
 			const serialized = { form: 'null', error: 'null' };
@@ -339,7 +339,7 @@ export async function render_response({
 
 			const hydrate = [
 				`node_ids: [${branch.map(({ node }) => node.index).join(', ')}]`,
-				`data`,
+				'data',
 				`form: ${serialized.form}`,
 				`error: ${serialized.error}`
 			];
@@ -363,7 +363,7 @@ export async function render_response({
 					});`);
 
 		if (options.service_worker) {
-			const opts = __SVELTEKIT_DEV__ ? `, { type: 'module' }` : '';
+			const opts = __SVELTEKIT_DEV__ ? ", { type: 'module' }" : '';
 
 			// we use an anonymous function instead of an arrow function to support
 			// older browsers (https://github.com/sveltejs/kit/pull/5417)
@@ -490,7 +490,7 @@ export async function render_response({
 /**
  * If the serialized data contains promises, `chunks` will be an
  * async iterable containing their resolutions
- * @param {import('types').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').SSROptions} options
  * @param {Array<import('types').ServerDataNode | null>} nodes
  * @param {string} global

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

@@ -10,9 +10,9 @@ import { HttpError, Redirect } from '../../control.js';
 
 /**
  * @param {{
- *   event: import('types').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   options: import('types').SSROptions;
- *   manifest: import('types').SSRManifest;
+ *   manifest: import('@sveltejs/kit').SSRManifest;
  *   state: import('types').SSRState;
  *   status: number;
  *   error: unknown;
@@ -44,7 +44,8 @@ export async function respond_with_error({
 				event,
 				state,
 				node: default_layout,
-				parent: async () => ({})
+				parent: async () => ({}),
+				track_server_fetches: options.track_server_fetches
 			});
 
 			const server_data = await server_data_promise;

package/src/runtime/server/respond.js

@@ -45,13 +45,13 @@ const default_preload = ({ type }) => type === 'js' || type === 'css';
 /**
  * @param {Request} request
  * @param {import('types').SSROptions} options
- * @param {import('types').SSRManifest} manifest
+ * @param {import('@sveltejs/kit').SSRManifest} manifest
  * @param {import('types').SSRState} state
  * @returns {Promise<Response>}
  */
 export async function respond(request, options, manifest, state) {
 	/** URL but stripped from the potential `/__data.json` suffix and its search param  */
-	let url = new URL(request.url);
+	const url = new URL(request.url);
 
 	if (options.csrf_check_origin) {
 		const forbidden =
@@ -130,7 +130,7 @@ export async function respond(request, options, manifest, state) {
 	/** @type {Record<string, import('./page/types').Cookie>} */
 	let cookies_to_add = {};
 
-	/** @type {import('types').RequestEvent} */
+	/** @type {import('@sveltejs/kit').RequestEvent} */
 	const event = {
 		// @ts-expect-error `cookies` and `fetch` need to be created after the `event` itself
 		cookies: null,
@@ -155,7 +155,7 @@ export async function respond(request, options, manifest, state) {
 
 				if (lower === 'set-cookie') {
 					throw new Error(
-						`Use \`event.cookies.set(name, value, options)\` instead of \`event.setHeaders\` to set cookies`
+						'Use `event.cookies.set(name, value, options)` instead of `event.setHeaders` to set cookies'
 					);
 				} else if (lower in headers) {
 					throw new Error(`"${key}" header is already set`);
@@ -343,8 +343,8 @@ export async function respond(request, options, manifest, state) {
 
 	/**
 	 *
-	 * @param {import('types').RequestEvent} event
-	 * @param {import('types').ResolveOptions} [opts]
+	 * @param {import('@sveltejs/kit').RequestEvent} event
+	 * @param {import('@sveltejs/kit').ResolveOptions} [opts]
 	 */
 	async function resolve(event, opts) {
 		try {