Merge branch 'master' into version-2

.changeset/honest-terms-help.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: correctly return 415 when unexpected content types are submitted to actions

.changeset/warm-impalas-thank.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+chore: deprecate `preloadCode` calls with multiple arguments

documentation/docs/25-build-and-deploy/55-single-page-apps.md

@@ -35,6 +35,8 @@ The `fallback` page is an HTML page created by SvelteKit from your page template
 
 On some hosts it may be `index.html` or something else entirely — consult your platform's documentation.
 
+> Note that the fallback page will always contain absolute asset paths (i.e. beginning with `/` rather than `.`) regardless of the value of [`paths.relative`](/docs/configuration#paths), since it is used to respond to requests for arbitrary paths.
+
 ## Apache
 
 To run an SPA on [Apache](https://httpd.apache.org/), you should add a `static/.htaccess` file to route requests to the fallback page:
@@ -58,4 +60,4 @@ If you want certain pages to be prerendered, you can re-enable `ssr` alongside `
 /// file: src/routes/my-prerendered-page/+page.js
 export const prerender = true;
 export const ssr = true;
-```
+```

packages/kit/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 1.29.0
+
+### Minor Changes
+
+- feat: add `resolveRoute` to `$app/paths`, deprecate `resolvePath` ([#11261](https://github.com/sveltejs/kit/pull/11261))
+
 ## 1.28.0
 
 ### Minor Changes

packages/kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.28.0",
+	"version": "1.29.0",
 	"description": "The fastest way to build Svelte apps",
 	"repository": {
 		"type": "git",

packages/kit/src/exports/public.d.ts

@@ -473,6 +473,8 @@ export interface KitConfig {
 		 * If `true`, `base` and `assets` imported from `$app/paths` will be replaced with relative asset paths during server-side rendering, resulting in more portable HTML.
 		 * If `false`, `%sveltekit.assets%` and references to build artifacts will always be root-relative paths, unless `paths.assets` is an external URL
 		 *
+		 * [Single-page app](https://kit.svelte.dev/docs/single-page-apps) fallback pages will always use absolute paths, regardless of this setting.
+		 *
 		 * If your app uses a `<base>` element, you should set this to `false`, otherwise asset URLs will incorrectly be resolved against the `<base>` URL rather than the current page.
 		 *
 		 * In 1.0, `undefined` was a valid value, which was set by default. In that case, if `paths.assets` was not external, SvelteKit would replace `%sveltekit.assets%` with a relative path and use relative paths to reference build artifacts, but `base` and `assets` imported from `$app/paths` would be as specified in your config.

packages/kit/src/runtime/client/client.js

@@ -275,6 +275,10 @@ export function create_client(app, target) {
 
 	/** @param {...string} pathnames */
 	async function preload_code(...pathnames) {
+		if (DEV && pathnames.length > 1) {
+			console.warn('Calling `preloadCode` with multiple arguments is deprecated');
+		}
+
 		const matching = routes.filter((route) => pathnames.some((pathname) => route.exec(pathname)));
 
 		const promises = matching.map((r) => {

packages/kit/src/runtime/server/page/actions.js

@@ -223,7 +223,8 @@ async function call_action(event, actions) {
 	}
 
 	if (!is_form_content_type(event.request)) {
-		throw new Error(
+		throw error(
+			415,
 			`Actions expect form-encoded data (received ${event.request.headers.get('content-type')})`
 		);
 	}

packages/kit/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '1.28.0';
+export const VERSION = '1.29.0';

packages/kit/test/apps/basics/test/test.js

@@ -1212,6 +1212,21 @@ test.describe('Actions', () => {
 
 		await expect(page.locator('pre')).toHaveText('something went wrong');
 	});
+
+	test('submitting application/json should return http status code 415', async ({ baseURL }) => {
+		const response = await fetch(`${baseURL}/actions/form-errors`, {
+			method: 'POST',
+			body: JSON.stringify({ foo: 'bar' }),
+			headers: {
+				'Content-Type': 'application/json',
+				Origin: `${baseURL}`
+			}
+		});
+		const { type, error } = await response.json();
+		expect(type).toBe('error');
+		expect(error.message).toBe('Actions expect form-encoded data (received application/json)');
+		expect(response.status).toBe(415);
+	});
 });
 
 // Run in serial to not pollute the log with (correct) cookie warnings

packages/kit/types/index.d.ts

@@ -455,6 +455,8 @@ declare module '@sveltejs/kit' {
 			 * If `true`, `base` and `assets` imported from `$app/paths` will be replaced with relative asset paths during server-side rendering, resulting in more portable HTML.
 			 * If `false`, `%sveltekit.assets%` and references to build artifacts will always be root-relative paths, unless `paths.assets` is an external URL
 			 *
+			 * [Single-page app](https://kit.svelte.dev/docs/single-page-apps) fallback pages will always use absolute paths, regardless of this setting.
+			 *
 			 * If your app uses a `<base>` element, you should set this to `false`, otherwise asset URLs will incorrectly be resolved against the `<base>` URL rather than the current page.
 			 *
 			 * In 1.0, `undefined` was a valid value, which was set by default. In that case, if `paths.assets` was not external, SvelteKit would replace `%sveltekit.assets%` with a relative path and use relative paths to reference build artifacts, but `base` and `assets` imported from `$app/paths` would be as specified in your config.