From b4bf1a0955186e11f96edcc4bbe4a06d29e7956e Mon Sep 17 00:00:00 2001
From: Fabian <fabian9799@protonmail.ch>
Date: Wed, 13 Dec 2023 05:34:15 +0100
Subject: [PATCH 1/9] added OpenSearch (#11230)

---
 sites/kit.svelte.dev/src/app.html          |  7 +++++++
 sites/kit.svelte.dev/static/opensearch.xml | 10 ++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 sites/kit.svelte.dev/static/opensearch.xml

diff --git a/sites/kit.svelte.dev/src/app.html b/sites/kit.svelte.dev/src/app.html
index 1bd056070c0a..3d482fa08955 100644
--- a/sites/kit.svelte.dev/src/app.html
+++ b/sites/kit.svelte.dev/src/app.html
@@ -15,6 +15,13 @@
 		<meta name="twitter:image" content="/images/twitter-thumbnail.jpg" />
 		<meta name="og:image" content="/images/twitter-thumbnail.jpg" />
 
+		<link
+			rel="search"
+			type="application/opensearchdescription+xml"
+			href="/opensearch.xml"
+			title="SvelteKit"
+		/>
+
 		<!-- add inline style and blocking script to prevent content flash/jump -->
 		<style>
 			.ts-version {
diff --git a/sites/kit.svelte.dev/static/opensearch.xml b/sites/kit.svelte.dev/static/opensearch.xml
new file mode 100644
index 000000000000..c46c7dae5c54
--- /dev/null
+++ b/sites/kit.svelte.dev/static/opensearch.xml
@@ -0,0 +1,10 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+    xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+    <ShortName>SvelteKit</ShortName>
+    <Description>Search SvelteKit</Description>
+    <InputEncoding>UTF-8</InputEncoding>
+    <Image width="128" height="128" type="image/png">https://kit.svelte.dev/favicon.png</Image>
+    <Url type="text/html" method="get"
+        template="https://kit.svelte.dev/search?q={searchTerms}" />
+    <moz:SearchForm>https://kit.svelte.dev/search</moz:SearchForm>
+</OpenSearchDescription>
\ No newline at end of file

From dcaa82d134ba128c2614076b402b1e1378f151ed Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:03:50 -0500
Subject: [PATCH 2/9] breaking: remove deprecated `use:enhance` callback values

---
 .changeset/chilled-fireants-learn.md          |  5 ++++
 .../30-migrating-to-sveltekit-2.md            |  7 +++++
 packages/kit/src/exports/public.d.ts          | 28 +++--------------
 packages/kit/src/runtime/app/forms.js         | 30 -------------------
 4 files changed, 16 insertions(+), 54 deletions(-)
 create mode 100644 .changeset/chilled-fireants-learn.md

diff --git a/.changeset/chilled-fireants-learn.md b/.changeset/chilled-fireants-learn.md
new file mode 100644
index 000000000000..3796f57910ba
--- /dev/null
+++ b/.changeset/chilled-fireants-learn.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': major
+---
+
+breaking: remove deprecated `use:enhance` callback values
diff --git a/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md b/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md
index 6cda9848e788..015a48db3718 100644
--- a/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md
+++ b/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md
@@ -105,6 +105,13 @@ As such, SvelteKit 2 replaces `resolvePath` with a (slightly better named) funct
 
 `svelte-migrate` will do the method replacement for you, though if you later prepend the result with `base`, you need to remove that yourself.
 
+## `form` and `data` have been removed from `use:enhance` callbacks
+
+If you provide a callback to [`use:enhance`](/docs/form-actions#progressive-enhancement-use-enhance), it will be called with an object containing various useful properties.
+
+In SvelteKit 1, those properties included `form` and `data`. These were deprecated some time ago in favour of `formElement` and `formData`, and have been removed altogether in SvelteKit 2.
+
+
 ## Updated dependency requirements
 
 SvelteKit requires Node `18.13` or higher, Vite `^5.0`, vite-plugin-svelte `^3.0`, TypeScript `^5.0` and Svelte version 4 or higher. `svelte-migrate` will do the `package.json` bumps for you.
diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
index 0292c8cb285c..06751868c6c4 100644
--- a/packages/kit/src/exports/public.d.ts
+++ b/packages/kit/src/exports/public.d.ts
@@ -40,8 +40,8 @@ export interface Adapter {
 export type LoadProperties<input extends Record<string, any> | void> = input extends void
 	? undefined // needs to be undefined, because void will break intellisense
 	: input extends Record<string, any>
-		? input
-		: unknown;
+	  ? input
+	  : unknown;
 
 export type AwaitedActions<T extends Record<string, (...args: any) => any>> = OptionalUnion<
 	{
@@ -67,8 +67,8 @@ export interface ActionFailure<T extends Record<string, unknown> | undefined = u
 type UnpackValidationError<T> = T extends ActionFailure<infer X>
 	? X
 	: T extends void
-		? undefined // needs to be undefined, because void will corrupt union type
-		: T;
+	  ? undefined // needs to be undefined, because void will corrupt union type
+	  : T;
 
 /**
  * This object is passed to the `adapt` function of adapters.
@@ -1247,17 +1247,7 @@ export type SubmitFunction<
 	Failure extends Record<string, unknown> | undefined = Record<string, any>
 > = (input: {
 	action: URL;
-	/**
-	 * use `formData` instead of `data`
-	 * @deprecated
-	 */
-	data: FormData;
 	formData: FormData;
-	/**
-	 * use `formElement` instead of `form`
-	 * @deprecated
-	 */
-	form: HTMLFormElement;
 	formElement: HTMLFormElement;
 	controller: AbortController;
 	submitter: HTMLElement | null;
@@ -1265,17 +1255,7 @@ export type SubmitFunction<
 }) => MaybePromise<
 	| void
 	| ((opts: {
-			/**
-			 * use `formData` instead of `data`
-			 * @deprecated
-			 */
-			data: FormData;
 			formData: FormData;
-			/**
-			 * use `formElement` instead of `form`
-			 * @deprecated
-			 */
-			form: HTMLFormElement;
 			formElement: HTMLFormElement;
 			action: URL;
 			result: ActionResult<Success, Failure>;
diff --git a/packages/kit/src/runtime/app/forms.js b/packages/kit/src/runtime/app/forms.js
index d1f6d70323e4..b2d7bd17f3c0 100644
--- a/packages/kit/src/runtime/app/forms.js
+++ b/packages/kit/src/runtime/app/forms.js
@@ -49,20 +49,6 @@ export function deserialize(result) {
 	return parsed;
 }
 
-/**
- * @param {string} old_name
- * @param {string} new_name
- * @param {string} call_location
- * @returns void
- */
-function warn_on_access(old_name, new_name, call_location) {
-	if (!DEV) return;
-	// TODO 2.0: Remove this code
-	console.warn(
-		`\`${old_name}\` has been deprecated in favor of \`${new_name}\`. \`${old_name}\` will be removed in a future version. (Called from ${call_location})`
-	);
-}
-
 /**
  * Shallow clone an element, so that we can access e.g. `form.action` without worrying
  * that someone has added an `<input name="action">` (https://github.com/sveltejs/kit/issues/7593)
@@ -182,15 +168,7 @@ export function enhance(form_element, submit = () => {}) {
 				action,
 				cancel,
 				controller,
-				get data() {
-					warn_on_access('data', 'formData', 'use:enhance submit function');
-					return form_data;
-				},
 				formData: form_data,
-				get form() {
-					warn_on_access('form', 'formElement', 'use:enhance submit function');
-					return form_element;
-				},
 				formElement: form_element,
 				submitter: event.submitter
 			})) ?? fallback_callback;
@@ -220,15 +198,7 @@ export function enhance(form_element, submit = () => {}) {
 
 		callback({
 			action,
-			get data() {
-				warn_on_access('data', 'formData', 'callback returned from use:enhance submit function');
-				return form_data;
-			},
 			formData: form_data,
-			get form() {
-				warn_on_access('form', 'formElement', 'callback returned from use:enhance submit function');
-				return form_element;
-			},
 			formElement: form_element,
 			update: (opts) =>
 				fallback_callback({

From b3fb4dab26d97a3bcae15d7ec833e2a2efe7fcc0 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:09:20 -0500
Subject: [PATCH 3/9] throw on forms with file inputs but wrong enctype

---
 .../docs/60-appendix/30-migrating-to-sveltekit-2.md         | 3 +++
 packages/kit/src/runtime/app/forms.js                       | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md b/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md
index 015a48db3718..0f8babf08977 100644
--- a/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md
+++ b/documentation/docs/60-appendix/30-migrating-to-sveltekit-2.md
@@ -111,6 +111,9 @@ If you provide a callback to [`use:enhance`](/docs/form-actions#progressive-enha
 
 In SvelteKit 1, those properties included `form` and `data`. These were deprecated some time ago in favour of `formElement` and `formData`, and have been removed altogether in SvelteKit 2.
 
+## Forms containing file inputs must use `multipart/form-data`
+
+If a form contains an `<input type="file">` but does not have an `enctype="multipart/form-data"` attribute, non-JS submissions will omit the file. SvelteKit 2 will throw an error if it encounters a form like this during a `use:enhance` submission to ensure that your forms work correctly when JavaScript is not present.
 
 ## Updated dependency requirements
 
diff --git a/packages/kit/src/runtime/app/forms.js b/packages/kit/src/runtime/app/forms.js
index b2d7bd17f3c0..82c727104eeb 100644
--- a/packages/kit/src/runtime/app/forms.js
+++ b/packages/kit/src/runtime/app/forms.js
@@ -143,11 +143,9 @@ export function enhance(form_element, submit = () => {}) {
 		if (DEV && clone(form_element).enctype !== 'multipart/form-data') {
 			for (const value of form_data.values()) {
 				if (value instanceof File) {
-					// TODO 2.0: Upgrade to `throw Error`
-					console.warn(
-						'Your form contains <input type="file"> fields, but is missing the `enctype="multipart/form-data"` attribute. This will lead to inconsistent behavior between enhanced and native forms. For more details, see https://github.com/sveltejs/kit/issues/9819. This will be upgraded to an error in v2.0.'
+					throw new Error(
+						'Your form contains <input type="file"> fields, but is missing the necessary `enctype="multipart/form-data"` attribute. This will lead to inconsistent behavior between enhanced and native forms. For more details, see https://github.com/sveltejs/kit/issues/9819.'
 					);
-					break;
 				}
 			}
 		}

From d3fcba2c41102287bf3cbae59b56f465b1c7f746 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:09:39 -0500
Subject: [PATCH 4/9] remove comment

---
 packages/kit/src/runtime/app/forms.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kit/src/runtime/app/forms.js b/packages/kit/src/runtime/app/forms.js
index 82c727104eeb..bd2a81fc8656 100644
--- a/packages/kit/src/runtime/app/forms.js
+++ b/packages/kit/src/runtime/app/forms.js
@@ -160,7 +160,6 @@ export function enhance(form_element, submit = () => {}) {
 		let cancelled = false;
 		const cancel = () => (cancelled = true);
 
-		// TODO 2.0: Remove `data` and `form`
 		const callback =
 			(await submit({
 				action,

From 997d5ecb2c19ebd56b5a3f450a400f1a15d36401 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:12:00 -0500
Subject: [PATCH 5/9] changeset

---
 .changeset/mean-moose-smell.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/mean-moose-smell.md

diff --git a/.changeset/mean-moose-smell.md b/.changeset/mean-moose-smell.md
new file mode 100644
index 000000000000..17d98b2cdbae
--- /dev/null
+++ b/.changeset/mean-moose-smell.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': major
+---
+
+breaking: error if form without multipart/form-data enctype contains a file input

From d37f34959a0bd6afd938ae9a5d77287e229a0fe3 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:15:35 -0500
Subject: [PATCH 6/9] remove obsolete test

---
 .../old-property-access/+page.server.js       | 26 --------
 .../enhance/old-property-access/+page.svelte  | 60 -------------------
 packages/kit/test/apps/basics/test/test.js    | 48 ---------------
 3 files changed, 134 deletions(-)
 delete mode 100644 packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.server.js
 delete mode 100644 packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.svelte

diff --git a/packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.server.js b/packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.server.js
deleted file mode 100644
index 4bdf1c67412b..000000000000
--- a/packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.server.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO 2.0: Remove this code and corresponding tests
-export const actions = {
-	form_submit: () => {
-		return {
-			form_submit: true
-		};
-	},
-
-	form_callback: () => {
-		return {
-			form_callback: true
-		};
-	},
-
-	data_submit: () => {
-		return {
-			data_submit: true
-		};
-	},
-
-	data_callback: () => {
-		return {
-			data_callback: true
-		};
-	}
-};
diff --git a/packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.svelte b/packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.svelte
deleted file mode 100644
index 1768c5d9dc7b..000000000000
--- a/packages/kit/test/apps/basics/src/routes/actions/enhance/old-property-access/+page.svelte
+++ /dev/null
@@ -1,60 +0,0 @@
-<script>
-	import { enhance } from '$app/forms';
-
-	export let form;
-
-	const access_form_submit = (node) => {
-		return enhance(node, ({ form }) => {});
-	};
-	const access_data_submit = (node) => {
-		return enhance(node, ({ data }) => {});
-	};
-	const access_form_callback = (node) => {
-		return enhance(
-			node,
-			() =>
-				({ form, update }) =>
-					update()
-		);
-	};
-	const access_data_callback = (node) => {
-		return enhance(
-			node,
-			() =>
-				({ data, update }) =>
-					update()
-		);
-	};
-</script>
-
-<form method="POST" action="?/form_submit" use:access_form_submit>
-	<button
-		id="access-form-in-submit"
-		type="submit"
-		data-processed={form?.form_submit ? 'true' : 'false'}>Access form in submit</button
-	>
-</form>
-
-<form method="POST" action="?/data_submit" use:access_data_submit>
-	<button
-		id="access-data-in-submit"
-		type="submit"
-		data-processed={form?.data_submit ? 'true' : 'false'}>Access data in submit</button
-	>
-</form>
-
-<form method="POST" action="?/form_callback" use:access_form_callback>
-	<button
-		id="access-form-in-callback"
-		type="submit"
-		data-processed={form?.form_callback ? 'true' : 'false'}>Access form in callback</button
-	>
-</form>
-
-<form method="POST" action="?/data_callback" use:access_data_callback>
-	<button
-		id="access-data-in-callback"
-		type="submit"
-		data-processed={form?.data_callback ? 'true' : 'false'}>Access data in callback</button
-	>
-</form>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 2ba572e09e2b..046da4ea6477 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -911,54 +911,6 @@ test.describe('Actions', () => {
 		);
 	});
 
-	test('Accessing v2 deprecated properties results in a warning log', async ({
-		page,
-		javaScriptEnabled
-	}) => {
-		test.skip(!javaScriptEnabled, 'skip when js is disabled');
-		test.skip(!process.env.DEV, 'skip when not in dev mode');
-		await page.goto('/actions/enhance/old-property-access');
-
-		for (const { id, old_name, new_name, call_location } of [
-			{
-				id: 'access-form-in-submit',
-				old_name: 'form',
-				new_name: 'formElement',
-				call_location: 'use:enhance submit function'
-			},
-			{
-				id: 'access-form-in-callback',
-				old_name: 'form',
-				new_name: 'formElement',
-				call_location: 'callback returned from use:enhance submit function'
-			},
-			{
-				id: 'access-data-in-submit',
-				old_name: 'data',
-				new_name: 'formData',
-				call_location: 'use:enhance submit function'
-			},
-			{
-				id: 'access-data-in-callback',
-				old_name: 'data',
-				new_name: 'formData',
-				call_location: 'callback returned from use:enhance submit function'
-			}
-		]) {
-			await test.step(id, async () => {
-				const log_promise = page.waitForEvent('console');
-				const button = page.locator(`#${id}`);
-				await button.click();
-				await expect(button).toHaveAttribute('data-processed', 'true');
-				const log = await log_promise;
-				expect(log.text()).toBe(
-					`\`${old_name}\` has been deprecated in favor of \`${new_name}\`. \`${old_name}\` will be removed in a future version. (Called from ${call_location})`
-				);
-				expect(log.type()).toBe('warning');
-			});
-		}
-	});
-
 	test('Error props are returned', async ({ page, javaScriptEnabled }) => {
 		await page.goto('/actions/form-errors');
 		await page.click('button');

From dd00d0e4e8a3512d9d99718654a74fb35bcc21f1 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:49:01 -0500
Subject: [PATCH 7/9] update test

---
 packages/kit/test/apps/basics/test/test.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 046da4ea6477..e50387a33eab 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -896,18 +896,18 @@ test.describe('Actions', () => {
 		expect(preSubmitContent).not.toBe(postSubmitContent);
 	});
 
-	test('Submitting a form with a file input but no enctype="multipart/form-data" logs a warning', async ({
+	test('Submitting a form with a file input but no enctype="multipart/form-data" throws an error', async ({
 		page,
 		javaScriptEnabled
 	}) => {
 		test.skip(!javaScriptEnabled, 'Skip when JavaScript is disabled');
 		test.skip(!process.env.DEV, 'Skip when not in dev mode');
 		await page.goto('/actions/file-without-enctype');
-		const log_promise = page.waitForEvent('console');
+		const error_promise = page.waitForEvent('pageerror');
 		await page.click('button');
-		const log = await log_promise;
-		expect(log.text()).toBe(
-			'Your form contains <input type="file"> fields, but is missing the `enctype="multipart/form-data"` attribute. This will lead to inconsistent behavior between enhanced and native forms. For more details, see https://github.com/sveltejs/kit/issues/9819. This will be upgraded to an error in v2.0.'
+		const error = await error_promise;
+		expect(error.message).toBe(
+			'Your form contains <input type="file"> fields, but is missing the necessary `enctype="multipart/form-data"` attribute. This will lead to inconsistent behavior between enhanced and native forms. For more details, see https://github.com/sveltejs/kit/issues/9819.'
 		);
 	});
 

From 31a3670f9b2e8984a1747ebad1b0e290fbf1b697 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:53:57 -0500
Subject: [PATCH 8/9] again?

---
 packages/kit/src/exports/public.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
index 06751868c6c4..f60171d86015 100644
--- a/packages/kit/src/exports/public.d.ts
+++ b/packages/kit/src/exports/public.d.ts
@@ -40,8 +40,8 @@ export interface Adapter {
 export type LoadProperties<input extends Record<string, any> | void> = input extends void
 	? undefined // needs to be undefined, because void will break intellisense
 	: input extends Record<string, any>
-	  ? input
-	  : unknown;
+		? input
+		: unknown;
 
 export type AwaitedActions<T extends Record<string, (...args: any) => any>> = OptionalUnion<
 	{
@@ -67,8 +67,8 @@ export interface ActionFailure<T extends Record<string, unknown> | undefined = u
 type UnpackValidationError<T> = T extends ActionFailure<infer X>
 	? X
 	: T extends void
-	  ? undefined // needs to be undefined, because void will corrupt union type
-	  : T;
+		? undefined // needs to be undefined, because void will corrupt union type
+		: T;
 
 /**
  * This object is passed to the `adapt` function of adapters.

From e3c3e6a05d91ea292342cc22a767f2ffa988f0ed Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 13 Dec 2023 00:59:51 -0500
Subject: [PATCH 9/9] regenerate types

---
 packages/kit/types/index.d.ts | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 906332e3b809..3210343dd793 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -1229,17 +1229,7 @@ declare module '@sveltejs/kit' {
 		Failure extends Record<string, unknown> | undefined = Record<string, any>
 	> = (input: {
 		action: URL;
-		/**
-		 * use `formData` instead of `data`
-		 * @deprecated
-		 */
-		data: FormData;
 		formData: FormData;
-		/**
-		 * use `formElement` instead of `form`
-		 * @deprecated
-		 */
-		form: HTMLFormElement;
 		formElement: HTMLFormElement;
 		controller: AbortController;
 		submitter: HTMLElement | null;
@@ -1247,17 +1237,7 @@ declare module '@sveltejs/kit' {
 	}) => MaybePromise<
 		| void
 		| ((opts: {
-				/**
-				 * use `formData` instead of `data`
-				 * @deprecated
-				 */
-				data: FormData;
 				formData: FormData;
-				/**
-				 * use `formElement` instead of `form`
-				 * @deprecated
-				 */
-				form: HTMLFormElement;
 				formElement: HTMLFormElement;
 				action: URL;
 				result: ActionResult<Success, Failure>;