@sveltejs/kit 1.0.0-next.551 → 1.0.0-next.553

package/package.json

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

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

@@ -195,6 +195,20 @@ function create_routes_and_nodes(cwd, config, fallback) {
 				if (!file.name.startsWith('+')) continue;
 				if (!valid_extensions.find((ext) => file.name.endsWith(ext))) continue;
 
+				if (file.name.endsWith('.d.ts')) {
+					let name = file.name.slice(0, -5);
+					const ext = valid_extensions.find((ext) => name.endsWith(ext));
+					if (ext) name = name.slice(0, -ext.length);
+
+					const valid =
+						/^\+(?:(page(?:@(.*))?)|(layout(?:@(.*))?)|(error))$/.test(name) ||
+						/^\+(?:(server)|(page(?:(@[a-zA-Z0-9_-]*))?(\.server)?)|(layout(?:(@[a-zA-Z0-9_-]*))?(\.server)?))$/.test(
+							name
+						);
+
+					if (valid) continue;
+				}
+
 				const project_relative = posixify(path.relative(cwd, path.join(dir, file.name)));
 
 				const item = analyze(

package/src/exports/vite/build/build_server.js

@@ -27,7 +27,7 @@ const server_template = ({ config, hooks, has_service_worker, runtime, template,
 import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
-import { set_prerendering } from '${runtime}/env.js';
+import { set_prerendering, set_version } from '${runtime}/env.js';
 import { set_private_env } from '${runtime}/env-private.js';
 import { set_public_env } from '${runtime}/env-public.js';
 
@@ -44,6 +44,7 @@ const error_template = ({ status, message }) => ${s(error_page)
 let read = null;
 
 set_paths(${s(config.kit.paths)});
+set_version(${s(config.kit.version.name)});
 
 let default_protocol = 'https';
 
@@ -86,7 +87,8 @@ export class Server {
 			app_template,
 			app_template_contains_nonce: ${template.includes('%sveltekit.nonce%')},
 			error_template,
-			trailing_slash: ${s(config.kit.trailingSlash)}
+			trailing_slash: ${s(config.kit.trailingSlash)},
+			version: ${s(config.kit.version.name)}
 		};
 	}
 

package/src/exports/vite/build/utils.js

@@ -147,7 +147,6 @@ export function get_default_build_config({ config, input, ssr, outDir }) {
 		},
 		define: {
 			__SVELTEKIT_ADAPTER_NAME__: JSON.stringify(config.kit.adapter?.name),
-			__SVELTEKIT_APP_VERSION__: JSON.stringify(config.kit.version.name),
 			__SVELTEKIT_APP_VERSION_FILE__: JSON.stringify(`${config.kit.appDir}/version.json`),
 			__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: JSON.stringify(config.kit.version.pollInterval),
 			__SVELTEKIT_BROWSER__: ssr ? 'false' : 'true',

package/src/exports/vite/dev/index.js

@@ -271,6 +271,11 @@ export async function dev(vite, vite_config, svelte_config) {
 		}
 	});
 
+	// set `import { version } from '$app/environment'`
+	(await vite.ssrLoadModule(`${runtime_prefix}/env.js`)).set_version(
+		svelte_config.kit.version.name
+	);
+
 	return () => {
 		const serve_static_middleware = vite.middlewares.stack.find(
 			(middleware) =>
@@ -475,7 +480,8 @@ export async function dev(vite, vite_config, svelte_config) {
 						service_worker:
 							svelte_config.kit.serviceWorker.register &&
 							!!resolve_entry(svelte_config.kit.files.serviceWorker),
-						trailing_slash: svelte_config.kit.trailingSlash
+						trailing_slash: svelte_config.kit.trailingSlash,
+						version: svelte_config.kit.version.name
 					},
 					{
 						getClientAddress: () => {

package/src/exports/vite/index.js

@@ -107,9 +107,6 @@ function kit() {
 	/** @type {import('types').BuildData} */
 	let build_data;
 
-	/** @type {string | undefined} */
-	let deferred_warning;
-
 	/** @type {{ public: Record<string, string>; private: Record<string, string> }} */
 	let env;
 
@@ -284,7 +281,9 @@ function kit() {
 				}
 			};
 
-			deferred_warning = warn_overridden_config(config, result);
+			const warning = warn_overridden_config(config, result);
+			if (warning) console.error(warning);
+
 			return result;
 		},
 
@@ -334,6 +333,10 @@ function kit() {
 		 */
 		configResolved(config) {
 			vite_config = config;
+
+			// This is a hack to prevent Vite from nuking useful logs,
+			// pending https://github.com/vitejs/vite/issues/9378
+			config.logger.warn('');
 		},
 
 		/**
@@ -540,14 +543,6 @@ function kit() {
 		 * @see https://vitejs.dev/guide/api-plugin.html#configureserver
 		 */
 		async configureServer(vite) {
-			// This method is called by Vite after clearing the screen.
-			// This patch ensures we can log any important messages afterwards for the user to see.
-			const print_urls = vite.printUrls;
-			vite.printUrls = function () {
-				print_urls.apply(this);
-				if (deferred_warning) console.error('\n' + deferred_warning);
-			};
-
 			return await dev(vite, vite_config, svelte_config);
 		},
 

package/src/runtime/app/environment.js

@@ -8,4 +8,4 @@ export const browser = !import.meta.env.SSR;
  */
 export const dev = __SVELTEKIT_DEV__;
 
-export { prerendering } from '../env.js';
+export { prerendering, version } from '../env.js';

package/src/runtime/client/start.js

@@ -2,6 +2,7 @@ import { create_client } from './client.js';
 import { init } from './singletons.js';
 import { set_paths } from '../paths.js';
 import { set_public_env } from '../env-public.js';
+import { set_version } from '../env.js';
 
 /**
  * @param {{
@@ -13,11 +14,13 @@ import { set_public_env } from '../env-public.js';
  *   },
  *   target: Element;
  *   trailing_slash: import('types').TrailingSlash;
+ *   version: string;
  * }} opts
  */
-export async function start({ env, hydrate, paths, target, trailing_slash }) {
+export async function start({ env, hydrate, paths, target, trailing_slash, version }) {
 	set_public_env(env);
 	set_paths(paths);
+	set_version(version);
 
 	if (__SVELTEKIT_DEV__ && target === document.body) {
 		console.warn(

package/src/runtime/client/utils.js

@@ -1,7 +1,8 @@
 import { writable } from 'svelte/store';
 import { assets } from '../paths.js';
+import { version } from '../env.js';
 
-/* global __SVELTEKIT_APP_VERSION__, __SVELTEKIT_APP_VERSION_FILE__, __SVELTEKIT_APP_VERSION_POLL_INTERVAL__ */
+/* global __SVELTEKIT_APP_VERSION_FILE__, __SVELTEKIT_APP_VERSION_POLL_INTERVAL__ */
 
 /** @param {HTMLDocument} doc */
 export function get_base_uri(doc) {
@@ -143,8 +144,8 @@ export function create_updated_store() {
 		});
 
 		if (res.ok) {
-			const { version } = await res.json();
-			const updated = version !== __SVELTEKIT_APP_VERSION__;
+			const data = await res.json();
+			const updated = data.version !== version;
 
 			if (updated) {
 				set(true);

package/src/runtime/control.js

@@ -21,7 +21,7 @@ export class HttpError {
 
 export class Redirect {
 	/**
-	 * @param {number} status
+	 * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308} status
 	 * @param {string} location
 	 */
 	constructor(status, location) {

package/src/runtime/env.js

@@ -1,6 +1,12 @@
 export let prerendering = false;
+export let version = '';
 
 /** @param {boolean} value */
 export function set_prerendering(value) {
 	prerendering = value;
 }
+
+/** @param {string} value */
+export function set_version(value) {
+	version = value;
+}

package/src/runtime/server/fetch.js

@@ -128,6 +128,17 @@ export function create_fetch({ event, options, state, get_cookie_header }) {
 					throw new Error('Request body must be a string or TypedArray');
 				}
 
+				if (!request.headers.has('accept')) {
+					request.headers.set('accept', '*/*');
+				}
+
+				if (!request.headers.has('accept-language')) {
+					request.headers.set(
+						'accept-language',
+						/** @type {string} */ (event.request.headers.get('accept-language'))
+					);
+				}
+
 				response = await respond(request, options, state);
 
 				const set_cookie = response.headers.get('set-cookie');

package/src/runtime/server/index.js

@@ -27,7 +27,7 @@ const default_transform = ({ html }) => html;
 const default_filter = () => false;
 
 /** @type {import('types').RequiredResolveOptions['preload']} */
-const default_preload = ({ type }) => type !== 'asset';
+const default_preload = ({ type }) => type === 'js' || type === 'css';
 
 /** @type {import('types').Respond} */
 export async function respond(request, options, state) {

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

@@ -281,7 +281,8 @@ export async function render_response({
 				}` : 'null'},
 				paths: ${s(options.paths)},
 				target: document.querySelector('[data-sveltekit-hydrate="${target}"]').parentNode,
-				trailing_slash: ${s(options.trailing_slash)}
+				trailing_slash: ${s(options.trailing_slash)},
+				version: ${s(options.version)}
 			});
 		`;
 

package/types/ambient.d.ts

@@ -85,6 +85,11 @@ declare module '$app/environment' {
 	 * `true` when prerendering, `false` otherwise.
 	 */
 	export const prerendering: boolean;
+
+	/**
+	 * The value of `config.kit.version.name`
+	 */
+	export const version: string;
 }
 
 /**

package/types/index.d.ts

@@ -18,7 +18,6 @@ import {
 	UniqueInterface
 } from './private.js';
 import { SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal.js';
-import { HttpError, Redirect } from '../src/runtime/control.js';
 
 export { PrerenderOption } from './private.js';
 
@@ -53,13 +52,6 @@ type OptionalUnion<
 	A extends keyof U = U extends U ? keyof U : never
 > = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 
-// Needs to be here, else ActionData will be resolved to unknown - probably because of "d.ts file imports .js file" in combination with allowJs
-export interface ValidationError<T extends Record<string, unknown> | undefined = undefined>
-	extends UniqueInterface {
-	status: number;
-	data: T;
-}
-
 type UnpackValidationError<T> = T extends ValidationError<infer X>
 	? X
 	: T extends void
@@ -752,6 +744,16 @@ export function error(
 	body?: { message: string } extends App.Error ? App.Error | string | undefined : never
 ): HttpError;
 
+/**
+ * The object returned by the `error` function
+ */
+export interface HttpError {
+	/** The HTTP status code */
+	status: number;
+	/** The error message */
+	body: App.Error;
+}
+
 /**
  * Creates a `Redirect` object. If thrown during request handling, SvelteKit will
  * return a redirect response.
@@ -761,6 +763,16 @@ export function redirect(
 	location: string
 ): Redirect;
 
+/**
+ * The object returned by the `redirect` function
+ */
+export interface Redirect {
+	/** The HTTP status code */
+	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308;
+	/** The location to redirect to */
+	location: string;
+}
+
 /**
  * Generates a JSON `Response` object from the supplied data.
  */
@@ -773,3 +785,12 @@ export function invalid<T extends Record<string, unknown> | undefined>(
 	status: number,
 	data?: T
 ): ValidationError<T>;
+
+/**
+ * The object returned by the `invalid` function
+ */
+export interface ValidationError<T extends Record<string, unknown> | undefined = undefined>
+	extends UniqueInterface {
+	status: number;
+	data: T;
+}

package/types/internal.d.ts

@@ -313,6 +313,7 @@ export interface SSROptions {
 	app_template_contains_nonce: boolean;
 	error_template({ message, status }: { message: string; status: number }): string;
 	trailing_slash: TrailingSlash;
+	version: string;
 }
 
 export interface SSRErrorPage {