From fe6e4e2b05b8099d27483b7b5f14c1d757c934d3 Mon Sep 17 00:00:00 2001
From: Craig Jennings <1683368+craig-jennings@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:16:02 -0500
Subject: [PATCH 01/27] fix: avoid hoisting error by using 'let' instead of
 'var' (#11291)

Fixes #11284
---
 .changeset/plenty-starfishes-dress.md               |  5 +++++
 .../src/internal/client/dom/elements/attributes.js  |  7 ++++---
 .../samples/event-attribute-after-spread/_config.js | 13 +++++++++++++
 .../event-attribute-after-spread/main.svelte        |  7 +++++++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/plenty-starfishes-dress.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/main.svelte

diff --git a/.changeset/plenty-starfishes-dress.md b/.changeset/plenty-starfishes-dress.md
new file mode 100644
index 0000000000..38b2201e9e
--- /dev/null
+++ b/.changeset/plenty-starfishes-dress.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: avoid hoisting error by using 'let' instead of 'var'
diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index 67e336744f..58519d9baa 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -111,7 +111,8 @@ export function set_attributes(element, prev, next, lowercase_attributes, css_ha
 	var events = [];
 
 	for (key in next) {
-		var value = next[key];
+		// let instead of var because referenced in a closure
+		let value = next[key];
 		if (value === prev?.[key]) continue;
 
 		var prefix = key[0] + key[1]; // this is faster than key.slice(0, 2)
@@ -119,8 +120,8 @@ export function set_attributes(element, prev, next, lowercase_attributes, css_ha
 
 		if (prefix === 'on') {
 			/** @type {{ capture?: true }} */
-			var opts = {};
-			var event_name = key.slice(2);
+			const opts = {};
+			let event_name = key.slice(2);
 			var delegated = DelegatedEvents.includes(event_name);
 
 			if (
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/_config.js
new file mode 100644
index 0000000000..09975947e6
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/_config.js
@@ -0,0 +1,13 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const input = target.querySelector('input');
+
+		input?.dispatchEvent(new Event('input', { bubbles: true }));
+
+		await Promise.resolve();
+
+		assert.htmlEqual(target.innerHTML, 'true <input class="hello">');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/main.svelte
new file mode 100644
index 0000000000..c854071f3e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-after-spread/main.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+	const props = {};
+	let changed = $state(false);
+</script>
+
+{changed}
+<input {...props} oninput={() => (changed = true)} class="hello" />

From e3c85897374a76812191464e7eca869e0aec3082 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:46:28 -0400
Subject: [PATCH 02/27] Version Packages (next) (#11292)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json            | 1 +
 packages/svelte/CHANGELOG.md   | 6 ++++++
 packages/svelte/package.json   | 2 +-
 packages/svelte/src/version.js | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 6a3cec722e..91b0d77715 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -262,6 +262,7 @@
     "orange-yaks-protect",
     "pink-bikes-agree",
     "pink-mayflies-tie",
+    "plenty-starfishes-dress",
     "polite-dolphins-care",
     "polite-pumpkins-guess",
     "polite-ravens-study",
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index a5a654eedb..109238e281 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.0.0-next.112
+
+### Patch Changes
+
+- fix: avoid hoisting error by using 'let' instead of 'var' ([#11291](https://github.com/sveltejs/svelte/pull/11291))
+
 ## 5.0.0-next.111
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 709d74dd35..f8bee6890b 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.111",
+  "version": "5.0.0-next.112",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index b13963eb4d..d17a9f204e 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -6,5 +6,5 @@
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-export const VERSION = '5.0.0-next.111';
+export const VERSION = '5.0.0-next.112';
 export const PUBLIC_VERSION = '5';

From 2d378bb76284d19ec843482086cf5d631ba238a7 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:29:02 +0200
Subject: [PATCH 03/27] breaking: disallow binding to component exports in
 runes mode (#11238)

* breaking: disallow binding to component exports in runes mode

Svelte 4 allowed you to have `export const foo = ..` in component A and then do `<A bind:foo />`. This is confusing because it's not clear whether the binding is for a property or an export, and we have to sanitize rest props from the export bindings.
This PR therefore introduces a breaking change in runes mode: You cannot bind to these exports anymore. Instead use `<A bind:this={a} />` and then do `a.foo` - makes things easier to reason about.

* Update sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md

Co-authored-by: Rich Harris <rich.harris@vercel.com>

* tweak messages

* fix tests

* use component.name

* oops

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/beige-seas-share.md                |  5 +++++
 .../3-transform/client/transform-client.js    | 14 ++++++++++--
 .../client/visitors/javascript-runes.js       |  3 ++-
 .../3-transform/server/transform-server.js    | 22 ++-----------------
 .../svelte/src/internal/client/validate.js    | 22 ++++++++++++++-----
 .../samples/export-binding/Counter.svelte     | 12 ----------
 .../samples/export-binding/_config.js         | 15 ++++---------
 .../export-binding/counter/index.svelte       |  8 +++++++
 .../samples/export-binding/main.svelte        |  4 ++--
 .../props-not-bindable-spread/_config.js      |  5 +++--
 .../samples/props-not-bindable/_config.js     |  5 +++--
 .../03-appendix/02-breaking-changes.md        |  4 ++--
 12 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100644 .changeset/beige-seas-share.md
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/export-binding/Counter.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/export-binding/counter/index.svelte

diff --git a/.changeset/beige-seas-share.md b/.changeset/beige-seas-share.md
new file mode 100644
index 0000000000..3758385c55
--- /dev/null
+++ b/.changeset/beige-seas-share.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+breaking: disallow binding to component exports in runes mode
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
index f1de213a9b..70f981d3e6 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -255,14 +255,24 @@ export function client_component(source, analysis, options) {
 	);
 
 	if (analysis.runes && options.dev) {
-		const bindable = analysis.exports.map(({ name, alias }) => b.literal(alias ?? name));
+		const exports = analysis.exports.map(({ name, alias }) => b.literal(alias ?? name));
+		/** @type {import('estree').Literal[]} */
+		const bindable = [];
 		for (const [name, binding] of properties) {
 			if (binding.kind === 'bindable_prop') {
 				bindable.push(b.literal(binding.prop_alias ?? name));
 			}
 		}
 		instance.body.unshift(
-			b.stmt(b.call('$.validate_prop_bindings', b.id('$$props'), b.array(bindable)))
+			b.stmt(
+				b.call(
+					'$.validate_prop_bindings',
+					b.id('$$props'),
+					b.array(bindable),
+					b.array(exports),
+					b.id(`${analysis.name}`)
+				)
+			)
 		);
 	}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/javascript-runes.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/javascript-runes.js
index 7646ae78b7..5c5b177917 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/javascript-runes.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/javascript-runes.js
@@ -222,7 +222,8 @@ export const javascript_visitors_runes = {
 			if (rune === '$props') {
 				assert.equal(declarator.id.type, 'ObjectPattern');
 
-				const seen = state.analysis.exports.map(({ name, alias }) => alias ?? name);
+				/** @type {string[]} */
+				const seen = [];
 
 				for (const property of declarator.id.properties) {
 					if (property.type === 'Property') {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index d5402351c7..4f631b8c70 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -692,8 +692,7 @@ const javascript_visitors_runes = {
 			}
 
 			if (rune === '$props') {
-				// remove $bindable() from props declaration and handle rest props
-				let uses_rest_props = false;
+				// remove $bindable() from props declaration
 				const id = walk(declarator.id, null, {
 					AssignmentPattern(node) {
 						if (
@@ -705,26 +704,9 @@ const javascript_visitors_runes = {
 								: b.id('undefined');
 							return b.assignment_pattern(node.left, right);
 						}
-					},
-					RestElement(node, { path }) {
-						if (path.at(-1) === declarator.id) {
-							uses_rest_props = true;
-						}
 					}
 				});
-
-				const exports = /** @type {import('../../types').ComponentAnalysis} */ (
-					state.analysis
-				).exports.map(({ name, alias }) => b.literal(alias ?? name));
-
-				declarations.push(
-					b.declarator(
-						id,
-						uses_rest_props && exports.length > 0
-							? b.call('$.rest_props', b.id('$$props'), b.array(exports))
-							: b.id('$$props')
-					)
-				);
+				declarations.push(b.declarator(id, b.id('$$props')));
 				continue;
 			}
 
diff --git a/packages/svelte/src/internal/client/validate.js b/packages/svelte/src/internal/client/validate.js
index add59ebe82..b2dfee7ab1 100644
--- a/packages/svelte/src/internal/client/validate.js
+++ b/packages/svelte/src/internal/client/validate.js
@@ -85,16 +85,26 @@ export function loop_guard(timeout) {
 /**
  * @param {Record<string, any>} $$props
  * @param {string[]} bindable
+ * @param {string[]} exports
+ * @param {Function & { filename: string }} component
  */
-export function validate_prop_bindings($$props, bindable) {
+export function validate_prop_bindings($$props, bindable, exports, component) {
 	for (const key in $$props) {
-		if (!bindable.includes(key)) {
-			var setter = get_descriptor($$props, key)?.set;
+		var setter = get_descriptor($$props, key)?.set;
+		var name = component.name;
 
-			if (setter) {
+		if (setter) {
+			if (exports.includes(key)) {
 				throw new Error(
-					`Cannot use bind:${key} on this component because the property was not declared as bindable. ` +
-						`To mark a property as bindable, use the $bindable() rune like this: \`let { ${key} = $bindable() } = $props()\``
+					`Component ${component.filename} has an export named ${key} that a consumer component is trying to access using bind:${key}, which is disallowed. ` +
+						`Instead, use bind:this (e.g. <${name} bind:this={component} />) ` +
+						`and then access the property on the bound component instance (e.g. component.${key}).`
+				);
+			}
+			if (!bindable.includes(key)) {
+				throw new Error(
+					`A component is binding to property ${key} of ${name}.svelte (i.e. <${name} bind:${key} />). This is disallowed because the property was not declared as bindable inside ${component.filename}. ` +
+						`To mark a property as bindable, use the $bindable() rune in ${name}.svelte like this: \`let { ${key} = $bindable() } = $props()\``
 				);
 			}
 		}
diff --git a/packages/svelte/tests/runtime-runes/samples/export-binding/Counter.svelte b/packages/svelte/tests/runtime-runes/samples/export-binding/Counter.svelte
deleted file mode 100644
index 94c822f31f..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/export-binding/Counter.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-	let { ...rest } = $props();
-	let count = $state(0);
-	export function increment() {
-		count++;
-	}
-</script>
-
-<!-- test that the binding isn't inside rest -->
-{Object.keys(rest).length}
-
-{count}
diff --git a/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js b/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js
index aa41757bd1..0f64998059 100644
--- a/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js
@@ -2,16 +2,9 @@ import { test } from '../../test';
 
 export default test({
 	compileOptions: {
-		dev: true // to ensure we don't throw a false-positive "cannot bind to this" error
+		dev: true // to ensure we we catch the error
 	},
-	html: `0 0 <button>increment</button>`,
-
-	async test({ assert, target }) {
-		const btn = target.querySelector('button');
-
-		btn?.click();
-		await Promise.resolve();
-
-		assert.htmlEqual(target.innerHTML, `0 1 <button>increment</button>`);
-	}
+	error:
+		'Component .../export-binding/counter/index.svelte has an export named increment that a consumer component is trying to access using bind:increment, which is disallowed. ' +
+		'Instead, use bind:this (e.g. <Counter bind:this={component} />) and then access the property on the bound component instance (e.g. component.increment).'
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/export-binding/counter/index.svelte b/packages/svelte/tests/runtime-runes/samples/export-binding/counter/index.svelte
new file mode 100644
index 0000000000..14e0de961b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/export-binding/counter/index.svelte
@@ -0,0 +1,8 @@
+<script>
+	let count = $state(0);
+	export function increment() {
+		count++;
+	}
+</script>
+
+{count}
diff --git a/packages/svelte/tests/runtime-runes/samples/export-binding/main.svelte b/packages/svelte/tests/runtime-runes/samples/export-binding/main.svelte
index 89f0aff9a0..4ad1684701 100644
--- a/packages/svelte/tests/runtime-runes/samples/export-binding/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/export-binding/main.svelte
@@ -1,7 +1,7 @@
 <script>
-    import Counter from './Counter.svelte';
+    import Counter from './counter/index.svelte';
     let increment;
 </script>
 
 <Counter bind:increment={increment} />
-<button onclick={increment}>increment</button>
\ No newline at end of file
+<button onclick={increment}>increment</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js b/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js
index 4c3fdf5bd9..fc6b46d488 100644
--- a/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js
@@ -5,7 +5,8 @@ export default test({
 		dev: true
 	},
 	error:
-		'Cannot use bind:count on this component because the property was not declared as bindable. ' +
-		'To mark a property as bindable, use the $bindable() rune like this: `let { count = $bindable() } = $props()`',
+		'A component is binding to property count of Counter.svelte (i.e. <Counter bind:count />). This is disallowed because the property was ' +
+		'not declared as bindable inside .../samples/props-not-bindable-spread/Counter.svelte. To mark a property as bindable, use the $bindable() rune ' +
+		'in Counter.svelte like this: `let { count = $bindable() } = $props()`',
 	html: `0`
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js b/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js
index 4c3fdf5bd9..b3dcc7f23e 100644
--- a/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js
@@ -5,7 +5,8 @@ export default test({
 		dev: true
 	},
 	error:
-		'Cannot use bind:count on this component because the property was not declared as bindable. ' +
-		'To mark a property as bindable, use the $bindable() rune like this: `let { count = $bindable() } = $props()`',
+		'A component is binding to property count of Counter.svelte (i.e. <Counter bind:count />). This is disallowed because the property was ' +
+		'not declared as bindable inside .../samples/props-not-bindable/Counter.svelte. To mark a property as bindable, use the $bindable() rune ' +
+		'in Counter.svelte like this: `let { count = $bindable() } = $props()`',
 	html: `0`
 });
diff --git a/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md b/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md
index 25547f72ab..43a5c7134c 100644
--- a/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md
+++ b/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md
@@ -121,9 +121,9 @@ Content inside component tags becomes a [snippet prop](/docs/snippets) called `c
 
 Some breaking changes only apply once your component is in runes mode.
 
-### Bindings to component exports don't show up in rest props
+### Bindings to component exports are not allowed
 
-In runes mode, bindings to component exports don't show up in rest props. For example, `rest` in `let { foo, bar, ...rest } = $props();` would not contain `baz` if `baz` was defined as `export const baz = ...;` inside the component. In Svelte 4 syntax, the equivalent to `rest` would be `$$restProps`, which contains these component exports.
+Exports from runes mode components cannot be bound to directly. For example, having `export const foo = ...` in component `A` and then doing `<A bind:foo />` causes an error. Use `bind:this` instead — `<A bind:this={a} />` — and access the export as `a.foo`. This change makes things easier to reason about, as it enforces a clear separation between props and exports.
 
 ### Bindings need to be explicitly defined using `$bindable()`
 

From 3866887f3787a61c044448a7557a7f89489b293b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:56:58 -0400
Subject: [PATCH 04/27] Version Packages (next) (#11296)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json            | 1 +
 packages/svelte/CHANGELOG.md   | 6 ++++++
 packages/svelte/package.json   | 2 +-
 packages/svelte/src/version.js | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 91b0d77715..300038c872 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -19,6 +19,7 @@
     "beige-flies-wash",
     "beige-mirrors-listen",
     "beige-rabbits-shave",
+    "beige-seas-share",
     "big-cars-serve",
     "big-eggs-flash",
     "big-eyes-carry",
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 109238e281..0e57787e43 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.0.0-next.113
+
+### Patch Changes
+
+- breaking: disallow binding to component exports in runes mode ([#11238](https://github.com/sveltejs/svelte/pull/11238))
+
 ## 5.0.0-next.112
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index f8bee6890b..11b8c7a46c 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.112",
+  "version": "5.0.0-next.113",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index d17a9f204e..81de554c27 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -6,5 +6,5 @@
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-export const VERSION = '5.0.0-next.112';
+export const VERSION = '5.0.0-next.113';
 export const PUBLIC_VERSION = '5';

From 73490bbb8e3c0640ac72151d7e9aa8b5bf6604d6 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 23 Apr 2024 10:39:37 -0400
Subject: [PATCH 05/27] chore: markdown errors (#11294)

* rename errors.js to errors-tmp.js

* start porting errors

* generate markdown files for more errors

* convert parse errors

* convert css errors

* convert special_element errors

* convert runes errors

* convert element errors

* more

* more

* more

* more

* more

* more

* fix some tests

* fix some tests

* more tests

* remove unused error

* prettierignore

* weird

* ugh

* lint
---
 .prettierignore                               |    2 +
 eslint.config.js                              |    5 +-
 .../messages/compile-errors/attributes.md     |   59 +
 .../messages/compile-errors/bindings.md       |   35 +
 .../compile-errors/compiler_options.md        |    7 +
 .../messages/compile-errors/components.md     |    3 +
 .../messages/compile-errors/const_tag.md      |    3 +
 .../svelte/messages/compile-errors/css.md     |   51 +
 .../messages/compile-errors/elements.md       |   27 +
 .../compile-errors/legacy_reactivity.md       |    3 +
 .../svelte/messages/compile-errors/parse.md   |  147 ++
 .../svelte/messages/compile-errors/runes.md   |   95 +
 .../svelte/messages/compile-errors/slots.md   |   31 +
 .../compile-errors/special_elements.md        |   99 +
 .../messages/compile-errors/variables.md      |   19 +
 .../svelte/scripts/process-messages/index.js  |  213 ++
 .../templates/compile-errors.js               |   74 +
 packages/svelte/src/compiler/errors.js        | 1849 ++++++++++++-----
 .../src/compiler/phases/1-parse/index.js      |   22 +-
 .../compiler/phases/1-parse/read/context.js   |   10 +-
 .../phases/1-parse/read/expression.js         |    4 +-
 .../compiler/phases/1-parse/read/options.js   |   91 +-
 .../compiler/phases/1-parse/read/script.js    |    8 +-
 .../src/compiler/phases/1-parse/read/style.js |   22 +-
 .../compiler/phases/1-parse/state/element.js  |   74 +-
 .../src/compiler/phases/1-parse/state/tag.js  |   30 +-
 .../phases/2-analyze/css/css-analyze.js       |   27 +-
 .../src/compiler/phases/2-analyze/index.js    |   22 +-
 .../compiler/phases/2-analyze/validation.js   |  267 +--
 .../3-transform/client/transform-client.js    |   27 +-
 .../phases/3-transform/client/utils.js        |    3 +-
 .../3-transform/client/visitors/template.js   |    7 +-
 .../3-transform/server/transform-server.js    |   18 +-
 packages/svelte/src/compiler/phases/scope.js  |   12 +-
 packages/svelte/src/compiler/utils/assert.js  |    6 +-
 .../svelte/src/compiler/validate-options.js   |    9 +-
 .../samples/attribute-empty/_config.js        |    2 +-
 .../_config.js                                |    2 +-
 .../attribute-sequence-expression/_config.js  |    2 +-
 .../attribute-unique-binding/_config.js       |    2 +-
 .../attribute-unique-shorthand/_config.js     |    2 +-
 .../samples/attribute-unique/_config.js       |    2 +-
 .../samples/catch-before-closing/_config.js   |    2 +-
 .../samples/catch-without-await/_config.js    |    2 +-
 .../class-state-field-static/_config.js       |    5 +-
 .../samples/comment-unclosed/_config.js       |    4 +-
 .../_config.js                                |    2 +-
 .../_config.js                                |    2 +-
 .../_config.js                                |    2 +-
 .../_config.js                                |    2 +-
 .../_config.js                                |    2 +-
 .../component-slot-duplicate-error/_config.js |    2 +-
 .../component-slot-nested-error-2/_config.js  |    2 +-
 .../component-slot-nested-error-3/_config.js  |    2 +-
 .../component-slot-nested-error/_config.js    |    2 +-
 .../css-global-block-combinator/_config.js    |    2 +-
 .../css-global-block-declaration/_config.js   |    2 +-
 .../css-global-block-modifier/_config.js      |    2 +-
 .../css-global-block-multiple/_config.js      |    2 +-
 .../compiler-errors/samples/css/_config.js    |    2 +-
 .../dollar-binding-declaration/_config.js     |    2 +-
 .../dollar-binding-global-js/_config.js       |    4 +-
 .../samples/dollar-binding-global/_config.js  |    4 +-
 .../samples/dollar-binding-import/_config.js  |    2 +-
 .../_config.js                                |    4 +-
 .../samples/else-before-closing-2/_config.js  |    2 +-
 .../samples/else-before-closing-3/_config.js  |    2 +-
 .../samples/else-before-closing/_config.js    |    2 +-
 .../else-if-before-closing-2/_config.js       |    2 +-
 .../samples/else-if-before-closing/_config.js |    2 +-
 .../samples/else-if-without-if/_config.js     |    2 +-
 .../empty-attribute-shorthand/_config.js      |    2 +-
 .../empty-classname-binding/_config.js        |    2 +-
 .../samples/empty-directive-name/_config.js   |    2 +-
 .../samples/export-derived-state/_config.js   |    2 +-
 .../samples/export-state-module/_config.js    |    2 +-
 .../samples/export-state/_config.js           |    2 +-
 .../samples/illegal-expression/_config.js     |    2 +-
 .../invalid-snippet-binding/_config.js        |    2 +-
 .../invalid-snippet-mutation/_config.js       |    2 +-
 .../legacy-no-const-assignment/_config.js     |    4 +-
 .../samples/legacy-no-const-update/_config.js |    4 +-
 .../samples/multiple-styles/_config.js        |    4 +-
 .../samples/options-children/_config.js       |    2 +-
 .../raw-mustaches-whitespace/_config.js       |    2 +-
 .../render-tag-invalid-call/_config.js        |    2 +-
 .../runes-before-after-update/_config.js      |    2 +-
 .../samples/runes-duplicate-props/_config.js  |    4 +-
 .../samples/runes-export-let/_config.js       |    2 +-
 .../runes-export-named-state/_config.js       |    2 +-
 .../runes-invalid-each-binding/_config.js     |    4 +-
 .../runes-invalid-each-mutation/_config.js    |    4 +-
 .../runes-no-const-assignment/_config.js      |    4 +-
 .../samples/runes-no-const-update/_config.js  |    4 +-
 .../runes-no-derived-assignment/_config.js    |    4 +-
 .../runes-no-derived-binding/_config.js       |    4 +-
 .../_config.js                                |    4 +-
 .../_config.js                                |    4 +-
 .../runes-no-derived-update/_config.js        |    4 +-
 .../samples/runes-no-rune-each/_config.js     |    4 +-
 .../runes-prop-export-conflict/_config.js     |    2 +-
 .../runes-wrong-bindable-args/_config.js      |    4 +-
 .../runes-wrong-bindable-placement/_config.js |    4 +-
 .../runes-wrong-derived-args/_config.js       |    4 +-
 .../runes-wrong-derived-placement/_config.js  |    5 +-
 .../runes-wrong-effect-args/_config.js        |    4 +-
 .../runes-wrong-effect-placement/_config.js   |    4 +-
 .../runes-wrong-host-placement/_config.js     |    4 +-
 .../samples/runes-wrong-props-args/_config.js |    4 +-
 .../runes-wrong-props-placement/_config.js    |    4 +-
 .../samples/runes-wrong-state-args/_config.js |    4 +-
 .../runes-wrong-state-placement/_config.js    |    4 +-
 .../_config.js                                |    4 +-
 .../samples/script-unclosed-eof/_config.js    |    2 +-
 .../samples/script-unclosed/_config.js        |    4 +-
 .../samples/self-reference/_config.js         |    4 +-
 .../_config.js                                |    4 +-
 .../snippet-children-conflict/_config.js      |    2 +-
 .../store-autosub-context-module/_config.js   |    4 +-
 .../samples/store-contextual/_config.js       |    2 +-
 .../store-global-disallowed/_config.js        |    4 +-
 .../_config.js                                |    2 +-
 .../samples/store-shadow-scope-2/_config.js   |    2 +-
 .../samples/store-shadow-scope-3/_config.js   |    2 +-
 .../samples/store-shadow-scope/_config.js     |    2 +-
 .../_config.js                                |    2 +-
 .../samples/style-unclosed-eof/_config.js     |    2 +-
 .../samples/style-unclosed/_config.js         |    2 +-
 .../samples/svelte-selfdestructive/_config.js |    4 +-
 .../samples/then-before-closing/_config.js    |    2 +-
 .../samples/then-without-await/_config.js     |    2 +-
 .../_config.js                                |    2 +-
 .../unexpected-end-of-input-b/_config.js      |    2 +-
 .../unexpected-end-of-input-c/_config.js      |    2 +-
 .../unexpected-end-of-input-d/_config.js      |    2 +-
 .../unexpected-end-of-input/_config.js        |    4 +-
 .../_config.js                                |    2 +-
 .../_config.js                                |    2 +-
 .../samples/unmatched-closing-tag/_config.js  |    2 +-
 .../samples/void-closing/_config.js           |    2 +-
 .../samples/window-children/_config.js        |    2 +-
 .../samples/window-duplicate/_config.js       |    2 +-
 .../samples/window-inside-block/_config.js    |    2 +-
 .../samples/window-inside-element/_config.js  |    2 +-
 .../samples/action-on-component/errors.json   |    2 +-
 .../samples/animation-duplicate/errors.json   |    2 +-
 .../samples/animation-not-in-each/errors.json |    4 +-
 .../animation-not-in-keyed-each/errors.json   |    4 +-
 .../animation-on-component/errors.json        |    2 +-
 .../samples/animation-siblings/errors.json    |    4 +-
 .../samples/assignment-to-const-2/errors.json |    4 +-
 .../samples/assignment-to-const-3/errors.json |    4 +-
 .../samples/assignment-to-const-4/errors.json |    4 +-
 .../samples/assignment-to-const-5/errors.json |    4 +-
 .../samples/assignment-to-const-7/errors.json |    4 +-
 .../samples/assignment-to-const/errors.json   |    4 +-
 .../attribute-expected-equals/errors.json     |    2 +-
 .../attribute-invalid-name-2/errors.json      |    2 +-
 .../attribute-invalid-name-3/errors.json      |    2 +-
 .../attribute-invalid-name-4/errors.json      |    2 +-
 .../attribute-invalid-name-5/errors.json      |    2 +-
 .../attribute-invalid-name/errors.json        |    2 +-
 .../samples/binding-await-catch/errors.json   |   14 +-
 .../samples/binding-await-then-2/errors.json  |   14 +-
 .../samples/binding-await-then/errors.json    |   14 +-
 .../samples/binding-const/errors.json         |    4 +-
 .../binding-dimensions-svg/errors.json        |    4 +-
 .../samples/binding-input-checked/errors.json |    4 +-
 .../binding-input-type-boolean/errors.json    |    2 +-
 .../errors.json                               |    4 +-
 .../binding-invalid-on-element-2/errors.json  |    4 +-
 .../binding-invalid-on-element/errors.json    |    4 +-
 .../binding-invalid-value-global/errors.json  |    2 +-
 .../samples/binding-invalid-value/errors.json |    2 +-
 .../samples/binding-invalid/errors.json       |    4 +-
 .../validator/samples/binding-let/errors.json |    4 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |   12 +-
 .../errors.json                               |    4 +-
 .../errors.json                               |    2 +-
 .../component-slot-dynamic/errors.json        |    2 +-
 .../errors.json                               |   12 +-
 .../component-slotted-each-block/errors.json  |    2 +-
 .../component-slotted-if-block/errors.json    |    2 +-
 .../samples/const-tag-conflict-1/errors.json  |   14 +-
 .../samples/const-tag-conflict-2/errors.json  |   14 +-
 .../samples/const-tag-placement-1/errors.json |   12 +-
 .../samples/const-tag-placement-2/errors.json |   12 +-
 .../samples/const-tag-readonly-1/errors.json  |   14 +-
 .../samples/const-tag-readonly-2/errors.json  |   14 +-
 .../contenteditable-dynamic/errors.json       |    2 +-
 .../contenteditable-missing/errors.json       |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../css-invalid-global-placement/errors.json  |    2 +-
 .../css-invalid-global-selector-2/errors.json |    2 +-
 .../css-invalid-global-selector-3/errors.json |    2 +-
 .../css-invalid-global-selector-4/errors.json |    2 +-
 .../css-invalid-global-selector-5/errors.json |    2 +-
 .../css-invalid-global-selector-6/errors.json |    2 +-
 .../errors.json                               |    2 +-
 .../css-invalid-global-selector/errors.json   |    2 +-
 .../errors.json                               |    2 +-
 .../samples/css-mismatched-quotes/errors.json |    2 +-
 .../samples/debug-invalid-args/errors.json    |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../samples/default-export/errors.json        |    2 +-
 .../directive-non-expression/errors.json      |    2 +-
 .../errors.json                               |    4 +-
 .../errors.json                               |    4 +-
 .../dollar-global-in-markup/errors.json       |    4 +-
 .../dollar-global-in-script/errors.json       |    4 +-
 .../dynamic-element-invalid-tag/errors.json   |    2 +-
 .../dynamic-element-missing-tag/errors.json   |    4 +-
 .../samples/dynamic-element-this/errors.json  |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../each-block-invalid-context/errors.json    |    2 +-
 .../samples/event-attribute/errors.json       |    2 +-
 .../errors.json                               |    2 +-
 .../errors.json                               |    2 +-
 .../event-modifiers-invalid/errors.json       |    2 +-
 .../html-block-in-attribute/errors.json       |   12 +-
 .../html-block-in-textarea/errors.json        |   12 +-
 .../illegal-variable-declaration/errors.json  |    4 +-
 .../invalid-empty-css-declaration/errors.json |    2 +-
 .../invalid-node-placement-2/errors.json      |    2 +-
 .../invalid-node-placement/errors.json        |    2 +-
 .../samples/let-directive/errors.json         |   14 +-
 .../logic-block-in-attribute/errors.json      |   12 +-
 .../logic-block-in-textarea/errors.json       |   12 +-
 .../errors.json                               |    4 +-
 .../errors.json                               |    4 +-
 .../samples/namespace-invalid/errors.json     |    4 +-
 .../samples/namespace-non-literal/errors.json |    4 +-
 .../reactive-declaration-cyclical/errors.json |   12 +-
 .../script-invalid-context/errors.json        |    2 +-
 .../slot-attribute-invalid/errors.json        |    2 +-
 .../errors.json                               |    2 +-
 .../svelte-fragment-placement-2/errors.json   |   14 +-
 .../svelte-fragment-placement/errors.json     |   14 +-
 .../svelte-head-attributes/errors.json        |   14 +-
 .../validator/samples/tag-invalid/errors.json |    4 +-
 .../samples/tag-non-string/errors.json        |    2 +-
 .../textarea-value-children/errors.json       |    4 +-
 .../samples/title-no-attributes/errors.json   |    4 +-
 .../samples/title-no-children/errors.json     |    4 +-
 .../errors.json                               |    4 +-
 .../transition-duplicate-in/errors.json       |    4 +-
 .../errors.json                               |    4 +-
 .../transition-duplicate-out/errors.json      |    4 +-
 .../errors.json                               |    4 +-
 .../errors.json                               |    4 +-
 .../errors.json                               |    4 +-
 .../transition-on-component/errors.json       |    2 +-
 .../errors.json                               |    4 +-
 .../window-binding-invalid/errors.json        |    4 +-
 267 files changed, 3027 insertions(+), 1198 deletions(-)
 create mode 100644 packages/svelte/messages/compile-errors/attributes.md
 create mode 100644 packages/svelte/messages/compile-errors/bindings.md
 create mode 100644 packages/svelte/messages/compile-errors/compiler_options.md
 create mode 100644 packages/svelte/messages/compile-errors/components.md
 create mode 100644 packages/svelte/messages/compile-errors/const_tag.md
 create mode 100644 packages/svelte/messages/compile-errors/css.md
 create mode 100644 packages/svelte/messages/compile-errors/elements.md
 create mode 100644 packages/svelte/messages/compile-errors/legacy_reactivity.md
 create mode 100644 packages/svelte/messages/compile-errors/parse.md
 create mode 100644 packages/svelte/messages/compile-errors/runes.md
 create mode 100644 packages/svelte/messages/compile-errors/slots.md
 create mode 100644 packages/svelte/messages/compile-errors/special_elements.md
 create mode 100644 packages/svelte/messages/compile-errors/variables.md
 create mode 100644 packages/svelte/scripts/process-messages/index.js
 create mode 100644 packages/svelte/scripts/process-messages/templates/compile-errors.js

diff --git a/.prettierignore b/.prettierignore
index 48d37dc02f..77bdd29cf3 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,6 +2,8 @@ packages/**/dist/*.js
 packages/**/build/*.js
 packages/**/npm/**/*
 packages/**/config/*.js
+packages/svelte/messages/**/*.md
+packages/svelte/src/compiler/errors.js
 packages/svelte/tests/**/*.svelte
 packages/svelte/tests/**/_expected*
 packages/svelte/tests/**/_actual*
diff --git a/eslint.config.js b/eslint.config.js
index 75fcc7fa06..a86f724d34 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -33,13 +33,16 @@ export default [
 		ignores: [
 			'**/*.d.ts',
 			'**/tests',
+			'packages/svelte/scripts/process-messages/templates/*.js',
+			'packages/svelte/src/compiler/errors.js',
 			'packages/svelte/compiler/index.js',
 			// documentation can contain invalid examples
 			'documentation',
 			// contains a fork of the REPL which doesn't adhere to eslint rules
 			'sites/svelte-5-preview/**',
 			// wasn't checked previously, reenable at some point
-			'sites/svelte.dev/**'
+			'sites/svelte.dev/**',
+			'tmp/**'
 		]
 	}
 ];
diff --git a/packages/svelte/messages/compile-errors/attributes.md b/packages/svelte/messages/compile-errors/attributes.md
new file mode 100644
index 0000000000..9501080ee0
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/attributes.md
@@ -0,0 +1,59 @@
+## empty_attribute_shorthand
+
+Attribute shorthand cannot be empty
+
+## duplicate_attribute
+
+Attributes need to be unique
+
+## invalid_event_attribute_value
+
+Event attribute must be a JavaScript expression, not a string
+
+## invalid_attribute_name
+
+'%name%' is not a valid attribute name
+
+## animation_invalid_placement
+
+An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
+
+## animation_missing_key
+
+An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
+
+## animation_duplicate
+
+An element can only have one 'animate' directive
+
+## invalid_event_modifier
+
+Valid event modifiers are %list%
+
+## invalid_component_event_modifier
+
+Event modifiers other than 'once' can only be used on DOM elements
+
+## invalid_event_modifier_combination
+
+The '%modifier1%' and '%modifier2%' modifiers cannot be used together
+
+## transition_duplicate
+
+Cannot use multiple `%type%:` directives on a single element
+
+## transition_conflict
+
+Cannot use `%type%:` alongside existing `%existing%:` directive
+
+## invalid_let_directive_placement
+
+`let:` directive at invalid position
+
+## invalid_style_directive_modifier
+
+Invalid 'style:' modifier. Valid modifiers are: 'important'
+
+## invalid_sequence_expression
+
+Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
diff --git a/packages/svelte/messages/compile-errors/bindings.md b/packages/svelte/messages/compile-errors/bindings.md
new file mode 100644
index 0000000000..5e88c5890a
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/bindings.md
@@ -0,0 +1,35 @@
+## invalid_binding_expression
+
+Can only bind to an Identifier or MemberExpression
+
+## invalid_binding_value
+
+Can only bind to state or props
+
+## bind_invalid_target
+
+`bind:%name%` can only be used with %elements%
+
+## bind_invalid
+
+`bind:%name%` is not a valid binding
+
+## bind_invalid_detailed
+
+`bind:%name%` is not a valid binding. %explanation%
+
+## invalid_type_attribute
+
+'type' attribute must be a static text value if input uses two-way binding
+
+## invalid_multiple_attribute
+
+'multiple' attribute must be static if select uses two-way binding
+
+## missing_contenteditable_attribute
+
+'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
+
+## dynamic_contenteditable_attribute
+
+'contenteditable' attribute cannot be dynamic if element uses two-way binding
diff --git a/packages/svelte/messages/compile-errors/compiler_options.md b/packages/svelte/messages/compile-errors/compiler_options.md
new file mode 100644
index 0000000000..761d74c72a
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/compiler_options.md
@@ -0,0 +1,7 @@
+## invalid_compiler_option
+
+Invalid compiler option: %msg%
+
+## removed_compiler_option
+
+Invalid compiler option: %msg%
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/components.md b/packages/svelte/messages/compile-errors/components.md
new file mode 100644
index 0000000000..88a31a81c6
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/components.md
@@ -0,0 +1,3 @@
+## invalid_component_directive
+
+This type of directive is not valid on components
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/const_tag.md b/packages/svelte/messages/compile-errors/const_tag.md
new file mode 100644
index 0000000000..de8a8ca909
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/const_tag.md
@@ -0,0 +1,3 @@
+## invalid_const_placement
+
+{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/css.md b/packages/svelte/messages/compile-errors/css.md
new file mode 100644
index 0000000000..33331cfac6
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/css.md
@@ -0,0 +1,51 @@
+## invalid_css_empty_declaration
+
+Declaration cannot be empty
+
+## invalid_css_global_block_list
+
+A :global {...} block cannot be part of a selector list with more than one item
+
+## invalid_css_global_block_modifier
+
+A :global {...} block cannot modify an existing selector
+
+## invalid_css_global_block_combinator
+
+A :global {...} block cannot follow a %name% combinator
+
+## invalid_css_global_block_declaration
+
+A :global {...} block can only contain rules, not declarations
+
+## invalid_css_global_placement
+
+:global(...) can be at the start or end of a selector sequence, but not in the middle
+
+## invalid_css_global_selector
+
+:global(...) must contain exactly one selector
+
+## invalid_css_global_selector_list
+
+:global(...) must not contain type or universal selectors when used in a compound selector
+
+## invalid_css_type_selector_placement
+
+:global(...) must not be followed with a type selector
+
+## invalid_css_selector
+
+Invalid selector
+
+## invalid_css_identifier
+
+Expected a valid CSS identifier
+
+## invalid_nesting_selector
+
+Nesting selectors can only be used inside a rule
+
+## invalid_css_declaration
+
+Declaration cannot be empty
diff --git a/packages/svelte/messages/compile-errors/elements.md b/packages/svelte/messages/compile-errors/elements.md
new file mode 100644
index 0000000000..466a26a7ac
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/elements.md
@@ -0,0 +1,27 @@
+## invalid_textarea_content
+
+A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
+
+## invalid_void_content
+
+Void elements cannot have children or closing tags
+
+## invalid_element_content
+
+<%name%> cannot have children
+
+## invalid_tag_name
+
+Expected valid tag name
+
+## invalid_node_placement
+
+%thing% is invalid inside <%parent%>
+
+## illegal_title_attribute
+
+`<title>` cannot have attributes nor directives
+
+## invalid_title_content
+
+`<title>` can only contain text and {tags}
diff --git a/packages/svelte/messages/compile-errors/legacy_reactivity.md b/packages/svelte/messages/compile-errors/legacy_reactivity.md
new file mode 100644
index 0000000000..6f4234aa01
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/legacy_reactivity.md
@@ -0,0 +1,3 @@
+## cyclical_reactive_declaration
+
+Cyclical dependency detected: %cycle%
diff --git a/packages/svelte/messages/compile-errors/parse.md b/packages/svelte/messages/compile-errors/parse.md
new file mode 100644
index 0000000000..e09c61e419
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/parse.md
@@ -0,0 +1,147 @@
+## unclosed_element
+
+`<%name%>` was left open
+
+## unclosed_block
+
+Block was left open
+
+## unexpected_block_close
+
+Unexpected block closing tag
+
+## unexpected_eof
+
+Unexpected end of input
+
+## js_parse_error
+
+%message%
+
+## expected_token
+
+Expected token %token%
+
+## unexpected_reserved_word
+
+'%word%' is a reserved word in JavaScript and cannot be used here
+
+## missing_whitespace
+
+Expected whitespace
+
+## expected_pattern
+
+Expected identifier or destructure pattern
+
+## invalid_script_context
+
+If the context attribute is supplied, its value must be "module"
+
+## invalid_elseif
+
+'elseif' should be 'else if'
+
+## invalid_continuing_block_placement
+
+{:...} block is invalid at this position (did you forget to close the preceeding element or block?)
+
+## invalid_block_missing_parent
+
+%child% block must be a child of %parent%
+
+## duplicate_block_part
+
+%name% cannot appear more than once within a block
+
+## expected_block_type
+
+Expected 'if', 'each', 'await', 'key' or 'snippet'
+
+## expected_identifier
+
+Expected an identifier
+
+## invalid_debug
+
+{@debug ...} arguments must be identifiers, not arbitrary expressions
+
+## invalid_const
+
+{@const ...} must be an assignment
+
+## invalid_block_placement
+
+{#%name% ...} block cannot be %location%
+
+## invalid_tag_placement
+
+{@%name% ...} tag cannot be %location%
+
+## missing_attribute_value
+
+Expected attribute value
+
+## unclosed_attribute_value
+
+Expected closing %delimiter% character
+
+## invalid_directive_value
+
+Directive value must be a JavaScript expression enclosed in curly braces
+
+## empty_directive_name
+
+%type% name cannot be empty
+
+## invalid_closing_tag
+
+</%name%> attempted to close an element that was not open
+
+## invalid_closing_tag_after_autoclose
+
+</%name%> attempted to close element that was already automatically closed by <%reason%> (cannot nest <%reason%> inside <%name%>)
+
+## invalid_dollar_binding
+
+The $ name is reserved, and cannot be used for variables and imports
+
+## invalid_dollar_prefix
+
+The $ prefix is reserved, and cannot be used for variables and imports
+
+## invalid_dollar_global
+
+The $ name is reserved. To reference a global variable called $, use globalThis.$
+
+## illegal_subscription
+
+Cannot reference store value inside `<script context="module">`
+
+## duplicate_style_element
+
+A component can have a single top-level `<style>` element
+
+## duplicate_script_element
+
+A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
+
+## invalid_render_expression
+
+{@render ...} tags can only contain call expressions
+
+## invalid_render_arguments
+
+expected at most one argument
+
+## invalid_render_call
+
+Calling a snippet function using apply, bind or call is not allowed
+
+## invalid_render_spread_argument
+
+cannot use spread arguments in {@render ...} tags
+
+## invalid_snippet_rest_parameter
+
+snippets do not support rest parameters; use an array instead
diff --git a/packages/svelte/messages/compile-errors/runes.md b/packages/svelte/messages/compile-errors/runes.md
new file mode 100644
index 0000000000..c8efa4eefb
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/runes.md
@@ -0,0 +1,95 @@
+## invalid_legacy_props
+
+Cannot use `$$props` in runes mode
+
+## invalid_legacy_rest_props
+
+Cannot use `$$restProps` in runes mode
+
+## invalid_legacy_reactive_statement
+
+`$:` is not allowed in runes mode, use `$derived` or `$effect` instead
+
+## invalid_legacy_export
+
+Cannot use `export let` in runes mode — use $props instead
+
+## invalid_rune_usage
+
+Cannot use %rune% rune in non-runes mode
+
+## invalid_state_export
+
+Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
+
+## invalid_derived_export
+
+Cannot export derived state from a module. To expose the current derived value, export a function returning its value
+
+## invalid_props_id
+
+`$props()` can only be used with an object destructuring pattern
+
+## invalid_props_pattern
+
+`$props()` assignment must not contain nested properties or computed keys
+
+## invalid_props_location
+
+`$props()` can only be used at the top level of components as a variable declaration initializer
+
+## invalid_bindable_location
+
+`$bindable()` can only be used inside a `$props()` declaration
+
+## invalid_state_location
+
+`%rune%(...)` can only be used as a variable declaration initializer or a class field
+
+## invalid_effect_location
+
+`$effect()` can only be used as an expression statement
+
+## invalid_host_location
+
+`$host()` can only be used inside custom element component instances
+
+## invalid_assignment
+
+Cannot assign to %thing%
+
+## invalid_binding
+
+Cannot bind to %thing%
+
+## invalid_rune_args
+
+`%rune%` cannot be called with arguments
+
+## invalid_rune_args_length
+
+`%rune%` must be called with %args%
+
+## invalid_runes_mode_import
+
+%name% cannot be used in runes mode
+
+## duplicate_props_rune
+
+Cannot use `$props()` more than once
+
+## invalid_each_assignment
+
+Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
+
+## invalid_snippet_assignment
+
+Cannot reassign or bind to snippet parameter
+
+## invalid_derived_call
+
+`$derived.call(...)` has been replaced with `$derived.by(...)`
+
+## conflicting_property_name
+
+Cannot have a property and a component export with the same name
diff --git a/packages/svelte/messages/compile-errors/slots.md b/packages/svelte/messages/compile-errors/slots.md
new file mode 100644
index 0000000000..51213c5b5d
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/slots.md
@@ -0,0 +1,31 @@
+## invalid_slot_element_attribute
+
+`<slot>` can only receive attributes and (optionally) let directives
+
+## invalid_slot_attribute
+
+slot attribute must be a static value
+
+## invalid_slot_name_default
+
+`default` is a reserved word — it cannot be used as a slot name
+
+## invalid_slot_name
+
+slot attribute must be a static value
+
+## invalid_slot_placement
+
+Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
+
+## duplicate_slot_name
+
+Duplicate slot name '%name%' in <%component%>
+
+## invalid_default_slot_content
+
+Found default slot content alongside an explicit slot="default"
+
+## conflicting_children_snippet
+
+Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
diff --git a/packages/svelte/messages/compile-errors/special_elements.md b/packages/svelte/messages/compile-errors/special_elements.md
new file mode 100644
index 0000000000..6617d0e0fb
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/special_elements.md
@@ -0,0 +1,99 @@
+## invalid_svelte_option_attribute
+
+`<svelte:options>` can only receive static attributes
+
+## invalid_svelte_option_namespace
+
+Unsupported `<svelte:option>` value for "namespace". Valid values are "html", "svg" or "foreign"
+
+## tag_option_deprecated
+
+"tag" option is deprecated — use "customElement" instead
+
+## invalid_svelte_option_runes
+
+Unsupported `<svelte:option>` value for "runes". Valid values are true or false
+
+## invalid_svelte_option_accessors
+
+Unsupported `<svelte:option>` value for "accessors". Valid values are true or false
+
+## invalid_svelte_option_preserveWhitespace
+
+Unsupported `<svelte:option>` value for "preserveWhitespace". Valid values are true or false
+
+## invalid_svelte_option_immutable
+
+Unsupported `<svelte:option>` value for "immutable". Valid values are true or false
+
+## invalid_tag_property
+
+Tag name must be two or more words joined by the "-" character
+
+## invalid_svelte_option_customElement
+
+"customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
+
+## invalid_customElement_props_attribute
+
+"props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
+
+## invalid_customElement_shadow_attribute
+
+"shadow" must be either "open" or "none"
+
+## unknown_svelte_option_attribute
+
+`<svelte:options>` unknown attribute '%name%'
+
+## illegal_svelte_head_attribute
+
+`<svelte:head>` cannot have attributes nor directives
+
+## invalid_svelte_fragment_attribute
+
+`<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
+
+## invalid_svelte_fragment_slot
+
+`<svelte:fragment>` slot attribute must have a static value
+
+## invalid_svelte_fragment_placement
+
+`<svelte:fragment>` must be the direct child of a component
+
+## invalid_svelte_element_placement
+
+<%name%> tags cannot be inside elements or blocks
+
+## duplicate_svelte_element
+
+A component can only have one <%name%> element
+
+## invalid_self_placement
+
+`<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components
+
+## missing_svelte_element_definition
+
+`<svelte:element>` must have a 'this' attribute
+
+## missing_svelte_component_definition
+
+`<svelte:component>` must have a 'this' attribute
+
+## invalid_svelte_element_definition
+
+Invalid element definition — must be an {expression}
+
+## invalid_svelte_component_definition
+
+Invalid component definition — must be an {expression}
+
+## invalid_svelte_tag
+
+Valid `<svelte:...>` tag names are %list%
+
+## conflicting_slot_usage
+
+Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
diff --git a/packages/svelte/messages/compile-errors/variables.md b/packages/svelte/messages/compile-errors/variables.md
new file mode 100644
index 0000000000..f1ac317b59
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/variables.md
@@ -0,0 +1,19 @@
+## illegal_global
+
+`%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
+
+## duplicate_declaration
+
+`%name%` has already been declared
+
+## default_export
+
+A component cannot have a default export
+
+## illegal_variable_declaration
+
+Cannot declare same variable name which is imported inside `<script context="module">`
+
+## illegal_store_subscription
+
+Cannot subscribe to stores that are not declared at the top level of the component
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
new file mode 100644
index 0000000000..52cb23aec3
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -0,0 +1,213 @@
+// @ts-check
+import fs from 'node:fs';
+import * as acorn from 'acorn';
+import { walk } from 'zimmerframe';
+import * as esrap from 'esrap';
+
+const messages = {};
+const seen = new Set();
+
+for (const category of fs.readdirSync('messages')) {
+	messages[category] = {};
+
+	for (const file of fs.readdirSync(`messages/${category}`)) {
+		if (!file.endsWith('.md')) continue;
+
+		const markdown = fs.readFileSync(`messages/${category}/${file}`, 'utf-8');
+
+		for (const match of markdown.matchAll(/## ([\w]+)\n\n([^]+?)(?=$|\n\n## )/g)) {
+			const [_, code, text] = match;
+
+			if (seen.has(code)) {
+				throw new Error(`Duplicate message code ${category}/${code}`);
+			}
+
+			seen.add(code);
+			messages[category][code] = text.trim();
+		}
+	}
+}
+
+function transform(name, dest) {
+	const source = fs.readFileSync(new URL(`./templates/${name}.js`, import.meta.url), 'utf-8');
+
+	const comments = [];
+
+	const ast = acorn.parse(source, {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+		onComment: (block, value, start, end) => {
+			if (block && /\n/.test(value)) {
+				let a = start;
+				while (a > 0 && source[a - 1] !== '\n') a -= 1;
+
+				let b = a;
+				while (/[ \t]/.test(source[b])) b += 1;
+
+				const indentation = source.slice(a, b);
+				value = value.replace(new RegExp(`^${indentation}`, 'gm'), '');
+			}
+
+			comments.push({ type: block ? 'Block' : 'Line', value, start, end });
+		}
+	});
+
+	walk(ast, null, {
+		_(node, { next }) {
+			let comment;
+
+			while (comments[0] && comments[0].start < node.start) {
+				comment = comments.shift();
+				// @ts-expect-error
+				(node.leadingComments ||= []).push(comment);
+			}
+
+			next();
+
+			if (comments[0]) {
+				const slice = source.slice(node.end, comments[0].start);
+
+				if (/^[,) \t]*$/.test(slice)) {
+					// @ts-expect-error
+					node.trailingComments = [comments.shift()];
+				}
+			}
+		}
+	});
+
+	const category = messages[name];
+
+	// find the `export function CODE` node
+	const index = ast.body.findIndex((node) => {
+		if (
+			node.type === 'ExportNamedDeclaration' &&
+			node.declaration &&
+			node.declaration.type === 'FunctionDeclaration'
+		) {
+			return node.declaration.id.name === 'CODE';
+		}
+	});
+
+	if (index === -1) throw new Error(`missing export function CODE in ${name}.js`);
+
+	const template_node = ast.body[index];
+	ast.body.splice(index, 1);
+
+	for (const code in category) {
+		const message = category[code];
+		const vars = [];
+		for (const match of message.matchAll(/%(\w+)%/g)) {
+			const name = match[1];
+			if (!vars.includes(name)) {
+				vars.push(match[1]);
+			}
+		}
+
+		const clone = walk(/** @type {import('estree').Node} */ (template_node), null, {
+			// @ts-expect-error Block is a block comment, which is not recognised
+			Block(node, context) {
+				if (!node.value.includes('PARAMETER')) return;
+
+				const value = node.value
+					.split('\n')
+					.map((line) => {
+						if (line.includes('PARAMETER')) {
+							return vars.map((name) => ` * @param {string} ${name}`).join('\n');
+						}
+
+						return line;
+					})
+					.join('\n');
+
+				if (value !== node.value) {
+					return { ...node, value };
+				}
+			},
+			FunctionDeclaration(node, context) {
+				if (node.id.name !== 'CODE') return;
+
+				const params = [];
+
+				for (const param of node.params) {
+					if (param.type === 'Identifier' && param.name === 'PARAMETER') {
+						params.push(...vars.map((name) => ({ type: 'Identifier', name })));
+					} else {
+						params.push(param);
+					}
+				}
+
+				return /** @type {import('estree').FunctionDeclaration} */ ({
+					.../** @type {import('estree').FunctionDeclaration} */ (context.next()),
+					params,
+					id: {
+						...node.id,
+						name: code
+					}
+				});
+			},
+			Literal(node) {
+				if (node.value === 'CODE') {
+					return {
+						type: 'Literal',
+						value: code
+					};
+				}
+			},
+			Identifier(node) {
+				if (node.name !== 'MESSAGE') return;
+
+				if (/%\w+%/.test(message)) {
+					const parts = message.split(/(%\w+%)/);
+
+					/** @type {import('estree').Expression[]} */
+					const expressions = [];
+
+					/** @type {import('estree').TemplateElement[]} */
+					const quasis = [];
+
+					for (let i = 0; i < parts.length; i += 1) {
+						const part = parts[i];
+						if (i % 2 === 0) {
+							const str = part.replace(/(`|\$)/g, '\\$1');
+							quasis.push({
+								type: 'TemplateElement',
+								value: { raw: str, cooked: str },
+								tail: i === parts.length - 1
+							});
+						} else {
+							expressions.push({
+								type: 'Identifier',
+								name: part.slice(1, -1)
+							});
+						}
+					}
+
+					return {
+						type: 'TemplateLiteral',
+						expressions,
+						quasis
+					};
+				}
+
+				return {
+					type: 'Literal',
+					value: message
+				};
+			}
+		});
+
+		// @ts-expect-error
+		ast.body.push(clone);
+	}
+
+	// @ts-expect-error
+	const module = esrap.print(ast);
+
+	fs.writeFileSync(
+		dest,
+		`/* This file is generated by scripts/process-messages.js. Do not edit! */\n\n` + module.code,
+		'utf-8'
+	);
+}
+
+transform('compile-errors', 'src/compiler/errors.js');
diff --git a/packages/svelte/scripts/process-messages/templates/compile-errors.js b/packages/svelte/scripts/process-messages/templates/compile-errors.js
new file mode 100644
index 0000000000..96dcb72b3f
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/compile-errors.js
@@ -0,0 +1,74 @@
+/** @typedef {{ start?: number, end?: number }} NodeLike */
+
+// interface is duplicated between here (used internally) and ./interfaces.js
+// (exposed publicly), and I'm not sure how to avoid that
+export class CompileError extends Error {
+	name = 'CompileError';
+
+	/** @type {import('#compiler').CompileError['filename']} */
+	filename = undefined;
+
+	/** @type {import('#compiler').CompileError['position']} */
+	position = undefined;
+
+	/** @type {import('#compiler').CompileError['start']} */
+	start = undefined;
+
+	/** @type {import('#compiler').CompileError['end']} */
+	end = undefined;
+
+	/**
+	 *
+	 * @param {string} code
+	 * @param {string} message
+	 * @param {[number, number] | undefined} position
+	 */
+	constructor(code, message, position) {
+		super(message);
+		this.code = code;
+		this.position = position;
+	}
+
+	toString() {
+		let out = `${this.name}: ${this.message}`;
+
+		out += `\n(${this.code})`;
+
+		if (this.filename) {
+			out += `\n${this.filename}`;
+
+			if (this.start) {
+				out += `${this.start.line}:${this.start.column}`;
+			}
+		}
+
+		return out;
+	}
+}
+
+/**
+ *
+ * @param {null | number | NodeLike} node
+ * @param {string} code
+ * @param {string} message
+ * @returns {never}
+ */
+function e(node, code, message) {
+	const start = typeof node === 'number' ? node : node?.start;
+	const end = typeof node === 'number' ? node : node?.end;
+
+	throw new CompileError(
+		code,
+		message,
+		start !== undefined && end !== undefined ? [start, end] : undefined
+	);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} PARAMETER
+ * @returns {never}
+ */
+export function CODE(node, PARAMETER) {
+	e(node, 'CODE', MESSAGE);
+}
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 71bc353336..ee2a961868 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -1,497 +1,16 @@
-/** @typedef {{ start?: number, end?: number }} NodeLike */
-/** @typedef {Record<string, (...args: any[]) => string>} Errors */
-
-/**
- * @param {Array<string | number>} items
- * @param {string} conjunction
- */
-function list(items, conjunction = 'or') {
-	if (items.length === 1) return items[0];
-	return `${items.slice(0, -1).join(', ')} ${conjunction} ${items[items.length - 1]}`;
-}
-
-/** @satisfies {Errors} */
-const internal = {
-	/** @param {string} message */
-	TODO: (message) => `TODO ${message}`,
-
-	/** @param {string} message */
-	INTERNAL: (message) =>
-		`Internal compiler error: ${message}. Please report this to https://github.com/sveltejs/svelte/issues`
-};
-
-/** @satisfies {Errors} */
-const parse = {
-	/** @param {string} name */
-	'unclosed-element': (name) => `<${name}> was left open`,
-	'unclosed-block': () => `Block was left open`,
-	'unexpected-block-close': () => `Unexpected block closing tag`,
-	/** @param {string} [expected]  */
-	'unexpected-eof': (expected) =>
-		`Unexpected end of input` + (expected ? ` (expected ${expected})` : ''),
-	/** @param {string} message */
-	'js-parse-error': (message) => message,
-	/** @param {string} token */
-	'expected-token': (token) => `Expected token ${token}`,
-	/** @param {string} word */
-	'unexpected-reserved-word': (word) =>
-		`'${word}' is a reserved word in JavaScript and cannot be used here`,
-	'missing-whitespace': () => `Expected whitespace`,
-	'expected-pattern': () => `Expected identifier or destructure pattern`,
-	'invalid-script-context': () =>
-		`If the context attribute is supplied, its value must be "module"`,
-	'invalid-elseif': () => `'elseif' should be 'else if'`,
-	'invalid-continuing-block-placement': () =>
-		`{:...} block is invalid at this position (did you forget to close the preceeding element or block?)`,
-	/**
-	 * @param {string} child
-	 * @param {string} parent
-	 */
-	'invalid-block-missing-parent': (child, parent) => `${child} block must be a child of ${parent}`,
-	/** @param {string} name */
-	'duplicate-block-part': (name) => `${name} cannot appear more than once within a block`,
-	'expected-block-type': () => `Expected 'if', 'each', 'await', 'key' or 'snippet'`,
-	'expected-identifier': () => `Expected an identifier`,
-	'invalid-debug': () => `{@debug ...} arguments must be identifiers, not arbitrary expressions`,
-	'invalid-const': () => `{@const ...} must be an assignment`,
-	/**
-	 * @param {string} location
-	 * @param {string} name
-	 */
-	'invalid-block-placement': (location, name) => `{#${name} ...} block cannot be ${location}`,
-	/**
-	 * @param {string} location
-	 * @param {string} name
-	 */
-	'invalid-tag-placement': (location, name) => `{@${name} ...} tag cannot be ${location}`,
-	'missing-attribute-value': () => `Expected attribute value`,
-	/** @param {string} delimiter */
-	'unclosed-attribute-value': (delimiter) => `Expected closing ${delimiter} character`,
-	'invalid-directive-value': () =>
-		`Directive value must be a JavaScript expression enclosed in curly braces`,
-	/** @param {string} type */
-	'empty-directive-name': (type) => `${type} name cannot be empty`,
-	/** @param {string} name */
-	'invalid-closing-tag': (name) => `</${name}> attempted to close an element that was not open`,
-	/**
-	 * @param {string} name
-	 * @param {string} reason
-	 */
-	'invalid-closing-tag-after-autoclose': (name, reason) =>
-		`</${name}> attempted to close element that was already automatically closed by <${reason}> (cannot nest <${reason}> inside <${name}>)`,
-	'invalid-dollar-binding': () =>
-		`The $ name is reserved, and cannot be used for variables and imports`,
-	'invalid-dollar-prefix': () =>
-		`The $ prefix is reserved, and cannot be used for variables and imports`,
-	'invalid-dollar-global': () =>
-		`The $ name is reserved. To reference a global variable called $, use globalThis.$`,
-	'illegal-subscription': () => `Cannot reference store value inside <script context="module">`,
-	'duplicate-style-element': () => `A component can have a single top-level <style> element`,
-	'duplicate-script-element': () =>
-		`A component can have a single top-level <script> element and/or a single top-level <script context="module"> element`,
-	'invalid-render-expression': () => '{@render ...} tags can only contain call expressions',
-	'invalid-render-arguments': () => 'expected at most one argument',
-	'invalid-render-call': () =>
-		'Calling a snippet function using apply, bind or call is not allowed',
-	'invalid-render-spread-argument': () => 'cannot use spread arguments in {@render ...} tags',
-	'invalid-snippet-rest-parameter': () =>
-		'snippets do not support rest parameters; use an array instead'
-};
-
-/** @satisfies {Errors} */
-const css = {
-	/** @param {string} message */
-	'css-parse-error': (message) => message,
-	'invalid-css-empty-declaration': () => `Declaration cannot be empty`,
-	'invalid-css-global-block-list': () =>
-		`A :global {...} block cannot be part of a selector list with more than one item`,
-	'invalid-css-global-block-modifier': () =>
-		`A :global {...} block cannot modify an existing selector`,
-	/** @param {string} name */
-	'invalid-css-global-block-combinator': (name) =>
-		`A :global {...} block cannot follow a ${name} combinator`,
-	'invalid-css-global-block-declaration': () =>
-		`A :global {...} block can only contain rules, not declarations`,
-	'invalid-css-global-placement': () =>
-		`:global(...) can be at the start or end of a selector sequence, but not in the middle`,
-	'invalid-css-global-selector': () => `:global(...) must contain exactly one selector`,
-	'invalid-css-global-selector-list': () =>
-		`:global(...) must not contain type or universal selectors when used in a compound selector`,
-	'invalid-css-type-selector-placement': () =>
-		`:global(...) must not be followed with a type selector`,
-	'invalid-css-selector': () => `Invalid selector`,
-	'invalid-css-identifier': () => 'Expected a valid CSS identifier',
-	'invalid-nesting-selector': () => `Nesting selectors can only be used inside a rule`,
-	'invalid-css-declaration': () => 'Declaration cannot be empty'
-};
-
-/** @satisfies {Errors} */
-const special_elements = {
-	'invalid-svelte-option-attribute': () => `<svelte:options> can only receive static attributes`,
-	'invalid-svelte-option-namespace': () =>
-		`Unsupported <svelte:option> value for "namespace". Valid values are "html", "svg" or "foreign".`,
-	'tag-option-deprecated': () => `"tag" option is deprecated — use "customElement" instead`,
-	'invalid-svelte-option-runes': () =>
-		`Unsupported <svelte:option> value for "runes". Valid values are true or false.`,
-	'invalid-svelte-option-accessors': () =>
-		'Unsupported <svelte:option> value for "accessors". Valid values are true or false.',
-	'invalid-svelte-option-preserveWhitespace': () =>
-		'Unsupported <svelte:option> value for "preserveWhitespace". Valid values are true or false.',
-	'invalid-svelte-option-immutable': () =>
-		'Unsupported <svelte:option> value for "immutable". Valid values are true or false.',
-	'invalid-tag-property': () => 'tag name must be two or more words joined by the "-" character',
-	'invalid-svelte-option-customElement': () =>
-		'"customElement" must be a string literal defining a valid custom element name or an object of the form ' +
-		'{ tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }',
-	'invalid-customElement-props-attribute': () =>
-		'"props" must be a statically analyzable object literal of the form ' +
-		'"{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"',
-	'invalid-customElement-shadow-attribute': () => '"shadow" must be either "open" or "none"',
-	'unknown-svelte-option-attribute': /** @param {string} name */ (name) =>
-		`<svelte:options> unknown attribute '${name}'`,
-	'illegal-svelte-head-attribute': () => '<svelte:head> cannot have attributes nor directives',
-	'invalid-svelte-fragment-attribute': () =>
-		`<svelte:fragment> can only have a slot attribute and (optionally) a let: directive`,
-	'invalid-svelte-fragment-slot': () => `<svelte:fragment> slot attribute must have a static value`,
-	'invalid-svelte-fragment-placement': () =>
-		`<svelte:fragment> must be the direct child of a component`,
-	/** @param {string} name */
-	'invalid-svelte-element-placement': (name) =>
-		`<${name}> tags cannot be inside elements or blocks`,
-	/** @param {string} name */
-	'duplicate-svelte-element': (name) => `A component can only have one <${name}> element`,
-	'invalid-self-placement': () =>
-		`<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components`,
-	'missing-svelte-element-definition': () => `<svelte:element> must have a 'this' attribute`,
-	'missing-svelte-component-definition': () => `<svelte:component> must have a 'this' attribute`,
-	'invalid-svelte-element-definition': () => `Invalid element definition — must be an {expression}`,
-	'invalid-svelte-component-definition': () =>
-		`Invalid component definition — must be an {expression}`,
-	/**
-	 * @param {string[]} tags
-	 * @param {string | null} match
-	 */
-	'invalid-svelte-tag': (tags, match) =>
-		`Valid <svelte:...> tag names are ${list(tags)}${match ? ' (did you mean ' + match + '?)' : ''}`,
-	'conflicting-slot-usage': () =>
-		`Cannot use <slot> syntax and {@render ...} tags in the same component. Migrate towards {@render ...} tags completely.`
-};
-
-/** @satisfies {Errors} */
-const runes = {
-	'invalid-legacy-props': () => `Cannot use $$props in runes mode`,
-	'invalid-legacy-rest-props': () => `Cannot use $$restProps in runes mode`,
-	'invalid-legacy-reactive-statement': () =>
-		`$: is not allowed in runes mode, use $derived or $effect instead`,
-	'invalid-legacy-export': () => `Cannot use \`export let\` in runes mode — use $props instead`,
-	/** @param {string} rune */
-	'invalid-rune-usage': (rune) => `Cannot use ${rune} rune in non-runes mode`,
-	'invalid-state-export': () =>
-		`Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties`,
-	'invalid-derived-export': () =>
-		`Cannot export derived state from a module. To expose the current derived value, export a function returning its value`,
-	'invalid-props-id': () => `$props() can only be used with an object destructuring pattern`,
-	'invalid-props-pattern': () =>
-		`$props() assignment must not contain nested properties or computed keys`,
-	'invalid-props-location': () =>
-		`$props() can only be used at the top level of components as a variable declaration initializer`,
-	'invalid-bindable-location': () => `$bindable() can only be used inside a $props() declaration`,
-	/** @param {string} rune */
-	'invalid-state-location': (rune) =>
-		`${rune}(...) can only be used as a variable declaration initializer or a class field`,
-	'invalid-effect-location': () => `$effect() can only be used as an expression statement`,
-	'invalid-host-location': () =>
-		`$host() can only be used inside custom element component instances`,
-	/**
-	 * @param {boolean} is_binding
-	 * @param {boolean} show_details
-	 */
-	'invalid-const-assignment': (is_binding, show_details) =>
-		`Invalid ${is_binding ? 'binding' : 'assignment'} to const variable${
-			show_details
-				? ' ($derived values, let: directives, :then/:catch variables and @const declarations count as const)'
-				: ''
-		}`,
-	'invalid-derived-assignment': () => `Invalid assignment to derived state`,
-	'invalid-derived-binding': () => `Invalid binding to derived state`,
-	/**
-	 * @param {string} rune
-	 * @param {Array<number | string>} args
-	 */
-	'invalid-rune-args-length': (rune, args) =>
-		`${rune} can only be called with ${list(args, 'or')} ${
-			args.length === 1 && args[0] === 1 ? 'argument' : 'arguments'
-		}`,
-	/** @param {string} name */
-	'invalid-runes-mode-import': (name) => `${name} cannot be used in runes mode`,
-	'duplicate-props-rune': () => `Cannot use $props() more than once`,
-	'invalid-each-assignment': () =>
-		`Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. 'array[i] = value' instead of 'entry = value')`,
-	'invalid-snippet-assignment': () => `Cannot reassign or bind to snippet parameter`,
-	'invalid-derived-call': () => `$derived.call(...) has been replaced with $derived.by(...)`,
-	'conflicting-property-name': () =>
-		`Cannot have a property and a component export with the same name`
-};
-
-/** @satisfies {Errors} */
-const elements = {
-	'invalid-textarea-content': () =>
-		`A <textarea> can have either a value attribute or (equivalently) child content, but not both`,
-	'invalid-void-content': () => `Void elements cannot have children or closing tags`,
-	/** @param {string} name */
-	'invalid-element-content': (name) => `<${name}> cannot have children`,
-	'invalid-tag-name': () => 'Expected valid tag name',
-	/**
-	 * @param {string} node
-	 * @param {string} parent
-	 */
-	'invalid-node-placement': (node, parent) => `${node} is invalid inside <${parent}>`,
-	'illegal-title-attribute': () => '<title> cannot have attributes nor directives',
-	'invalid-title-content': () => '<title> can only contain text and {tags}'
-};
-
-/** @satisfies {Errors} */
-const components = {
-	'invalid-component-directive': () => `This type of directive is not valid on components`
-};
-
-/** @satisfies {Errors} */
-const attributes = {
-	'empty-attribute-shorthand': () => `Attribute shorthand cannot be empty`,
-	'duplicate-attribute': () => `Attributes need to be unique`,
-	'invalid-event-attribute-value': () =>
-		`Event attribute must be a JavaScript expression, not a string`,
-	/** @param {string} name */
-	'invalid-attribute-name': (name) => `'${name}' is not a valid attribute name`,
-	/** @param {'no-each' | 'each-key' | 'child'} type */
-	'invalid-animation': (type) =>
-		type === 'no-each'
-			? `An element that uses the animate directive must be the immediate child of a keyed each block`
-			: type === 'each-key'
-				? `An element that uses the animate directive must be used inside a keyed each block. Did you forget to add a key to your each block?`
-				: `An element that uses the animate directive must be the sole child of a keyed each block`,
-	'duplicate-animation': () => `An element can only have one 'animate' directive`,
-	/** @param {string[] | undefined} [modifiers] */
-	'invalid-event-modifier': (modifiers) =>
-		modifiers
-			? `Valid event modifiers are ${modifiers.slice(0, -1).join(', ')} or ${modifiers.slice(-1)}`
-			: `Event modifiers other than 'once' can only be used on DOM elements`,
-	/**
-	 * @param {string} modifier1
-	 * @param {string} modifier2
-	 */
-	'invalid-event-modifier-combination': (modifier1, modifier2) =>
-		`The '${modifier1}' and '${modifier2}' modifiers cannot be used together`,
-	/**
-	 * @param {string} directive1
-	 * @param {string} directive2
-	 */
-	'duplicate-transition': (directive1, directive2) => {
-		/** @param {string} _directive */
-		function describe(_directive) {
-			return _directive === 'transition' ? "a 'transition'" : `an '${_directive}'`;
-		}
-
-		return directive1 === directive2
-			? `An element can only have one '${directive1}' directive`
-			: `An element cannot have both ${describe(directive1)} directive and ${describe(
-					directive2
-				)} directive`;
-	},
-	'invalid-let-directive-placement': () => 'let directive at invalid position',
-	'invalid-style-directive-modifier': () =>
-		`Invalid 'style:' modifier. Valid modifiers are: 'important'`,
-	'invalid-sequence-expression': () =>
-		`Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses`
-};
-
-/** @satisfies {Errors} */
-const slots = {
-	'invalid-slot-element-attribute': () =>
-		`<slot> can only receive attributes and (optionally) let directives`,
-	'invalid-slot-attribute': () => `slot attribute must be a static value`,
-	/** @param {boolean} is_default */
-	'invalid-slot-name': (is_default) =>
-		is_default
-			? `default is a reserved word — it cannot be used as a slot name`
-			: `slot attribute must be a static value`,
-	'invalid-slot-placement': () =>
-		`Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`,
-	/** @param {string} name @param {string} component */
-	'duplicate-slot-name': (name, component) => `Duplicate slot name '${name}' in <${component}>`,
-	'invalid-default-slot-content': () =>
-		`Found default slot content alongside an explicit slot="default"`,
-	'conflicting-children-snippet': () =>
-		`Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block`
-};
-
-/** @satisfies {Errors} */
-const bindings = {
-	'invalid-binding-expression': () => `Can only bind to an Identifier or MemberExpression`,
-	'invalid-binding-value': () => `Can only bind to state or props`,
-	/**
-	 * @param {string} binding
-	 * @param {string} [elements]
-	 * @param {string} [post]
-	 */
-	'invalid-binding': (binding, elements, post = '') =>
-		(elements
-			? `'${binding}' binding can only be used with ${elements}`
-			: `'${binding}' is not a valid binding`) + post,
-	'invalid-type-attribute': () =>
-		`'type' attribute must be a static text value if input uses two-way binding`,
-	'invalid-multiple-attribute': () =>
-		`'multiple' attribute must be static if select uses two-way binding`,
-	'missing-contenteditable-attribute': () =>
-		`'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings`,
-	'dynamic-contenteditable-attribute': () =>
-		`'contenteditable' attribute cannot be dynamic if element uses two-way binding`
-};
-
-/** @satisfies {Errors} */
-const variables = {
-	'illegal-global': /** @param {string} name */ (name) =>
-		`${name} is an illegal variable name. To reference a global variable called ${name}, use globalThis.${name}`,
-	/** @param {string} name */
-	'duplicate-declaration': (name) => `'${name}' has already been declared`,
-	'default-export': () => `A component cannot have a default export`,
-	'illegal-variable-declaration': () =>
-		'Cannot declare same variable name which is imported inside <script context="module">',
-	'illegal-store-subscription': () =>
-		'Cannot subscribe to stores that are not declared at the top level of the component'
-};
-
-/** @satisfies {Errors} */
-const legacy_reactivity = {
-	'cyclical-reactive-declaration': /** @param {string[]} cycle */ (cycle) =>
-		`Cyclical dependency detected: ${cycle.join(' → ')}`
-};
-
-/** @satisfies {Errors} */
-const compiler_options = {
-	/** @param {string} msg */
-	'invalid-compiler-option': (msg) => `Invalid compiler option: ${msg}`,
-	/** @param {string} msg */
-	'removed-compiler-option': (msg) => `Invalid compiler option: ${msg}`
-};
-
-/** @satisfies {Errors} */
-const const_tag = {
-	'invalid-const-placement': () =>
-		`{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>`
-};
-
-/** @satisfies {Errors} */
-const errors = {
-	...internal,
-	...parse,
-	...css,
-	...special_elements,
-	...runes,
-	...elements,
-	...components,
-	...attributes,
-	...slots,
-	...bindings,
-	...variables,
-	...compiler_options,
-	...legacy_reactivity,
-	...const_tag
-
-	// missing_contenteditable_attribute: {
-	// 	code: 'missing-contenteditable-attribute',
-	// 	message:
-	// 		"'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings"
-	// },
-	// textarea_duplicate_value: {
-	// 	code: 'textarea-duplicate-value',
-	// 	message:
-	// 		'A <textarea> can have either a value attribute or (equivalently) child content, but not both'
-	// },
-	// invalid_attribute_head: {
-	// 	code: 'invalid-attribute',
-	// 	message: '<svelte:head> should not have any attributes or directives'
-	// },
-	// invalid_action: {
-	// 	code: 'invalid-action',
-	// 	message: 'Actions can only be applied to DOM elements, not components'
-	// },
-	// invalid_class: {
-	// 	code: 'invalid-class',
-	// 	message: 'Classes can only be applied to DOM elements, not components'
-	// },
-	// invalid_transition: {
-	// 	code: 'invalid-transition',
-	// 	message: 'Transitions can only be applied to DOM elements, not components'
-	// },
-	// invalid_let: {
-	// 	code: 'invalid-let',
-	// 	message: 'let directive value must be an identifier or an object/array pattern'
-	// },
-	// invalid_slot_directive: {
-	// 	code: 'invalid-slot-directive',
-	// 	message: '<slot> cannot have directives'
-	// },
-	// dynamic_slot_name: {
-	// 	code: 'dynamic-slot-name',
-	// 	message: '<slot> name cannot be dynamic'
-	// },
-	// invalid_slot_attribute_value_missing: {
-	// 	code: 'invalid-slot-attribute',
-	// 	message: 'slot attribute value is missing'
-	// },
-	// illegal_structure_title: {
-	// 	code: 'illegal-structure',
-	// 	message: '<title> can only contain text and {tags}'
-	// },
-	// duplicate_transition: /**
-	//  * @param {string} directive
-	//  * @param {string} parent_directive
-	//  */ (directive, parent_directive) => {
-	// 	/** @param {string} _directive */
-	// 	function describe(_directive) {
-	// 		return _directive === 'transition' ? "a 'transition'" : `an '${_directive}'`;
-	// 	}
-	// 	const message =
-	// 		directive === parent_directive
-	// 			? `An element can only have one '${directive}' directive`
-	// 			: `An element cannot have both ${describe(parent_directive)} directive and ${describe(
-	// 					directive
-	// 			  )} directive`;
-	// 	return {
-	// 		code: 'duplicate-transition',
-	// 		message
-	// 	};
-	// },
-	// default_export: {
-	// 	code: 'default-export',
-	// 	message: 'A component cannot have a default export'
-	// },
-	// illegal_declaration: {
-	// 	code: 'illegal-declaration',
-	// 	message: 'The $ prefix is reserved, and cannot be used for variable and import names'
-	// },
-	// invalid_directive_value: {
-	// 	code: 'invalid-directive-value',
-	// 	message:
-	// 		'Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)'
-	// },
-};
+/* This file is generated by scripts/process-messages.js. Do not edit! */
 
+/** @typedef {{ start?: number, end?: number }} NodeLike */
 // interface is duplicated between here (used internally) and ./interfaces.js
 // (exposed publicly), and I'm not sure how to avoid that
 export class CompileError extends Error {
 	name = 'CompileError';
-
 	/** @type {import('#compiler').CompileError['filename']} */
 	filename = undefined;
-
 	/** @type {import('#compiler').CompileError['position']} */
 	position = undefined;
-
 	/** @type {import('#compiler').CompileError['start']} */
 	start = undefined;
-
 	/** @type {import('#compiler').CompileError['end']} */
 	end = undefined;
 
@@ -525,24 +44,1358 @@ export class CompileError extends Error {
 }
 
 /**
- * @template {Exclude<keyof typeof errors, 'TODO'>} T
- * @param {NodeLike | number | null} node
- * @param {T} code
- * @param  {Parameters<typeof errors[T]>} args
+ *
+ * @param {null | number | NodeLike} node
+ * @param {string} code
+ * @param {string} message
  * @returns {never}
  */
-export function error(node, code, ...args) {
-	const fn = errors[code];
-
-	// @ts-expect-error
-	const message = fn(...args);
-
+function e(node, code, message) {
 	const start = typeof node === 'number' ? node : node?.start;
 	const end = typeof node === 'number' ? node : node?.end;
 
-	throw new CompileError(
-		code,
-		message,
-		start !== undefined && end !== undefined ? [start, end] : undefined
-	);
+	throw new CompileError(code, message, start !== undefined && end !== undefined ? [start, end] : undefined);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function empty_attribute_shorthand(node) {
+	e(node, "empty_attribute_shorthand", "Attribute shorthand cannot be empty");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function duplicate_attribute(node) {
+	e(node, "duplicate_attribute", "Attributes need to be unique");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_event_attribute_value(node) {
+	e(node, "invalid_event_attribute_value", "Event attribute must be a JavaScript expression, not a string");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function invalid_attribute_name(node, name) {
+	e(node, "invalid_attribute_name", `'${name}' is not a valid attribute name`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function animation_invalid_placement(node) {
+	e(node, "animation_invalid_placement", "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function animation_missing_key(node) {
+	e(node, "animation_missing_key", "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function animation_duplicate(node) {
+	e(node, "animation_duplicate", "An element can only have one 'animate' directive");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} list
+ * @returns {never}
+ */
+export function invalid_event_modifier(node, list) {
+	e(node, "invalid_event_modifier", `Valid event modifiers are ${list}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_component_event_modifier(node) {
+	e(node, "invalid_component_event_modifier", "Event modifiers other than 'once' can only be used on DOM elements");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} modifier1
+ * @param {string} modifier2
+ * @returns {never}
+ */
+export function invalid_event_modifier_combination(node, modifier1, modifier2) {
+	e(node, "invalid_event_modifier_combination", `The '${modifier1}' and '${modifier2}' modifiers cannot be used together`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} type
+ * @returns {never}
+ */
+export function transition_duplicate(node, type) {
+	e(node, "transition_duplicate", `Cannot use multiple \`${type}:\` directives on a single element`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} type
+ * @param {string} existing
+ * @returns {never}
+ */
+export function transition_conflict(node, type, existing) {
+	e(node, "transition_conflict", `Cannot use \`${type}:\` alongside existing \`${existing}:\` directive`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_let_directive_placement(node) {
+	e(node, "invalid_let_directive_placement", "`let:` directive at invalid position");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_style_directive_modifier(node) {
+	e(node, "invalid_style_directive_modifier", "Invalid 'style:' modifier. Valid modifiers are: 'important'");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_sequence_expression(node) {
+	e(node, "invalid_sequence_expression", "Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_binding_expression(node) {
+	e(node, "invalid_binding_expression", "Can only bind to an Identifier or MemberExpression");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_binding_value(node) {
+	e(node, "invalid_binding_value", "Can only bind to state or props");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} elements
+ * @returns {never}
+ */
+export function bind_invalid_target(node, name, elements) {
+	e(node, "bind_invalid_target", `\`bind:${name}\` can only be used with ${elements}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function bind_invalid(node, name) {
+	e(node, "bind_invalid", `\`bind:${name}\` is not a valid binding`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} explanation
+ * @returns {never}
+ */
+export function bind_invalid_detailed(node, name, explanation) {
+	e(node, "bind_invalid_detailed", `\`bind:${name}\` is not a valid binding. ${explanation}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_type_attribute(node) {
+	e(node, "invalid_type_attribute", "'type' attribute must be a static text value if input uses two-way binding");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_multiple_attribute(node) {
+	e(node, "invalid_multiple_attribute", "'multiple' attribute must be static if select uses two-way binding");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function missing_contenteditable_attribute(node) {
+	e(node, "missing_contenteditable_attribute", "'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function dynamic_contenteditable_attribute(node) {
+	e(node, "dynamic_contenteditable_attribute", "'contenteditable' attribute cannot be dynamic if element uses two-way binding");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} msg
+ * @returns {never}
+ */
+export function invalid_compiler_option(node, msg) {
+	e(node, "invalid_compiler_option", `Invalid compiler option: ${msg}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} msg
+ * @returns {never}
+ */
+export function removed_compiler_option(node, msg) {
+	e(node, "removed_compiler_option", `Invalid compiler option: ${msg}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_component_directive(node) {
+	e(node, "invalid_component_directive", "This type of directive is not valid on components");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_const_placement(node) {
+	e(node, "invalid_const_placement", "{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_empty_declaration(node) {
+	e(node, "invalid_css_empty_declaration", "Declaration cannot be empty");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_global_block_list(node) {
+	e(node, "invalid_css_global_block_list", "A :global {...} block cannot be part of a selector list with more than one item");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_global_block_modifier(node) {
+	e(node, "invalid_css_global_block_modifier", "A :global {...} block cannot modify an existing selector");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function invalid_css_global_block_combinator(node, name) {
+	e(node, "invalid_css_global_block_combinator", `A :global {...} block cannot follow a ${name} combinator`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_global_block_declaration(node) {
+	e(node, "invalid_css_global_block_declaration", "A :global {...} block can only contain rules, not declarations");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_global_placement(node) {
+	e(node, "invalid_css_global_placement", ":global(...) can be at the start or end of a selector sequence, but not in the middle");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_global_selector(node) {
+	e(node, "invalid_css_global_selector", ":global(...) must contain exactly one selector");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_global_selector_list(node) {
+	e(node, "invalid_css_global_selector_list", ":global(...) must not contain type or universal selectors when used in a compound selector");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_type_selector_placement(node) {
+	e(node, "invalid_css_type_selector_placement", ":global(...) must not be followed with a type selector");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_selector(node) {
+	e(node, "invalid_css_selector", "Invalid selector");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_identifier(node) {
+	e(node, "invalid_css_identifier", "Expected a valid CSS identifier");
 }
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_nesting_selector(node) {
+	e(node, "invalid_nesting_selector", "Nesting selectors can only be used inside a rule");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_css_declaration(node) {
+	e(node, "invalid_css_declaration", "Declaration cannot be empty");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_textarea_content(node) {
+	e(node, "invalid_textarea_content", "A `<textarea>` can have either a value attribute or (equivalently) child content, but not both");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_void_content(node) {
+	e(node, "invalid_void_content", "Void elements cannot have children or closing tags");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function invalid_element_content(node, name) {
+	e(node, "invalid_element_content", `<${name}> cannot have children`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_tag_name(node) {
+	e(node, "invalid_tag_name", "Expected valid tag name");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} thing
+ * @param {string} parent
+ * @returns {never}
+ */
+export function invalid_node_placement(node, thing, parent) {
+	e(node, "invalid_node_placement", `${thing} is invalid inside <${parent}>`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function illegal_title_attribute(node) {
+	e(node, "illegal_title_attribute", "`<title>` cannot have attributes nor directives");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_title_content(node) {
+	e(node, "invalid_title_content", "`<title>` can only contain text and {tags}");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} cycle
+ * @returns {never}
+ */
+export function cyclical_reactive_declaration(node, cycle) {
+	e(node, "cyclical_reactive_declaration", `Cyclical dependency detected: ${cycle}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function unclosed_element(node, name) {
+	e(node, "unclosed_element", `\`<${name}>\` was left open`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function unclosed_block(node) {
+	e(node, "unclosed_block", "Block was left open");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function unexpected_block_close(node) {
+	e(node, "unexpected_block_close", "Unexpected block closing tag");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function unexpected_eof(node) {
+	e(node, "unexpected_eof", "Unexpected end of input");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} message
+ * @returns {never}
+ */
+export function js_parse_error(node, message) {
+	e(node, "js_parse_error", `${message}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} token
+ * @returns {never}
+ */
+export function expected_token(node, token) {
+	e(node, "expected_token", `Expected token ${token}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} word
+ * @returns {never}
+ */
+export function unexpected_reserved_word(node, word) {
+	e(node, "unexpected_reserved_word", `'${word}' is a reserved word in JavaScript and cannot be used here`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function missing_whitespace(node) {
+	e(node, "missing_whitespace", "Expected whitespace");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function expected_pattern(node) {
+	e(node, "expected_pattern", "Expected identifier or destructure pattern");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_script_context(node) {
+	e(node, "invalid_script_context", "If the context attribute is supplied, its value must be \"module\"");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_elseif(node) {
+	e(node, "invalid_elseif", "'elseif' should be 'else if'");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_continuing_block_placement(node) {
+	e(node, "invalid_continuing_block_placement", "{:...} block is invalid at this position (did you forget to close the preceeding element or block?)");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} child
+ * @param {string} parent
+ * @returns {never}
+ */
+export function invalid_block_missing_parent(node, child, parent) {
+	e(node, "invalid_block_missing_parent", `${child} block must be a child of ${parent}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function duplicate_block_part(node, name) {
+	e(node, "duplicate_block_part", `${name} cannot appear more than once within a block`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function expected_block_type(node) {
+	e(node, "expected_block_type", "Expected 'if', 'each', 'await', 'key' or 'snippet'");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function expected_identifier(node) {
+	e(node, "expected_identifier", "Expected an identifier");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_debug(node) {
+	e(node, "invalid_debug", "{@debug ...} arguments must be identifiers, not arbitrary expressions");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_const(node) {
+	e(node, "invalid_const", "{@const ...} must be an assignment");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} location
+ * @returns {never}
+ */
+export function invalid_block_placement(node, name, location) {
+	e(node, "invalid_block_placement", `{#${name} ...} block cannot be ${location}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} location
+ * @returns {never}
+ */
+export function invalid_tag_placement(node, name, location) {
+	e(node, "invalid_tag_placement", `{@${name} ...} tag cannot be ${location}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function missing_attribute_value(node) {
+	e(node, "missing_attribute_value", "Expected attribute value");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} delimiter
+ * @returns {never}
+ */
+export function unclosed_attribute_value(node, delimiter) {
+	e(node, "unclosed_attribute_value", `Expected closing ${delimiter} character`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_directive_value(node) {
+	e(node, "invalid_directive_value", "Directive value must be a JavaScript expression enclosed in curly braces");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} type
+ * @returns {never}
+ */
+export function empty_directive_name(node, type) {
+	e(node, "empty_directive_name", `${type} name cannot be empty`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function invalid_closing_tag(node, name) {
+	e(node, "invalid_closing_tag", `</${name}> attempted to close an element that was not open`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} reason
+ * @returns {never}
+ */
+export function invalid_closing_tag_after_autoclose(node, name, reason) {
+	e(node, "invalid_closing_tag_after_autoclose", `</${name}> attempted to close element that was already automatically closed by <${reason}> (cannot nest <${reason}> inside <${name}>)`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_dollar_binding(node) {
+	e(node, "invalid_dollar_binding", "The $ name is reserved, and cannot be used for variables and imports");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_dollar_prefix(node) {
+	e(node, "invalid_dollar_prefix", "The $ prefix is reserved, and cannot be used for variables and imports");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_dollar_global(node) {
+	e(node, "invalid_dollar_global", "The $ name is reserved. To reference a global variable called $, use globalThis.$");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function illegal_subscription(node) {
+	e(node, "illegal_subscription", "Cannot reference store value inside `<script context=\"module\">`");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function duplicate_style_element(node) {
+	e(node, "duplicate_style_element", "A component can have a single top-level `<style>` element");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function duplicate_script_element(node) {
+	e(node, "duplicate_script_element", "A component can have a single top-level `<script>` element and/or a single top-level `<script context=\"module\">` element");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_render_expression(node) {
+	e(node, "invalid_render_expression", "{@render ...} tags can only contain call expressions");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_render_arguments(node) {
+	e(node, "invalid_render_arguments", "expected at most one argument");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_render_call(node) {
+	e(node, "invalid_render_call", "Calling a snippet function using apply, bind or call is not allowed");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_render_spread_argument(node) {
+	e(node, "invalid_render_spread_argument", "cannot use spread arguments in {@render ...} tags");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_snippet_rest_parameter(node) {
+	e(node, "invalid_snippet_rest_parameter", "snippets do not support rest parameters; use an array instead");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_legacy_props(node) {
+	e(node, "invalid_legacy_props", "Cannot use `$$props` in runes mode");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_legacy_rest_props(node) {
+	e(node, "invalid_legacy_rest_props", "Cannot use `$$restProps` in runes mode");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_legacy_reactive_statement(node) {
+	e(node, "invalid_legacy_reactive_statement", "`$:` is not allowed in runes mode, use `$derived` or `$effect` instead");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_legacy_export(node) {
+	e(node, "invalid_legacy_export", "Cannot use `export let` in runes mode — use $props instead");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} rune
+ * @returns {never}
+ */
+export function invalid_rune_usage(node, rune) {
+	e(node, "invalid_rune_usage", `Cannot use ${rune} rune in non-runes mode`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_state_export(node) {
+	e(node, "invalid_state_export", "Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_derived_export(node) {
+	e(node, "invalid_derived_export", "Cannot export derived state from a module. To expose the current derived value, export a function returning its value");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_props_id(node) {
+	e(node, "invalid_props_id", "`$props()` can only be used with an object destructuring pattern");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_props_pattern(node) {
+	e(node, "invalid_props_pattern", "`$props()` assignment must not contain nested properties or computed keys");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_props_location(node) {
+	e(node, "invalid_props_location", "`$props()` can only be used at the top level of components as a variable declaration initializer");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_bindable_location(node) {
+	e(node, "invalid_bindable_location", "`$bindable()` can only be used inside a `$props()` declaration");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} rune
+ * @returns {never}
+ */
+export function invalid_state_location(node, rune) {
+	e(node, "invalid_state_location", `\`${rune}(...)\` can only be used as a variable declaration initializer or a class field`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_effect_location(node) {
+	e(node, "invalid_effect_location", "`$effect()` can only be used as an expression statement");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_host_location(node) {
+	e(node, "invalid_host_location", "`$host()` can only be used inside custom element component instances");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} thing
+ * @returns {never}
+ */
+export function invalid_assignment(node, thing) {
+	e(node, "invalid_assignment", `Cannot assign to ${thing}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} thing
+ * @returns {never}
+ */
+export function invalid_binding(node, thing) {
+	e(node, "invalid_binding", `Cannot bind to ${thing}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} rune
+ * @returns {never}
+ */
+export function invalid_rune_args(node, rune) {
+	e(node, "invalid_rune_args", `\`${rune}\` cannot be called with arguments`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} rune
+ * @param {string} args
+ * @returns {never}
+ */
+export function invalid_rune_args_length(node, rune, args) {
+	e(node, "invalid_rune_args_length", `\`${rune}\` must be called with ${args}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function invalid_runes_mode_import(node, name) {
+	e(node, "invalid_runes_mode_import", `${name} cannot be used in runes mode`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function duplicate_props_rune(node) {
+	e(node, "duplicate_props_rune", "Cannot use `$props()` more than once");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_each_assignment(node) {
+	e(node, "invalid_each_assignment", "Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_snippet_assignment(node) {
+	e(node, "invalid_snippet_assignment", "Cannot reassign or bind to snippet parameter");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_derived_call(node) {
+	e(node, "invalid_derived_call", "`$derived.call(...)` has been replaced with `$derived.by(...)`");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function conflicting_property_name(node) {
+	e(node, "conflicting_property_name", "Cannot have a property and a component export with the same name");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_slot_element_attribute(node) {
+	e(node, "invalid_slot_element_attribute", "`<slot>` can only receive attributes and (optionally) let directives");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_slot_attribute(node) {
+	e(node, "invalid_slot_attribute", "slot attribute must be a static value");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_slot_name_default(node) {
+	e(node, "invalid_slot_name_default", "`default` is a reserved word — it cannot be used as a slot name");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_slot_name(node) {
+	e(node, "invalid_slot_name", "slot attribute must be a static value");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_slot_placement(node) {
+	e(node, "invalid_slot_placement", "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} component
+ * @returns {never}
+ */
+export function duplicate_slot_name(node, name, component) {
+	e(node, "duplicate_slot_name", `Duplicate slot name '${name}' in <${component}>`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_default_slot_content(node) {
+	e(node, "invalid_default_slot_content", "Found default slot content alongside an explicit slot=\"default\"");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function conflicting_children_snippet(node) {
+	e(node, "conflicting_children_snippet", "Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_option_attribute(node) {
+	e(node, "invalid_svelte_option_attribute", "`<svelte:options>` can only receive static attributes");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_option_namespace(node) {
+	e(node, "invalid_svelte_option_namespace", "Unsupported `<svelte:option>` value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\"");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function tag_option_deprecated(node) {
+	e(node, "tag_option_deprecated", "\"tag\" option is deprecated — use \"customElement\" instead");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_option_runes(node) {
+	e(node, "invalid_svelte_option_runes", "Unsupported `<svelte:option>` value for \"runes\". Valid values are true or false");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_option_accessors(node) {
+	e(node, "invalid_svelte_option_accessors", "Unsupported `<svelte:option>` value for \"accessors\". Valid values are true or false");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_option_preserveWhitespace(node) {
+	e(node, "invalid_svelte_option_preserveWhitespace", "Unsupported `<svelte:option>` value for \"preserveWhitespace\". Valid values are true or false");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_option_immutable(node) {
+	e(node, "invalid_svelte_option_immutable", "Unsupported `<svelte:option>` value for \"immutable\". Valid values are true or false");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_tag_property(node) {
+	e(node, "invalid_tag_property", "Tag name must be two or more words joined by the \"-\" character");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_option_customElement(node) {
+	e(node, "invalid_svelte_option_customElement", "\"customElement\" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: \"open\" | \"none\"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_customElement_props_attribute(node) {
+	e(node, "invalid_customElement_props_attribute", "\"props\" must be a statically analyzable object literal of the form \"{ [key: string]: { attribute?: string; reflect?: boolean; type?: \"String\" | \"Boolean\" | \"Number\" | \"Array\" | \"Object\" }\"");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_customElement_shadow_attribute(node) {
+	e(node, "invalid_customElement_shadow_attribute", "\"shadow\" must be either \"open\" or \"none\"");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function unknown_svelte_option_attribute(node, name) {
+	e(node, "unknown_svelte_option_attribute", `\`<svelte:options>\` unknown attribute '${name}'`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function illegal_svelte_head_attribute(node) {
+	e(node, "illegal_svelte_head_attribute", "`<svelte:head>` cannot have attributes nor directives");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_fragment_attribute(node) {
+	e(node, "invalid_svelte_fragment_attribute", "`<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_fragment_slot(node) {
+	e(node, "invalid_svelte_fragment_slot", "`<svelte:fragment>` slot attribute must have a static value");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_fragment_placement(node) {
+	e(node, "invalid_svelte_fragment_placement", "`<svelte:fragment>` must be the direct child of a component");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function invalid_svelte_element_placement(node, name) {
+	e(node, "invalid_svelte_element_placement", `<${name}> tags cannot be inside elements or blocks`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function duplicate_svelte_element(node, name) {
+	e(node, "duplicate_svelte_element", `A component can only have one <${name}> element`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_self_placement(node) {
+	e(node, "invalid_self_placement", "`<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function missing_svelte_element_definition(node) {
+	e(node, "missing_svelte_element_definition", "`<svelte:element>` must have a 'this' attribute");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function missing_svelte_component_definition(node) {
+	e(node, "missing_svelte_component_definition", "`<svelte:component>` must have a 'this' attribute");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_element_definition(node) {
+	e(node, "invalid_svelte_element_definition", "Invalid element definition — must be an {expression}");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function invalid_svelte_component_definition(node) {
+	e(node, "invalid_svelte_component_definition", "Invalid component definition — must be an {expression}");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} list
+ * @returns {never}
+ */
+export function invalid_svelte_tag(node, list) {
+	e(node, "invalid_svelte_tag", `Valid \`<svelte:...>\` tag names are ${list}`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function conflicting_slot_usage(node) {
+	e(node, "conflicting_slot_usage", "Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function illegal_global(node, name) {
+	e(node, "illegal_global", `\`${name}\` is an illegal variable name. To reference a global variable called \`${name}\`, use \`globalThis.${name}\``);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function duplicate_declaration(node, name) {
+	e(node, "duplicate_declaration", `\`${name}\` has already been declared`);
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function default_export(node) {
+	e(node, "default_export", "A component cannot have a default export");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function illegal_variable_declaration(node) {
+	e(node, "illegal_variable_declaration", "Cannot declare same variable name which is imported inside `<script context=\"module\">`");
+}
+
+/**
+ * @param {null | number | NodeLike} node
+
+ * @returns {never}
+ */
+export function illegal_store_subscription(node) {
+	e(node, "illegal_store_subscription", "Cannot subscribe to stores that are not declared at the top level of the component");
+}
\ No newline at end of file
diff --git a/packages/svelte/src/compiler/phases/1-parse/index.js b/packages/svelte/src/compiler/phases/1-parse/index.js
index 5c77d36ea6..d5f5cda052 100644
--- a/packages/svelte/src/compiler/phases/1-parse/index.js
+++ b/packages/svelte/src/compiler/phases/1-parse/index.js
@@ -4,7 +4,7 @@ import fragment from './state/fragment.js';
 import { regex_whitespace } from '../patterns.js';
 import { reserved } from './utils/names.js';
 import full_char_code_at from './utils/full_char_code_at.js';
-import { error } from '../../errors.js';
+import * as e from '../../errors.js';
 import { create_fragment } from './utils/create.js';
 import read_options from './read/options.js';
 import { getLocator } from 'locate-character';
@@ -92,15 +92,15 @@ export class Parser {
 
 			if (current.type === 'RegularElement') {
 				current.end = current.start + 1;
-				error(current, 'unclosed-element', current.name);
+				e.unclosed_element(current, current.name);
 			} else {
 				current.end = current.start + 1;
-				error(current, 'unclosed-block');
+				e.unclosed_block(current);
 			}
 		}
 
 		if (state !== fragment) {
-			error(this.index, 'unexpected-eof');
+			e.unexpected_eof(this.index);
 		}
 
 		if (this.root.fragment.nodes.length) {
@@ -158,7 +158,7 @@ export class Parser {
 	 * @returns {never}
 	 */
 	acorn_error(err) {
-		error(err.pos, 'js-parse-error', err.message.replace(regex_position_indicator, ''));
+		e.js_parse_error(err.pos, err.message.replace(regex_position_indicator, ''));
 	}
 
 	/**
@@ -172,11 +172,7 @@ export class Parser {
 		}
 
 		if (required) {
-			if (this.index === this.template.length) {
-				error(this.index, 'unexpected-eof', str);
-			} else {
-				error(this.index, 'expected-token', str);
-			}
+			e.expected_token(this.index, str);
 		}
 
 		return false;
@@ -241,7 +237,7 @@ export class Parser {
 		const identifier = this.template.slice(this.index, (this.index = i));
 
 		if (!allow_reserved && reserved.includes(identifier)) {
-			error(start, 'unexpected-reserved-word', identifier);
+			e.unexpected_reserved_word(start, identifier);
 		}
 
 		return identifier;
@@ -250,7 +246,7 @@ export class Parser {
 	/** @param {RegExp} pattern */
 	read_until(pattern) {
 		if (this.index >= this.template.length) {
-			error(this.template.length, 'unexpected-eof');
+			e.unexpected_eof(this.template.length);
 		}
 
 		const start = this.index;
@@ -267,7 +263,7 @@ export class Parser {
 
 	require_whitespace() {
 		if (!regex_whitespace.test(this.template[this.index])) {
-			error(this.index, 'missing-whitespace');
+			e.missing_whitespace(this.index);
 		}
 
 		this.allow_whitespace();
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/context.js b/packages/svelte/src/compiler/phases/1-parse/read/context.js
index b69c16d320..10cdaa44b7 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/context.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/context.js
@@ -9,7 +9,7 @@ import {
 } from '../utils/bracket.js';
 import { parse_expression_at } from '../acorn.js';
 import { regex_not_newline_characters } from '../../patterns.js';
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 
 /**
  * @param {import('../index.js').Parser} parser
@@ -36,7 +36,7 @@ export default function read_pattern(parser, optional_allowed = false) {
 	}
 
 	if (!is_bracket_open(code)) {
-		error(i, 'expected-pattern');
+		e.expected_pattern(i);
 	}
 
 	const bracket_stack = [code];
@@ -49,11 +49,7 @@ export default function read_pattern(parser, optional_allowed = false) {
 		} else if (is_bracket_close(code)) {
 			const popped = /** @type {number} */ (bracket_stack.pop());
 			if (!is_bracket_pair(popped, code)) {
-				error(
-					i,
-					'expected-token',
-					String.fromCharCode(/** @type {number} */ (get_bracket_close(popped)))
-				);
+				e.expected_token(i, String.fromCharCode(/** @type {number} */ (get_bracket_close(popped))));
 			}
 			if (bracket_stack.length === 0) {
 				i += code <= 0xffff ? 1 : 2;
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/expression.js b/packages/svelte/src/compiler/phases/1-parse/read/expression.js
index 21d4bb96fe..506fc354fb 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/expression.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/expression.js
@@ -1,6 +1,6 @@
 import { parse_expression_at } from '../acorn.js';
 import { regex_whitespace } from '../../patterns.js';
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 
 /**
  * @param {import('../index.js').Parser} parser
@@ -23,7 +23,7 @@ export default function read_expression(parser) {
 			if (char === ')') {
 				num_parens -= 1;
 			} else if (!regex_whitespace.test(char)) {
-				error(index, 'expected-token', ')');
+				e.expected_token(index, ')');
 			}
 
 			index += 1;
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/options.js b/packages/svelte/src/compiler/phases/1-parse/read/options.js
index c9262c54a8..18264ae9bc 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/options.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/options.js
@@ -1,5 +1,5 @@
 import { namespace_svg } from '../../../../constants.js';
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 
 const regex_valid_tag_name = /^[a-zA-Z][a-zA-Z0-9]*-[a-zA-Z0-9-]+$/;
 
@@ -22,24 +22,18 @@ export default function read_options(node) {
 
 	for (const attribute of node.attributes) {
 		if (attribute.type !== 'Attribute') {
-			error(attribute, 'invalid-svelte-option-attribute');
+			e.invalid_svelte_option_attribute(attribute);
 		}
 
 		const { name } = attribute;
 
 		switch (name) {
 			case 'runes': {
-				const value = get_static_value(attribute, () =>
-					error(attribute, 'invalid-svelte-option-runes')
-				);
-				if (typeof value !== 'boolean') {
-					error(attribute, 'invalid-svelte-option-runes');
-				}
-				component_options.runes = value;
+				component_options.runes = get_boolean_value(attribute, e.invalid_svelte_option_runes);
 				break;
 			}
 			case 'tag': {
-				error(attribute, 'tag-option-deprecated');
+				e.tag_option_deprecated(attribute);
 				break; // eslint doesn't know this is unnecessary
 			}
 			case 'customElement': {
@@ -48,9 +42,9 @@ export default function read_options(node) {
 
 				const { value } = attribute;
 				if (value === true) {
-					error(attribute, 'invalid-svelte-option-customElement');
+					e.invalid_svelte_option_customElement(attribute);
 				} else if (value[0].type === 'Text') {
-					const tag = get_static_value(attribute, () => error(attribute, 'invalid-tag-property'));
+					const tag = get_static_value(attribute, () => e.invalid_tag_property(attribute));
 					validate_tag(attribute, tag);
 					ce.tag = tag;
 					component_options.customElement = ce;
@@ -61,7 +55,7 @@ export default function read_options(node) {
 					if (value[0].expression.type === 'Literal' && value[0].expression.value === null) {
 						break;
 					}
-					error(attribute, 'invalid-svelte-option-customElement');
+					e.invalid_svelte_option_customElement(attribute);
 				}
 
 				/** @type {Array<[string, any]>} */
@@ -72,7 +66,7 @@ export default function read_options(node) {
 						property.computed ||
 						property.key.type !== 'Identifier'
 					) {
-						error(attribute, 'invalid-svelte-option-customElement');
+						e.invalid_svelte_option_customElement(attribute);
 					}
 					properties.push([property.key.name, property.value]);
 				}
@@ -83,13 +77,13 @@ export default function read_options(node) {
 					validate_tag(tag, tag_value);
 					ce.tag = tag_value;
 				} else {
-					error(attribute, 'invalid-svelte-option-customElement');
+					e.invalid_svelte_option_customElement(attribute);
 				}
 
 				const props = properties.find(([name]) => name === 'props')?.[1];
 				if (props) {
 					if (props.type !== 'ObjectExpression') {
-						error(attribute, 'invalid-customElement-props-attribute');
+						e.invalid_customElement_props_attribute(attribute);
 					}
 					ce.props = {};
 					for (const property of /** @type {import('estree').ObjectExpression} */ (props)
@@ -100,7 +94,7 @@ export default function read_options(node) {
 							property.key.type !== 'Identifier' ||
 							property.value.type !== 'ObjectExpression'
 						) {
-							error(attribute, 'invalid-customElement-props-attribute');
+							e.invalid_customElement_props_attribute(attribute);
 						}
 						ce.props[property.key.name] = {};
 						for (const prop of property.value.properties) {
@@ -110,7 +104,7 @@ export default function read_options(node) {
 								prop.key.type !== 'Identifier' ||
 								prop.value.type !== 'Literal'
 							) {
-								error(attribute, 'invalid-customElement-props-attribute');
+								e.invalid_customElement_props_attribute(attribute);
 							}
 
 							if (prop.key.name === 'type') {
@@ -119,21 +113,21 @@ export default function read_options(node) {
 										/** @type {string} */ (prop.value.value)
 									) === -1
 								) {
-									error(attribute, 'invalid-customElement-props-attribute');
+									e.invalid_customElement_props_attribute(attribute);
 								}
 								ce.props[property.key.name].type = /** @type {any} */ (prop.value.value);
 							} else if (prop.key.name === 'reflect') {
 								if (typeof prop.value.value !== 'boolean') {
-									error(attribute, 'invalid-customElement-props-attribute');
+									e.invalid_customElement_props_attribute(attribute);
 								}
 								ce.props[property.key.name].reflect = prop.value.value;
 							} else if (prop.key.name === 'attribute') {
 								if (typeof prop.value.value !== 'string') {
-									error(attribute, 'invalid-customElement-props-attribute');
+									e.invalid_customElement_props_attribute(attribute);
 								}
 								ce.props[property.key.name].attribute = prop.value.value;
 							} else {
-								error(attribute, 'invalid-customElement-props-attribute');
+								e.invalid_customElement_props_attribute(attribute);
 							}
 						}
 					}
@@ -143,7 +137,7 @@ export default function read_options(node) {
 				if (shadow) {
 					const shadowdom = shadow?.value;
 					if (shadowdom !== 'open' && shadowdom !== 'none') {
-						error(shadow, 'invalid-customElement-shadow-attribute');
+						e.invalid_customElement_shadow_attribute(shadow);
 					}
 					ce.shadow = shadowdom;
 				}
@@ -158,10 +152,10 @@ export default function read_options(node) {
 			}
 			case 'namespace': {
 				const value = get_static_value(attribute, () =>
-					error(attribute, 'invalid-svelte-option-namespace')
+					e.invalid_svelte_option_namespace(attribute)
 				);
 				if (typeof value !== 'string') {
-					error(attribute, 'invalid-svelte-option-namespace');
+					e.invalid_svelte_option_namespace(attribute);
 				}
 
 				if (value === namespace_svg) {
@@ -169,43 +163,34 @@ export default function read_options(node) {
 				} else if (value === 'html' || value === 'svg' || value === 'foreign') {
 					component_options.namespace = value;
 				} else {
-					error(attribute, 'invalid-svelte-option-namespace');
+					e.invalid_svelte_option_namespace(attribute);
 				}
 
 				break;
 			}
 			case 'immutable': {
-				const value = get_static_value(attribute, () =>
-					error(attribute, 'invalid-svelte-option-immutable')
+				component_options.immutable = get_boolean_value(
+					attribute,
+					e.invalid_svelte_option_immutable
 				);
-				if (typeof value !== 'boolean') {
-					error(attribute, 'invalid-svelte-option-immutable');
-				}
-				component_options.immutable = value;
 				break;
 			}
 			case 'preserveWhitespace': {
-				const value = get_static_value(attribute, () =>
-					error(attribute, 'invalid-svelte-option-preserveWhitespace')
+				component_options.preserveWhitespace = get_boolean_value(
+					attribute,
+					e.invalid_svelte_option_preserveWhitespace
 				);
-				if (typeof value !== 'boolean') {
-					error(attribute, 'invalid-svelte-option-preserveWhitespace');
-				}
-				component_options.preserveWhitespace = value;
 				break;
 			}
 			case 'accessors': {
-				const value = get_static_value(attribute, () =>
-					error(attribute, 'invalid-svelte-option-accessors')
+				component_options.accessors = get_boolean_value(
+					attribute,
+					e.invalid_svelte_option_accessors
 				);
-				if (typeof value !== 'boolean') {
-					error(attribute, 'invalid-svelte-option-accessors');
-				}
-				component_options.accessors = value;
 				break;
 			}
 			default:
-				error(attribute, 'unknown-svelte-option-attribute', name);
+				e.unknown_svelte_option_attribute(attribute, name);
 		}
 	}
 
@@ -230,6 +215,18 @@ function get_static_value(attribute, error) {
 	return chunk.expression.value;
 }
 
+/**
+ * @param {any} attribute
+ * @param {(attribute: any) => never} error
+ */
+function get_boolean_value(attribute, error) {
+	const value = get_static_value(attribute, () => error(attribute));
+	if (typeof value !== 'boolean') {
+		error(attribute);
+	}
+	return value;
+}
+
 /**
  * @param {any} attribute
  * @param {string} tag
@@ -237,10 +234,10 @@ function get_static_value(attribute, error) {
  */
 function validate_tag(attribute, tag) {
 	if (typeof tag !== 'string' && tag !== null) {
-		error(attribute, 'invalid-tag-property');
+		e.invalid_tag_property(attribute);
 	}
 	if (tag && !regex_valid_tag_name.test(tag)) {
-		error(attribute, 'invalid-tag-property');
+		e.invalid_tag_property(attribute);
 	}
 	// TODO do we still need this?
 	// if (tag && !component.compile_options.customElement) {
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/script.js b/packages/svelte/src/compiler/phases/1-parse/read/script.js
index cd9129e8b5..172e1dddf1 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/script.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/script.js
@@ -1,6 +1,6 @@
 import * as acorn from '../acorn.js';
 import { regex_not_newline_characters } from '../../patterns.js';
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 
 const regex_closing_script_tag = /<\/script\s*>/;
 const regex_starts_with_closing_script_tag = /^<\/script\s*>/;
@@ -16,13 +16,13 @@ function get_context(attributes) {
 	if (!context) return 'default';
 
 	if (context.value.length !== 1 || context.value[0].type !== 'Text') {
-		error(context.start, 'invalid-script-context');
+		e.invalid_script_context(context.start);
 	}
 
 	const value = context.value[0].data;
 
 	if (value !== 'module') {
-		error(context.start, 'invalid-script-context');
+		e.invalid_script_context(context.start);
 	}
 
 	return value;
@@ -38,7 +38,7 @@ export function read_script(parser, start, attributes) {
 	const script_start = parser.index;
 	const data = parser.read_until(regex_closing_script_tag);
 	if (parser.index >= parser.template.length) {
-		error(parser.template.length, 'unclosed-element', 'script');
+		e.unclosed_element(parser.template.length, 'script');
 	}
 
 	const source =
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/style.js b/packages/svelte/src/compiler/phases/1-parse/read/style.js
index 8ec00daff1..de5a457889 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/style.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/style.js
@@ -1,4 +1,4 @@
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 
 const REGEX_MATCHER = /^[~^$*|]?=/;
 const REGEX_CLOSING_BRACKET = /[\s\]]/;
@@ -64,7 +64,7 @@ function read_body(parser, close) {
 		}
 	}
 
-	error(parser.template.length, 'expected-token', close);
+	e.expected_token(parser.template.length, close);
 }
 
 /**
@@ -154,7 +154,7 @@ function read_selector_list(parser, inside_pseudo_class = false) {
 		}
 	}
 
-	error(parser.template.length, 'unexpected-eof');
+	e.unexpected_eof(parser.template.length);
 }
 
 /**
@@ -352,7 +352,7 @@ function read_selector(parser, inside_pseudo_class = false) {
 		if (combinator) {
 			if (relative_selector.selectors.length === 0) {
 				if (!inside_pseudo_class) {
-					error(start, 'invalid-css-selector');
+					e.invalid_css_selector(start);
 				}
 			} else {
 				relative_selector.end = index;
@@ -365,12 +365,12 @@ function read_selector(parser, inside_pseudo_class = false) {
 			parser.allow_whitespace();
 
 			if (parser.match(',') || (inside_pseudo_class ? parser.match(')') : parser.match('{'))) {
-				error(parser.index, 'invalid-css-selector');
+				e.invalid_css_selector(parser.index);
 			}
 		}
 	}
 
-	error(parser.template.length, 'unexpected-eof');
+	e.unexpected_eof(parser.template.length);
 }
 
 /**
@@ -476,7 +476,7 @@ function read_declaration(parser) {
 	const value = read_value(parser);
 
 	if (!value && !property.startsWith('--')) {
-		error(parser.index, 'invalid-css-declaration');
+		e.invalid_css_declaration(parser.index);
 	}
 
 	const end = parser.index;
@@ -531,7 +531,7 @@ function read_value(parser) {
 		parser.index++;
 	}
 
-	error(parser.template.length, 'unexpected-eof');
+	e.unexpected_eof(parser.template.length);
 }
 
 /**
@@ -564,7 +564,7 @@ function read_attribute_value(parser) {
 		parser.index++;
 	}
 
-	error(parser.template.length, 'unexpected-eof');
+	e.unexpected_eof(parser.template.length);
 }
 
 /**
@@ -577,7 +577,7 @@ function read_identifier(parser) {
 	let identifier = '';
 
 	if (parser.match('--') || parser.match_regex(REGEX_LEADING_HYPHEN_OR_DIGIT)) {
-		error(start, 'invalid-css-identifier');
+		e.invalid_css_identifier(start);
 	}
 
 	let escaped = false;
@@ -602,7 +602,7 @@ function read_identifier(parser) {
 	}
 
 	if (identifier === '') {
-		error(start, 'invalid-css-identifier');
+		e.invalid_css_identifier(start);
 	}
 
 	return identifier;
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/element.js b/packages/svelte/src/compiler/phases/1-parse/state/element.js
index bfaee9572d..134f322967 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -5,7 +5,7 @@ import read_expression from '../read/expression.js';
 import { read_script } from '../read/script.js';
 import read_style from '../read/style.js';
 import { closing_tag_omitted, decode_character_references } from '../utils/html.js';
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 import { create_fragment } from '../utils/create.js';
 import { create_attribute } from '../../nodes.js';
 
@@ -104,19 +104,18 @@ export default function tag(parser) {
 				['svelte:options', 'svelte:window', 'svelte:body', 'svelte:document'].includes(name) &&
 				/** @type {import('#compiler').ElementLike} */ (parent).fragment.nodes.length
 			) {
-				error(
+				e.invalid_element_content(
 					/** @type {import('#compiler').ElementLike} */ (parent).fragment.nodes[0].start,
-					'invalid-element-content',
 					name
 				);
 			}
 		} else {
 			if (name in parser.meta_tags) {
-				error(start, 'duplicate-svelte-element', name);
+				e.duplicate_svelte_element(start, name);
 			}
 
 			if (parent.type !== 'Root') {
-				error(start, 'invalid-svelte-element-placement', name);
+				e.invalid_svelte_element_placement(start, name);
 			}
 
 			parser.meta_tags[name] = true;
@@ -168,7 +167,7 @@ export default function tag(parser) {
 
 	if (is_closing_tag) {
 		if (is_void(name)) {
-			error(start, 'invalid-void-content');
+			e.invalid_void_content(start);
 		}
 
 		parser.eat('>', true);
@@ -177,14 +176,9 @@ export default function tag(parser) {
 		while (/** @type {import('#compiler').RegularElement} */ (parent).name !== name) {
 			if (parent.type !== 'RegularElement') {
 				if (parser.last_auto_closed_tag && parser.last_auto_closed_tag.tag === name) {
-					error(
-						start,
-						'invalid-closing-tag-after-autoclose',
-						name,
-						parser.last_auto_closed_tag.reason
-					);
+					e.invalid_closing_tag_after_autoclose(start, name, parser.last_auto_closed_tag.reason);
 				} else {
-					error(start, 'invalid-closing-tag', name);
+					e.invalid_closing_tag(start, name);
 				}
 			}
 
@@ -225,7 +219,7 @@ export default function tag(parser) {
 	while ((attribute = read(parser))) {
 		if (attribute.type === 'Attribute' || attribute.type === 'BindDirective') {
 			if (unique_names.includes(attribute.name)) {
-				error(attribute.start, 'duplicate-attribute');
+				e.duplicate_attribute(attribute.start);
 				// <svelte:element bind:this this=..> is allowed
 			} else if (attribute.name !== 'this') {
 				unique_names.push(attribute.name);
@@ -242,7 +236,7 @@ export default function tag(parser) {
 			(attr) => attr.type === 'Attribute' && attr.name === 'this'
 		);
 		if (index === -1) {
-			error(start, 'missing-svelte-component-definition');
+			e.missing_svelte_component_definition(start);
 		}
 
 		const definition = /** @type {import('#compiler').Attribute} */ (
@@ -253,7 +247,7 @@ export default function tag(parser) {
 			definition.value.length !== 1 ||
 			definition.value[0].type === 'Text'
 		) {
-			error(definition.start, 'invalid-svelte-component-definition');
+			e.invalid_svelte_component_definition(definition.start);
 		}
 
 		element.expression = definition.value[0].expression;
@@ -265,14 +259,14 @@ export default function tag(parser) {
 			(attr) => attr.type === 'Attribute' && attr.name === 'this'
 		);
 		if (index === -1) {
-			error(start, 'missing-svelte-element-definition');
+			e.missing_svelte_element_definition(start);
 		}
 
 		const definition = /** @type {import('#compiler').Attribute} */ (
 			element.attributes.splice(index, 1)[0]
 		);
 		if (definition.value === true || definition.value.length !== 1) {
-			error(definition.start, 'invalid-svelte-element-definition');
+			e.invalid_svelte_element_definition(definition.start);
 		}
 		const chunk = definition.value[0];
 		element.tag =
@@ -311,17 +305,17 @@ export default function tag(parser) {
 			}
 
 			if (content.context === 'module') {
-				if (current.module) error(start, 'duplicate-script-element');
+				if (current.module) e.duplicate_script_element(start);
 				current.module = content;
 			} else {
-				if (current.instance) error(start, 'duplicate-script-element');
+				if (current.instance) e.duplicate_script_element(start);
 				current.instance = content;
 			}
 		} else {
 			const content = read_style(parser, start, element.attributes);
 			content.content.comment = prev_comment;
 
-			if (current.css) error(start, 'duplicate-style-element');
+			if (current.css) e.duplicate_style_element(start);
 			current.css = content;
 		}
 		return;
@@ -396,7 +390,7 @@ function read_tag_name(parser) {
 		}
 
 		if (!legal) {
-			error(start, 'invalid-self-placement');
+			e.invalid_self_placement(start);
 		}
 
 		return 'svelte:self';
@@ -412,12 +406,12 @@ function read_tag_name(parser) {
 	if (meta_tags.has(name)) return name;
 
 	if (name.startsWith('svelte:')) {
-		const match = fuzzymatch(name.slice(7), valid_meta_tags);
-		error(start, 'invalid-svelte-tag', valid_meta_tags, match);
+		const list = `${valid_meta_tags.slice(0, -1).join(', ')} or ${valid_meta_tags[valid_meta_tags.length - 1]}`;
+		e.invalid_svelte_tag(start, list);
 	}
 
 	if (!valid_tag_name.test(name)) {
-		error(start, 'invalid-tag-name');
+		e.invalid_tag_name(start);
 	}
 
 	return name;
@@ -445,7 +439,7 @@ function read_static_attribute(parser) {
 		parser.allow_whitespace();
 		let raw = parser.match_regex(regex_attribute_value);
 		if (!raw) {
-			error(parser.index, 'missing-attribute-value');
+			e.missing_attribute_value(parser.index);
 		}
 
 		parser.index += raw.length;
@@ -468,7 +462,7 @@ function read_static_attribute(parser) {
 	}
 
 	if (parser.match_regex(regex_starts_with_quote_characters)) {
-		error(parser.index, 'expected-token', '=');
+		e.expected_token(parser.index, '=');
 	}
 
 	return create_attribute(name, start, parser.index, value);
@@ -509,7 +503,7 @@ function read_attribute(parser) {
 			const name = parser.read_identifier();
 
 			if (name === null) {
-				error(start, 'empty-attribute-shorthand');
+				e.empty_attribute_shorthand(start);
 			}
 
 			parser.allow_whitespace();
@@ -554,14 +548,14 @@ function read_attribute(parser) {
 		value = read_attribute_value(parser);
 		end = parser.index;
 	} else if (parser.match_regex(regex_starts_with_quote_characters)) {
-		error(parser.index, 'expected-token', '=');
+		e.expected_token(parser.index, '=');
 	}
 
 	if (type) {
 		const [directive_name, ...modifiers] = name.slice(colon_index + 1).split('|');
 
 		if (directive_name === '') {
-			error(start + colon_index + 1, 'empty-directive-name', type);
+			e.empty_directive_name(start + colon_index + 1, type);
 		}
 
 		if (type === 'StyleDirective') {
@@ -586,7 +580,7 @@ function read_attribute(parser) {
 			const attribute_contains_text =
 				/** @type {any[]} */ (value).length > 1 || first_value.type === 'Text';
 			if (attribute_contains_text) {
-				error(/** @type {number} */ (first_value.start), 'invalid-directive-value');
+				e.invalid_directive_value(/** @type {number} */ (first_value.start));
 			} else {
 				expression = first_value.expression;
 			}
@@ -679,22 +673,22 @@ function read_attribute_value(parser) {
 			},
 			'in attribute value'
 		);
-	} catch (/** @type {any} e */ e) {
-		if (e.code === 'js-parse-error') {
+	} catch (/** @type {any} */ error) {
+		if (error.code === 'js_parse_error') {
 			// if the attribute value didn't close + self-closing tag
 			// eg: `<Component test={{a:1} />`
 			// acorn may throw a `Unterminated regular expression` because of `/>`
-			const pos = e.position?.[0];
+			const pos = error.position?.[0];
 			if (pos !== undefined && parser.template.slice(pos - 1, pos + 1) === '/>') {
 				parser.index = pos;
-				error(pos, 'unclosed-attribute-value', quote_mark || '}');
+				e.unclosed_attribute_value(pos, quote_mark || '}');
 			}
 		}
-		throw e;
+		throw error;
 	}
 
 	if (value.length === 0 && !quote_mark) {
-		error(parser.index, 'missing-attribute-value');
+		e.missing_attribute_value(parser.index);
 	}
 
 	if (quote_mark) parser.index += 1;
@@ -741,12 +735,12 @@ function read_sequence(parser, done, location) {
 				const index = parser.index - 1;
 				parser.eat('#');
 				const name = parser.read_until(/[^a-z]/);
-				error(index, 'invalid-block-placement', location, name);
+				e.invalid_block_placement(index, name, location);
 			} else if (parser.match('@')) {
 				const index = parser.index - 1;
 				parser.eat('@');
 				const name = parser.read_until(/[^a-z]/);
-				error(index, 'invalid-tag-placement', location, name);
+				e.invalid_tag_placement(index, name, location);
 			}
 
 			flush(parser.index - 1);
@@ -784,5 +778,5 @@ function read_sequence(parser, done, location) {
 		}
 	}
 
-	error(parser.template.length, 'unexpected-eof');
+	e.unexpected_eof(parser.template.length);
 }
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/tag.js b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
index 1c73427463..537e0b6b34 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/tag.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
@@ -1,6 +1,6 @@
 import read_pattern from '../read/context.js';
 import read_expression from '../read/expression.js';
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 import { create_fragment } from '../utils/create.js';
 import { walk } from 'zimmerframe';
 
@@ -147,7 +147,7 @@ function open(parser) {
 			parser.allow_whitespace();
 			index = parser.read_identifier();
 			if (!index) {
-				error(parser.index, 'expected-identifier');
+				e.expected_identifier(parser.index);
 			}
 
 			parser.allow_whitespace();
@@ -265,7 +265,7 @@ function open(parser) {
 		const name_end = parser.index;
 
 		if (name === null) {
-			error(parser.index, 'expected-identifier');
+			e.expected_identifier(parser.index);
 		}
 
 		parser.eat('(', true);
@@ -320,7 +320,7 @@ function open(parser) {
 		return;
 	}
 
-	error(parser.index, 'expected-block-type');
+	e.expected_block_type(parser.index);
 }
 
 /** @param {import('../index.js').Parser} parser */
@@ -330,8 +330,8 @@ function next(parser) {
 	const block = parser.current(); // TODO type should not be TemplateNode, that's much too broad
 
 	if (block.type === 'IfBlock') {
-		if (!parser.eat('else')) error(start, 'expected-token', '{:else} or {:else if}');
-		if (parser.eat('if')) error(start, 'invalid-elseif');
+		if (!parser.eat('else')) e.expected_token(start, '{:else} or {:else if}');
+		if (parser.eat('if')) e.invalid_elseif(start);
 
 		parser.allow_whitespace();
 
@@ -373,7 +373,7 @@ function next(parser) {
 	}
 
 	if (block.type === 'EachBlock') {
-		if (!parser.eat('else')) error(start, 'expected-token', '{:else}');
+		if (!parser.eat('else')) e.expected_token(start, '{:else}');
 
 		parser.allow_whitespace();
 		parser.eat('}', true);
@@ -389,7 +389,7 @@ function next(parser) {
 	if (block.type === 'AwaitBlock') {
 		if (parser.eat('then')) {
 			if (block.then) {
-				error(start, 'duplicate-block-part', '{:then}');
+				e.duplicate_block_part(start, '{:then}');
 			}
 
 			if (!parser.eat('}')) {
@@ -408,7 +408,7 @@ function next(parser) {
 
 		if (parser.eat('catch')) {
 			if (block.catch) {
-				error(start, 'duplicate-block-part', '{:catch}');
+				e.duplicate_block_part(start, '{:catch}');
 			}
 
 			if (!parser.eat('}')) {
@@ -425,10 +425,10 @@ function next(parser) {
 			return;
 		}
 
-		error(start, 'expected-token', '{:then ...} or {:catch ...}');
+		e.expected_token(start, '{:then ...} or {:catch ...}');
 	}
 
-	error(start, 'invalid-continuing-block-placement');
+	e.invalid_continuing_block_placement(start);
 }
 
 /** @param {import('../index.js').Parser} parser */
@@ -466,11 +466,11 @@ function close(parser) {
 
 		case 'RegularElement':
 			// TODO handle implicitly closed elements
-			error(start, 'unexpected-block-close');
+			e.unexpected_block_close(start);
 			break;
 
 		default:
-			error(start, 'unexpected-block-close');
+			e.unexpected_block_close(start);
 	}
 
 	parser.allow_whitespace();
@@ -522,7 +522,7 @@ function special(parser) {
 			identifiers.forEach(
 				/** @param {any} node */ (node) => {
 					if (node.type !== 'Identifier') {
-						error(/** @type {number} */ (node.start), 'invalid-debug');
+						e.invalid_debug(/** @type {number} */ (node.start));
 					}
 				}
 			);
@@ -583,7 +583,7 @@ function special(parser) {
 				expression.expression.type !== 'CallExpression' ||
 				!expression.expression.optional)
 		) {
-			error(expression, 'invalid-render-expression');
+			e.invalid_render_expression(expression);
 		}
 
 		parser.allow_whitespace();
diff --git a/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js b/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js
index 38a62b9ca7..6f933ab55a 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js
@@ -1,5 +1,5 @@
 import { walk } from 'zimmerframe';
-import { error } from '../../../errors.js';
+import * as e from '../../../errors.js';
 import { is_keyframes_node } from '../../css.js';
 import { merge } from '../../visitors.js';
 
@@ -98,31 +98,26 @@ const validation_visitors = {
 	Rule(node, context) {
 		if (node.metadata.is_global_block) {
 			if (node.prelude.children.length > 1) {
-				error(node.prelude, 'invalid-css-global-block-list');
+				e.invalid_css_global_block_list(node.prelude);
 			}
 
 			const complex_selector = node.prelude.children[0];
 			const relative_selector = complex_selector.children[complex_selector.children.length - 1];
 
 			if (relative_selector.selectors.length > 1) {
-				error(
-					relative_selector.selectors[relative_selector.selectors.length - 1],
-					'invalid-css-global-block-modifier'
+				e.invalid_css_global_block_modifier(
+					relative_selector.selectors[relative_selector.selectors.length - 1]
 				);
 			}
 
 			if (relative_selector.combinator && relative_selector.combinator.name !== ' ') {
-				error(
-					relative_selector,
-					'invalid-css-global-block-combinator',
-					relative_selector.combinator.name
-				);
+				e.invalid_css_global_block_combinator(relative_selector, relative_selector.combinator.name);
 			}
 
 			const declaration = node.block.children.find((child) => child.type === 'Declaration');
 
 			if (declaration) {
-				error(declaration, 'invalid-css-global-block-declaration');
+				e.invalid_css_global_block_declaration(declaration);
 			}
 		}
 
@@ -137,7 +132,7 @@ const validation_visitors = {
 			if (a !== b) {
 				for (let i = a; i <= b; i += 1) {
 					if (is_global(node.children[i])) {
-						error(node.children[i].selectors[0], 'invalid-css-global-placement');
+						e.invalid_css_global_placement(node.children[i].selectors[0]);
 					}
 				}
 			}
@@ -152,12 +147,12 @@ const validation_visitors = {
 					const child = selector.args?.children[0].children[0];
 					// ensure `:global(element)` to be at the first position in a compound selector
 					if (child?.selectors[0].type === 'TypeSelector' && i !== 0) {
-						error(selector, 'invalid-css-global-selector-list');
+						e.invalid_css_global_selector_list(selector);
 					}
 
 					// ensure `:global(.class)` is not followed by a type selector, eg: `:global(.class)element`
 					if (relative_selector.selectors[i + 1]?.type === 'TypeSelector') {
-						error(relative_selector.selectors[i + 1], 'invalid-css-type-selector-placement');
+						e.invalid_css_type_selector_placement(relative_selector.selectors[i + 1]);
 					}
 
 					// ensure `:global(...)`contains a single selector
@@ -167,7 +162,7 @@ const validation_visitors = {
 						selector.args.children.length > 1 &&
 						(node.children.length > 1 || relative_selector.selectors.length > 1)
 					) {
-						error(selector, 'invalid-css-global-selector');
+						e.invalid_css_global_selector(selector);
 					}
 				}
 			}
@@ -176,7 +171,7 @@ const validation_visitors = {
 	NestingSelector(node, context) {
 		const rule = /** @type {import('#compiler').Css.Rule} */ (context.state.rule);
 		if (!rule.metadata.parent_rule) {
-			error(node, 'invalid-nesting-selector');
+			e.invalid_nesting_selector(node);
 		}
 	}
 };
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 37eb3a3c92..10091a7105 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -1,6 +1,6 @@
 import is_reference from 'is-reference';
 import { walk } from 'zimmerframe';
-import { error } from '../../errors.js';
+import * as e from '../../errors.js';
 import {
 	extract_identifiers,
 	extract_all_identifiers_from_expression,
@@ -229,7 +229,7 @@ export function analyze_module(ast, options) {
 	for (const [name, references] of scope.references) {
 		if (name[0] !== '$' || ReservedKeywords.includes(name)) continue;
 		if (name === '$' || name[1] === '$') {
-			error(references[0].node, 'illegal-global', name);
+			e.illegal_global(references[0].node, name);
 		}
 	}
 
@@ -281,7 +281,7 @@ export function analyze_component(root, source, options) {
 	for (const [name, references] of module.scope.references) {
 		if (name[0] !== '$' || ReservedKeywords.includes(name)) continue;
 		if (name === '$' || name[1] === '$') {
-			error(references[0].node, 'illegal-global', name);
+			e.illegal_global(references[0].node, name);
 		}
 
 		const store_name = name.slice(1);
@@ -321,12 +321,12 @@ export function analyze_component(root, source, options) {
 			}
 
 			if (is_nested_store_subscription_node) {
-				error(is_nested_store_subscription_node, 'illegal-store-subscription');
+				e.illegal_store_subscription(is_nested_store_subscription_node);
 			}
 
 			if (options.runes !== false) {
 				if (declaration === null && /[a-z]/.test(store_name[0])) {
-					error(references[0].node, 'illegal-global', name);
+					e.illegal_global(references[0].node, name);
 				} else if (declaration !== null && Runes.includes(/** @type {any} */ (name))) {
 					for (const { node, path } of references) {
 						if (path.at(-1)?.type === 'CallExpression') {
@@ -345,7 +345,7 @@ export function analyze_component(root, source, options) {
 						// const state = $state(0) is valid
 						get_rune(/** @type {import('estree').Node} */ (path.at(-1)), module.scope) === null
 					) {
-						error(node, 'illegal-subscription');
+						e.illegal_subscription(node);
 					}
 				}
 			}
@@ -413,12 +413,12 @@ export function analyze_component(root, source, options) {
 	if (analysis.runes) {
 		const props_refs = module.scope.references.get('$$props');
 		if (props_refs) {
-			error(props_refs[0].node, 'invalid-legacy-props');
+			e.invalid_legacy_props(props_refs[0].node);
 		}
 
 		const rest_props_refs = module.scope.references.get('$$restProps');
 		if (rest_props_refs) {
-			error(rest_props_refs[0].node, 'invalid-legacy-rest-props');
+			e.invalid_legacy_rest_props(rest_props_refs[0].node);
 		}
 
 		for (const { ast, scope, scopes } of [module, instance, template]) {
@@ -451,7 +451,7 @@ export function analyze_component(root, source, options) {
 							({ alias, name }) => (binding.prop_alias ?? binding.node.name) === (alias ?? name)
 						)
 					) {
-						error(binding.node, 'conflicting-property-name');
+						e.conflicting_property_name(binding.node);
 					}
 				}
 			}
@@ -504,7 +504,7 @@ export function analyze_component(root, source, options) {
 	}
 
 	if (analysis.uses_render_tags && (analysis.uses_slots || analysis.slot_names.size > 0)) {
-		error(analysis.slot_names.values().next().value, 'conflicting-slot-usage');
+		e.conflicting_slot_usage(analysis.slot_names.values().next().value);
 	}
 
 	// warn on any nonstate declarations that are a) reassigned and b) referenced in the template
@@ -1425,7 +1425,7 @@ function order_reactive_statements(unsorted_reactive_declarations) {
 	const cycle = check_graph_for_cycles(edges);
 	if (cycle?.length) {
 		const declaration = /** @type {Tuple[]} */ (lookup.get(cycle[0]))[0];
-		error(declaration[0], 'cyclical-reactive-declaration', cycle);
+		e.cyclical_reactive_declaration(declaration[0], cycle.join(' → '));
 	}
 
 	// We use a map and take advantage of the fact that the spec says insertion order is preserved when iterating
diff --git a/packages/svelte/src/compiler/phases/2-analyze/validation.js b/packages/svelte/src/compiler/phases/2-analyze/validation.js
index 0f6f1bf6dd..cd1aed4b2d 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/validation.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/validation.js
@@ -3,7 +3,7 @@ import {
 	interactive_elements,
 	is_tag_valid_with_parent
 } from '../../../constants.js';
-import { error } from '../../errors.js';
+import * as e from '../../errors.js';
 import {
 	extract_identifiers,
 	get_parent,
@@ -44,14 +44,14 @@ function validate_component(node, context) {
 			attribute.type !== 'OnDirective' &&
 			attribute.type !== 'BindDirective'
 		) {
-			error(attribute, 'invalid-component-directive');
+			e.invalid_component_directive(attribute);
 		}
 
 		if (
 			attribute.type === 'OnDirective' &&
 			(attribute.modifiers.length > 1 || attribute.modifiers.some((m) => m !== 'once'))
 		) {
-			error(attribute, 'invalid-event-modifier');
+			e.invalid_component_event_modifier(attribute);
 		}
 
 		if (attribute.type === 'Attribute') {
@@ -62,7 +62,7 @@ function validate_component(node, context) {
 					while (--i > 0) {
 						const char = context.state.analysis.source[i];
 						if (char === '(') break; // parenthesized sequence expressions are ok
-						if (char === '{') error(expression, 'invalid-sequence-expression');
+						if (char === '{') e.invalid_sequence_expression(expression);
 					}
 				}
 			}
@@ -93,8 +93,12 @@ const react_attributes = new Map([
  */
 function validate_element(node, context) {
 	let has_animate_directive = false;
-	let has_in_transition = false;
-	let has_out_transition = false;
+
+	/** @type {import('#compiler').TransitionDirective | null} */
+	let in_transition = null;
+
+	/** @type {import('#compiler').TransitionDirective | null} */
+	let out_transition = null;
 
 	for (const attribute of node.attributes) {
 		if (attribute.type === 'Attribute') {
@@ -107,18 +111,18 @@ function validate_element(node, context) {
 					while (--i > 0) {
 						const char = context.state.analysis.source[i];
 						if (char === '(') break; // parenthesized sequence expressions are ok
-						if (char === '{') error(expression, 'invalid-sequence-expression');
+						if (char === '{') e.invalid_sequence_expression(expression);
 					}
 				}
 			}
 
 			if (regex_illegal_attribute_character.test(attribute.name)) {
-				error(attribute, 'invalid-attribute-name', attribute.name);
+				e.invalid_attribute_name(attribute, attribute.name);
 			}
 
 			if (attribute.name.startsWith('on') && attribute.name.length > 2) {
 				if (!is_expression) {
-					error(attribute, 'invalid-event-attribute-value');
+					e.invalid_event_attribute_value(attribute);
 				}
 
 				const value = attribute.value[0].expression;
@@ -162,9 +166,9 @@ function validate_element(node, context) {
 		} else if (attribute.type === 'AnimateDirective') {
 			const parent = context.path.at(-2);
 			if (parent?.type !== 'EachBlock') {
-				error(attribute, 'invalid-animation', 'no-each');
+				e.animation_invalid_placement(attribute);
 			} else if (!parent.key) {
-				error(attribute, 'invalid-animation', 'each-key');
+				e.animation_missing_key(attribute);
 			} else if (
 				parent.body.nodes.filter(
 					(n) =>
@@ -173,34 +177,39 @@ function validate_element(node, context) {
 						(n.type !== 'Text' || n.data.trim() !== '')
 				).length > 1
 			) {
-				error(attribute, 'invalid-animation', 'child');
+				e.animation_invalid_placement(attribute);
 			}
 
 			if (has_animate_directive) {
-				error(attribute, 'duplicate-animation');
+				e.animation_duplicate(attribute);
 			} else {
 				has_animate_directive = true;
 			}
 		} else if (attribute.type === 'TransitionDirective') {
-			if ((attribute.outro && has_out_transition) || (attribute.intro && has_in_transition)) {
-				/** @param {boolean} _in @param {boolean} _out */
-				const type = (_in, _out) => (_in && _out ? 'transition' : _in ? 'in' : 'out');
-				error(
-					attribute,
-					'duplicate-transition',
-					type(has_in_transition, has_out_transition),
-					type(attribute.intro, attribute.outro)
-				);
+			const existing = /** @type {import('#compiler').TransitionDirective | null} */ (
+				(attribute.intro && in_transition) || (attribute.outro && out_transition)
+			);
+
+			if (existing) {
+				const a = existing.intro ? (existing.outro ? 'transition' : 'in') : 'out';
+				const b = attribute.intro ? (attribute.outro ? 'transition' : 'in') : 'out';
+
+				if (a === b) {
+					e.transition_duplicate(attribute, a);
+				} else {
+					e.transition_conflict(attribute, a, b);
+				}
 			}
 
-			has_in_transition = has_in_transition || attribute.intro;
-			has_out_transition = has_out_transition || attribute.outro;
+			if (attribute.intro) in_transition = attribute;
+			if (attribute.outro) out_transition = attribute;
 		} else if (attribute.type === 'OnDirective') {
 			let has_passive_modifier = false;
 			let conflicting_passive_modifier = '';
 			for (const modifier of attribute.modifiers) {
 				if (!EventModifiers.includes(modifier)) {
-					error(attribute, 'invalid-event-modifier', EventModifiers);
+					const list = `${EventModifiers.slice(0, -1).join(', ')} or ${EventModifiers.at(-1)}`;
+					e.invalid_event_modifier(attribute, list);
 				}
 				if (modifier === 'passive') {
 					has_passive_modifier = true;
@@ -208,12 +217,7 @@ function validate_element(node, context) {
 					conflicting_passive_modifier = modifier;
 				}
 				if (has_passive_modifier && conflicting_passive_modifier) {
-					error(
-						attribute,
-						'invalid-event-modifier-combination',
-						'passive',
-						conflicting_passive_modifier
-					);
+					e.invalid_event_modifier_combination(attribute, 'passive', conflicting_passive_modifier);
 				}
 			}
 		}
@@ -259,7 +263,7 @@ function validate_slot_attribute(context, attribute) {
 
 	if (owner) {
 		if (!is_text_attribute(attribute)) {
-			error(attribute, 'invalid-slot-attribute');
+			e.invalid_slot_attribute(attribute);
 		}
 
 		if (
@@ -268,13 +272,13 @@ function validate_slot_attribute(context, attribute) {
 			owner.type === 'SvelteSelf'
 		) {
 			if (owner !== context.path.at(-2)) {
-				error(attribute, 'invalid-slot-placement');
+				e.invalid_slot_placement(attribute);
 			}
 
 			const name = attribute.value[0].data;
 
 			if (context.state.component_slots.has(name)) {
-				error(attribute, 'duplicate-slot-name', name, owner.name);
+				e.duplicate_slot_name(attribute, name, owner.name);
 			}
 
 			context.state.component_slots.add(name);
@@ -291,12 +295,12 @@ function validate_slot_attribute(context, attribute) {
 						}
 					}
 
-					error(node, 'invalid-default-slot-content');
+					e.invalid_default_slot_content(node);
 				}
 			}
 		}
 	} else {
-		error(attribute, 'invalid-slot-placement');
+		e.invalid_slot_placement(attribute);
 	}
 }
 
@@ -327,7 +331,7 @@ const validation = {
 		const left = object(assignee);
 
 		if (left === null) {
-			error(node, 'invalid-binding-expression');
+			e.invalid_binding_expression(node);
 		}
 
 		const binding = context.state.scope.get(left.name);
@@ -347,25 +351,25 @@ const validation = {
 					binding.kind !== 'store_sub' &&
 					!binding.mutated)
 			) {
-				error(node.expression, 'invalid-binding-value');
+				e.invalid_binding_value(node.expression);
 			}
 
 			if (binding.kind === 'derived') {
-				error(node.expression, 'invalid-derived-binding');
+				e.invalid_binding(node.expression, 'derived state');
 			}
 
 			if (context.state.analysis.runes && binding.kind === 'each') {
-				error(node, 'invalid-each-assignment');
+				e.invalid_each_assignment(node);
 			}
 
 			if (binding.kind === 'snippet') {
-				error(node, 'invalid-snippet-assignment');
+				e.invalid_snippet_assignment(node);
 			}
 		}
 
 		if (node.name === 'group') {
 			if (!binding) {
-				error(node, 'INTERNAL', 'Cannot find declaration for bind:group');
+				throw new Error('Cannot find declaration for bind:group');
 			}
 		}
 
@@ -389,21 +393,14 @@ const validation = {
 			parent?.type === 'SvelteBody'
 		) {
 			if (context.state.options.namespace === 'foreign' && node.name !== 'this') {
-				error(
-					node,
-					'invalid-binding',
-					node.name,
-					undefined,
-					'. Foreign elements only support bind:this'
-				);
+				e.bind_invalid_detailed(node, node.name, 'Foreign elements only support `bind:this`');
 			}
 
 			if (node.name in binding_properties) {
 				const property = binding_properties[node.name];
 				if (property.valid_elements && !property.valid_elements.includes(parent.name)) {
-					error(
+					e.bind_invalid_target(
 						node,
-						'invalid-binding',
 						node.name,
 						property.valid_elements.map((valid_element) => `<${valid_element}>`).join(', ')
 					);
@@ -415,17 +412,17 @@ const validation = {
 					);
 					if (type && !is_text_attribute(type)) {
 						if (node.name !== 'value' || type.value === true) {
-							error(type, 'invalid-type-attribute');
+							e.invalid_type_attribute(type);
 						}
 						return; // bind:value can handle dynamic `type` attributes
 					}
 
 					if (node.name === 'checked' && type?.value[0].data !== 'checkbox') {
-						error(node, 'invalid-binding', node.name, '<input type="checkbox">');
+						e.bind_invalid_target(node, node.name, '<input type="checkbox">');
 					}
 
 					if (node.name === 'files' && type?.value[0].data !== 'file') {
-						error(node, 'invalid-binding', node.name, '<input type="file">');
+						e.bind_invalid_target(node, node.name, '<input type="file">');
 					}
 				}
 
@@ -438,14 +435,13 @@ const validation = {
 							a.value !== true
 					);
 					if (multiple) {
-						error(multiple, 'invalid-multiple-attribute');
+						e.invalid_multiple_attribute(multiple);
 					}
 				}
 
 				if (node.name === 'offsetWidth' && SVGElements.includes(parent.name)) {
-					error(
+					e.bind_invalid_target(
 						node,
-						'invalid-binding',
 						node.name,
 						`non-<svg> elements. Use 'clientWidth' for <svg> instead`
 					);
@@ -456,9 +452,9 @@ const validation = {
 						parent.attributes.find((a) => a.type === 'Attribute' && a.name === 'contenteditable')
 					);
 					if (!contenteditable) {
-						error(node, 'missing-contenteditable-attribute');
+						e.missing_contenteditable_attribute(node);
 					} else if (!is_text_attribute(contenteditable) && contenteditable.value !== true) {
-						error(contenteditable, 'dynamic-contenteditable-attribute');
+						e.dynamic_contenteditable_attribute(contenteditable);
 					}
 				}
 			} else {
@@ -466,15 +462,15 @@ const validation = {
 				if (match) {
 					const property = binding_properties[match];
 					if (!property.valid_elements || property.valid_elements.includes(parent.name)) {
-						error(node, 'invalid-binding', node.name, undefined, ` (did you mean '${match}'?)`);
+						e.bind_invalid_detailed(node, node.name, `Did you mean '${match}'?`);
 					}
 				}
-				error(node, 'invalid-binding', node.name);
+				e.bind_invalid(node, node.name);
 			}
 		}
 	},
 	ExportDefaultDeclaration(node) {
-		error(node, 'default-export');
+		e.default_export(node);
 	},
 	ConstTag(node, context) {
 		const parent = context.path.at(-1);
@@ -491,7 +487,7 @@ const validation = {
 				((grand_parent?.type !== 'RegularElement' && grand_parent?.type !== 'SvelteElement') ||
 					!grand_parent.attributes.some((a) => a.type === 'Attribute' && a.name === 'slot')))
 		) {
-			error(node, 'invalid-const-placement');
+			e.invalid_const_placement(node);
 		}
 	},
 	ImportDeclaration(node, context) {
@@ -502,7 +498,7 @@ const validation = {
 						specifier.imported.name === 'beforeUpdate' ||
 						specifier.imported.name === 'afterUpdate'
 					) {
-						error(specifier, 'invalid-runes-mode-import', specifier.imported.name);
+						e.invalid_runes_mode_import(specifier, specifier.imported.name);
 					}
 				}
 			}
@@ -520,14 +516,14 @@ const validation = {
 				parent.type !== 'SvelteSelf' &&
 				parent.type !== 'SvelteFragment')
 		) {
-			error(node, 'invalid-let-directive-placement');
+			e.invalid_let_directive_placement(node);
 		}
 	},
 	RegularElement(node, context) {
 		if (node.name === 'textarea' && node.fragment.nodes.length > 0) {
 			for (const attribute of node.attributes) {
 				if (attribute.type === 'Attribute' && attribute.name === 'value') {
-					error(node, 'invalid-textarea-content');
+					e.invalid_textarea_content(node);
 				}
 			}
 		}
@@ -551,7 +547,7 @@ const validation = {
 
 		if (context.state.parent_element) {
 			if (!is_tag_valid_with_parent(node.name, context.state.parent_element)) {
-				error(node, 'invalid-node-placement', `<${node.name}>`, context.state.parent_element);
+				e.invalid_node_placement(node, `<${node.name}>`, context.state.parent_element);
 			}
 		}
 
@@ -563,7 +559,7 @@ const validation = {
 					parent.name === node.name &&
 					interactive_elements.has(parent.name)
 				) {
-					error(node, 'invalid-node-placement', `<${node.name}>`, parent.name);
+					e.invalid_node_placement(node, `<${node.name}>`, parent.name);
 				}
 			}
 		}
@@ -572,7 +568,7 @@ const validation = {
 			const path = context.path;
 			for (let parent of path) {
 				if (parent.type === 'RegularElement' && parent.name === 'p') {
-					error(node, 'invalid-node-placement', `<${node.name}>`, parent.name);
+					e.invalid_node_placement(node, `<${node.name}>`, parent.name);
 				}
 			}
 		}
@@ -603,7 +599,7 @@ const validation = {
 		const raw_args = unwrap_optional(node.expression).arguments;
 		for (const arg of raw_args) {
 			if (arg.type === 'SpreadElement') {
-				error(arg, 'invalid-render-spread-argument');
+				e.invalid_render_spread_argument(arg);
 			}
 		}
 
@@ -613,7 +609,7 @@ const validation = {
 			callee.property.type === 'Identifier' &&
 			['bind', 'apply', 'call'].includes(callee.property.name)
 		) {
-			error(node, 'invalid-render-call');
+			e.invalid_render_call(node);
 		}
 
 		const is_inside_textarea = context.path.find((n) => {
@@ -625,9 +621,8 @@ const validation = {
 			);
 		});
 		if (is_inside_textarea) {
-			error(
+			e.invalid_tag_placement(
 				node,
-				'invalid-tag-placement',
 				'inside <textarea> or <svelte:element this="textarea">',
 				'render'
 			);
@@ -667,19 +662,19 @@ const validation = {
 					(node) => node.type !== 'SnippetBlock' && (node.type !== 'Text' || node.data.trim())
 				)
 			) {
-				error(node, 'conflicting-children-snippet');
+				e.conflicting_children_snippet(node);
 			}
 		}
 	},
 	StyleDirective(node) {
 		if (node.modifiers.length > 1 || (node.modifiers.length && node.modifiers[0] !== 'important')) {
-			error(node, 'invalid-style-directive-modifier');
+			e.invalid_style_directive_modifier(node);
 		}
 	},
 	SvelteHead(node) {
 		const attribute = node.attributes[0];
 		if (attribute) {
-			error(attribute, 'illegal-svelte-head-attribute');
+			e.illegal_svelte_head_attribute(attribute);
 		}
 	},
 	SvelteElement(node, context) {
@@ -692,7 +687,7 @@ const validation = {
 	SvelteFragment(node, context) {
 		const parent = context.path.at(-2);
 		if (parent?.type !== 'Component' && parent?.type !== 'SvelteComponent') {
-			error(node, 'invalid-svelte-fragment-placement');
+			e.invalid_svelte_fragment_placement(node);
 		}
 
 		for (const attribute of node.attributes) {
@@ -701,7 +696,7 @@ const validation = {
 					validate_slot_attribute(context, attribute);
 				}
 			} else if (attribute.type !== 'LetDirective') {
-				error(attribute, 'invalid-svelte-fragment-attribute');
+				e.invalid_svelte_fragment_attribute(attribute);
 			}
 		}
 	},
@@ -710,15 +705,15 @@ const validation = {
 			if (attribute.type === 'Attribute') {
 				if (attribute.name === 'name') {
 					if (!is_text_attribute(attribute)) {
-						error(attribute, 'invalid-slot-name', false);
+						e.invalid_slot_name(attribute);
 					}
 					const slot_name = attribute.value[0].data;
 					if (slot_name === 'default') {
-						error(attribute, 'invalid-slot-name', true);
+						e.invalid_slot_name_default(attribute);
 					}
 				}
 			} else if (attribute.type !== 'SpreadAttribute' && attribute.type !== 'LetDirective') {
-				error(attribute, 'invalid-slot-element-attribute');
+				e.invalid_slot_element_attribute(attribute);
 			}
 		}
 	},
@@ -729,19 +724,19 @@ const validation = {
 		if (!node.parent) return;
 		if (context.state.parent_element && regex_not_whitespace.test(node.data)) {
 			if (!is_tag_valid_with_parent('#text', context.state.parent_element)) {
-				error(node, 'invalid-node-placement', 'Text node', context.state.parent_element);
+				e.invalid_node_placement(node, 'Text node', context.state.parent_element);
 			}
 		}
 	},
 	TitleElement(node) {
 		const attribute = node.attributes[0];
 		if (attribute) {
-			error(attribute, 'illegal-title-attribute');
+			e.illegal_title_attribute(attribute);
 		}
 
 		const child = node.fragment.nodes.find((n) => n.type !== 'Text' && n.type !== 'ExpressionTag');
 		if (child) {
-			error(child, 'invalid-title-content');
+			e.invalid_title_content(child);
 		}
 	},
 	UpdateExpression(node, context) {
@@ -751,7 +746,7 @@ const validation = {
 		if (!node.parent) return;
 		if (context.state.parent_element) {
 			if (!is_tag_valid_with_parent('#text', context.state.parent_element)) {
-				error(node, 'invalid-node-placement', '{expression}', context.state.parent_element);
+				e.invalid_node_placement(node, '{expression}', context.state.parent_element);
 			}
 		}
 	}
@@ -772,7 +767,7 @@ export const validation_legacy = merge(validation, a11y_validators, {
 		}
 
 		if (state.scope.get(callee.name)?.kind !== 'store_sub') {
-			error(node.init, 'invalid-rune-usage', callee.name);
+			e.invalid_rune_usage(node.init, callee.name);
 		}
 	},
 	AssignmentExpression(node, { state, path }) {
@@ -805,11 +800,11 @@ function validate_export(node, scope, name) {
 	if (!binding) return;
 
 	if (binding.kind === 'derived') {
-		error(node, 'invalid-derived-export');
+		e.invalid_derived_export(node);
 	}
 
 	if ((binding.kind === 'state' || binding.kind === 'frozen_state') && binding.reassigned) {
-		error(node, 'invalid-state-export');
+		e.invalid_state_export(node);
 	}
 }
 
@@ -827,7 +822,7 @@ function validate_call_expression(node, scope, path) {
 
 	if (rune === '$props') {
 		if (parent.type === 'VariableDeclarator') return;
-		error(node, 'invalid-props-location');
+		e.invalid_props_location(node);
 	}
 
 	if (rune === '$bindable') {
@@ -840,7 +835,7 @@ function validate_call_expression(node, scope, path) {
 				return;
 			}
 		}
-		error(node, 'invalid-bindable-location');
+		e.invalid_bindable_location(node);
 	}
 
 	if (
@@ -851,46 +846,46 @@ function validate_call_expression(node, scope, path) {
 	) {
 		if (parent.type === 'VariableDeclarator') return;
 		if (parent.type === 'PropertyDefinition' && !parent.static && !parent.computed) return;
-		error(node, 'invalid-state-location', rune);
+		e.invalid_state_location(node, rune);
 	}
 
 	if (rune === '$effect' || rune === '$effect.pre') {
 		if (parent.type !== 'ExpressionStatement') {
-			error(node, 'invalid-effect-location');
+			e.invalid_effect_location(node);
 		}
 
 		if (node.arguments.length !== 1) {
-			error(node, 'invalid-rune-args-length', rune, [1]);
+			e.invalid_rune_args_length(node, rune, 'exactly one argument');
 		}
 	}
 
 	if (rune === '$effect.active') {
 		if (node.arguments.length !== 0) {
-			error(node, 'invalid-rune-args-length', rune, [0]);
+			e.invalid_rune_args(node, rune);
 		}
 	}
 
 	if (rune === '$effect.root') {
 		if (node.arguments.length !== 1) {
-			error(node, 'invalid-rune-args-length', rune, [1]);
+			e.invalid_rune_args_length(node, rune, 'exactly one argument');
 		}
 	}
 
 	if (rune === '$inspect') {
 		if (node.arguments.length < 1) {
-			error(node, 'invalid-rune-args-length', rune, [1, 'more']);
+			e.invalid_rune_args_length(node, rune, 'one or more arguments');
 		}
 	}
 
 	if (rune === '$inspect().with') {
 		if (node.arguments.length !== 1) {
-			error(node, 'invalid-rune-args-length', rune, [1]);
+			e.invalid_rune_args_length(node, rune, 'exactly one argument');
 		}
 	}
 
 	if (rune === '$state.snapshot') {
 		if (node.arguments.length !== 1) {
-			error(node, 'invalid-rune-args-length', rune, [1]);
+			e.invalid_rune_args_length(node, rune, 'exactly one argument');
 		}
 	}
 }
@@ -906,7 +901,7 @@ function ensure_no_module_import_conflict(node, state) {
 			state.scope === state.analysis.instance.scope &&
 			state.analysis.module.scope.get(id.name)?.declaration_kind === 'import'
 		) {
-			error(node.id, 'illegal-variable-declaration');
+			e.illegal_variable_declaration(node.id);
 		}
 	}
 }
@@ -932,7 +927,7 @@ export const validation_runes_js = {
 	},
 	CallExpression(node, { state, path }) {
 		if (get_rune(node, state.scope) === '$host') {
-			error(node, 'invalid-host-location');
+			e.invalid_host_location(node);
 		}
 		validate_call_expression(node, state.scope, path);
 	},
@@ -945,13 +940,13 @@ export const validation_runes_js = {
 		const args = /** @type {import('estree').CallExpression} */ (init).arguments;
 
 		if ((rune === '$derived' || rune === '$derived.by') && args.length !== 1) {
-			error(node, 'invalid-rune-args-length', rune, [1]);
+			e.invalid_rune_args_length(node, rune, 'exactly one argument');
 		} else if (rune === '$state' && args.length > 1) {
-			error(node, 'invalid-rune-args-length', rune, [0, 1]);
+			e.invalid_rune_args_length(node, rune, 'zero or one arguments');
 		} else if (rune === '$props') {
-			error(node, 'invalid-props-location');
+			e.invalid_props_location(node);
 		} else if (rune === '$bindable') {
-			error(node, 'invalid-bindable-location');
+			e.invalid_bindable_location(node);
 		}
 	},
 	AssignmentExpression(node, { state }) {
@@ -1021,16 +1016,24 @@ function validate_no_const_assignment(node, argument, scope, is_binding) {
 	} else if (argument.type === 'Identifier') {
 		const binding = scope.get(argument.name);
 		if (binding?.declaration_kind === 'const' && binding.kind !== 'each') {
-			error(
-				node,
-				'invalid-const-assignment',
-				is_binding,
-				// This takes advantage of the fact that we don't assign initial for let directives and then/catch variables.
-				// If we start doing that, we need another property on the binding to differentiate, or give up on the more precise error message.
-				binding.kind !== 'state' &&
-					binding.kind !== 'frozen_state' &&
-					(binding.kind !== 'normal' || !binding.initial)
-			);
+			// e.invalid_const_assignment(
+			// 	node,
+			// 	is_binding,
+			// 	// This takes advantage of the fact that we don't assign initial for let directives and then/catch variables.
+			// 	// If we start doing that, we need another property on the binding to differentiate, or give up on the more precise error message.
+			// 	binding.kind !== 'state' &&
+			// 		binding.kind !== 'frozen_state' &&
+			// 		(binding.kind !== 'normal' || !binding.initial)
+			// );
+
+			// TODO have a more specific error message for assignments to things like `{:then foo}`
+			const thing = 'constant';
+
+			if (is_binding) {
+				e.invalid_binding(node, thing);
+			} else {
+				e.invalid_assignment(node, thing);
+			}
 		}
 	}
 }
@@ -1048,16 +1051,16 @@ function validate_assignment(node, argument, state) {
 
 		if (state.analysis.runes) {
 			if (binding?.kind === 'derived') {
-				error(node, 'invalid-derived-assignment');
+				e.invalid_assignment(node, 'derived state');
 			}
 
 			if (binding?.kind === 'each') {
-				error(node, 'invalid-each-assignment');
+				e.invalid_each_assignment(node);
 			}
 		}
 
 		if (binding?.kind === 'snippet') {
-			error(node, 'invalid-snippet-assignment');
+			e.invalid_snippet_assignment(node);
 		}
 	}
 
@@ -1073,7 +1076,7 @@ function validate_assignment(node, argument, state) {
 
 	if (object.type === 'ThisExpression' && property?.type === 'PrivateIdentifier') {
 		if (state.private_derived_state.includes(property.name)) {
-			error(node, 'invalid-derived-assignment');
+			e.invalid_assignment(node, 'derived state');
 		}
 	}
 }
@@ -1081,7 +1084,7 @@ function validate_assignment(node, argument, state) {
 export const validation_runes = merge(validation, a11y_validators, {
 	LabeledStatement(node, { path }) {
 		if (node.label.name !== '$' || path.at(-1)?.type !== 'Program') return;
-		error(node, 'invalid-legacy-reactive-statement');
+		e.invalid_legacy_reactive_statement(node);
 	},
 	ExportNamedDeclaration(node, { state, next }) {
 		if (state.ast_type === 'module') {
@@ -1099,7 +1102,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 			if (node.declaration?.type !== 'VariableDeclaration') return;
 			if (node.declaration.kind !== 'let') return;
 			if (state.analysis.instance.scope !== state.scope) return;
-			error(node, 'invalid-legacy-export');
+			e.invalid_legacy_export(node);
 		}
 	},
 	ExportSpecifier(node, { state }) {
@@ -1110,12 +1113,12 @@ export const validation_runes = merge(validation, a11y_validators, {
 	CallExpression(node, { state, path }) {
 		const rune = get_rune(node, state.scope);
 		if (rune === '$bindable' && node.arguments.length > 1) {
-			error(node, 'invalid-rune-args-length', '$bindable', [0, 1]);
+			e.invalid_rune_args_length(node, '$bindable', 'zero or one arguments');
 		} else if (rune === '$host') {
 			if (node.arguments.length > 0) {
-				error(node, 'invalid-rune-args-length', '$host', [0]);
+				e.invalid_rune_args(node, '$host');
 			} else if (state.ast_type === 'module' || !state.analysis.custom_element) {
-				error(node, 'invalid-host-location');
+				e.invalid_host_location(node);
 			}
 		}
 
@@ -1127,7 +1130,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 			context.type === 'Identifier' &&
 			(context.name === '$state' || context.name === '$derived')
 		) {
-			error(node, 'invalid-state-location', context.name);
+			e.invalid_state_location(node, context.name);
 		}
 		next({ ...state });
 	},
@@ -1148,39 +1151,39 @@ export const validation_runes = merge(validation, a11y_validators, {
 
 		// TODO some of this is duplicated with above, seems off
 		if ((rune === '$derived' || rune === '$derived.by') && args.length !== 1) {
-			error(node, 'invalid-rune-args-length', rune, [1]);
+			e.invalid_rune_args_length(node, rune, 'exactly one argument');
 		} else if (rune === '$state' && args.length > 1) {
-			error(node, 'invalid-rune-args-length', rune, [0, 1]);
+			e.invalid_rune_args_length(node, rune, 'zero or one arguments');
 		} else if (rune === '$props') {
 			if (state.has_props_rune) {
-				error(node, 'duplicate-props-rune');
+				e.duplicate_props_rune(node);
 			}
 
 			state.has_props_rune = true;
 
 			if (args.length > 0) {
-				error(node, 'invalid-rune-args-length', rune, [0]);
+				e.invalid_rune_args(node, rune);
 			}
 
 			if (node.id.type !== 'ObjectPattern') {
-				error(node, 'invalid-props-id');
+				e.invalid_props_id(node);
 			}
 
 			if (state.scope !== state.analysis.instance.scope) {
-				error(node, 'invalid-props-location');
+				e.invalid_props_location(node);
 			}
 
 			for (const property of node.id.properties) {
 				if (property.type === 'Property') {
 					if (property.computed) {
-						error(property, 'invalid-props-pattern');
+						e.invalid_props_pattern(property);
 					}
 
 					const value =
 						property.value.type === 'AssignmentPattern' ? property.value.left : property.value;
 
 					if (value.type !== 'Identifier') {
-						error(property, 'invalid-props-pattern');
+						e.invalid_props_pattern(property);
 					}
 				}
 			}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
index 70f981d3e6..2498f24a69 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -1,5 +1,4 @@
 import { walk } from 'zimmerframe';
-import { error } from '../../../errors.js';
 import * as b from '../../../utils/builders.js';
 import { set_scope } from '../../scope.js';
 import { template_visitors } from './visitors/template.js';
@@ -52,35 +51,41 @@ export function client_component(source, analysis, options) {
 		get before_init() {
 			/** @type {any[]} */
 			const a = [];
-			a.push = () =>
-				error(null, 'INTERNAL', 'before_init.push should not be called outside create_block');
+			a.push = () => {
+				throw new Error('before_init.push should not be called outside create_block');
+			};
 			return a;
 		},
 		get init() {
 			/** @type {any[]} */
 			const a = [];
-			a.push = () => error(null, 'INTERNAL', 'init.push should not be called outside create_block');
+			a.push = () => {
+				throw new Error('init.push should not be called outside create_block');
+			};
 			return a;
 		},
 		get update() {
 			/** @type {any[]} */
 			const a = [];
-			a.push = () =>
-				error(null, 'INTERNAL', 'update.push should not be called outside create_block');
+			a.push = () => {
+				throw new Error('update.push should not be called outside create_block');
+			};
 			return a;
 		},
 		get after_update() {
 			/** @type {any[]} */
 			const a = [];
-			a.push = () =>
-				error(null, 'INTERNAL', 'after_update.push should not be called outside create_block');
+			a.push = () => {
+				throw new Error('after_update.push should not be called outside create_block');
+			};
 			return a;
 		},
 		get template() {
 			/** @type {any[]} */
 			const a = [];
-			a.push = () =>
-				error(null, 'INTERNAL', 'template.push should not be called outside create_block');
+			a.push = () => {
+				throw new Error('template.push should not be called outside create_block');
+			};
 			return a;
 		},
 		legacy_reactive_statements: new Map(),
@@ -209,7 +214,7 @@ export function client_component(source, analysis, options) {
 	for (const [node] of analysis.reactive_statements) {
 		const statement = [...state.legacy_reactive_statements].find(([n]) => n === node);
 		if (statement === undefined) {
-			error(node, 'INTERNAL', 'Could not find reactive statement');
+			throw new Error('Could not find reactive statement');
 		}
 		instance.body.push(statement[1]);
 	}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/utils.js
index 17e3fedc1d..481caf6561 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/utils.js
@@ -5,7 +5,6 @@ import {
 	is_simple_expression,
 	object
 } from '../../../utils/ast.js';
-import { error } from '../../../errors.js';
 import {
 	PROPS_IS_LAZY_INITIAL,
 	PROPS_IS_IMMUTABLE,
@@ -185,7 +184,7 @@ export function serialize_set_binding(node, context, fallback, options) {
 	}
 
 	if (assignee.type !== 'Identifier' && assignee.type !== 'MemberExpression') {
-		error(node, 'INTERNAL', `Unexpected assignment type ${assignee.type}`);
+		throw new Error(`Unexpected assignment type ${assignee.type}`);
 	}
 
 	// Handle class private/public state assignment cases
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
index e9d3b519c7..9c7706a17c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
@@ -16,7 +16,6 @@ import {
 import { DOMProperties, PassiveEvents, VoidElements } from '../../../constants.js';
 import { is_custom_element_node, is_element_node } from '../../../nodes.js';
 import * as b from '../../../../utils/builders.js';
-import { error } from '../../../../errors.js';
 import {
 	with_loc,
 	function_visitor,
@@ -1776,10 +1775,10 @@ export const template_visitors = {
 		);
 	},
 	ClassDirective(node, { state, next }) {
-		error(node, 'INTERNAL', 'Node should have been handled elsewhere');
+		throw new Error('Node should have been handled elsewhere');
 	},
 	StyleDirective(node, { state, next }) {
-		error(node, 'INTERNAL', 'Node should have been handled elsewhere');
+		throw new Error('Node should have been handled elsewhere');
 	},
 	TransitionDirective(node, { state, visit }) {
 		let flags = node.modifiers.includes('global') ? TRANSITION_GLOBAL : 0;
@@ -2775,7 +2774,7 @@ export const template_visitors = {
 				}
 
 				default:
-					error(node, 'INTERNAL', 'unknown binding ' + node.name);
+					throw new Error('unknown binding ' + node.name);
 			}
 		}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index 4f631b8c70..2f5ed1d4aa 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -22,7 +22,6 @@ import {
 	transform_inspect_rune
 } from '../utils.js';
 import { create_attribute, is_custom_element_node, is_element_node } from '../../nodes.js';
-import { error } from '../../../errors.js';
 import { binding_properties } from '../../bindings.js';
 import { regex_starts_with_newline, regex_whitespaces_strict } from '../../patterns.js';
 import {
@@ -419,7 +418,7 @@ function serialize_set_binding(node, context, fallback) {
 	}
 
 	if (node.left.type !== 'Identifier' && node.left.type !== 'MemberExpression') {
-		error(node, 'INTERNAL', `Unexpected assignment type ${node.left.type}`);
+		throw new Error(`Unexpected assignment type ${node.left.type}`);
 	}
 
 	let left = node.left;
@@ -1311,10 +1310,10 @@ const template_visitors = {
 		state.template.push(block_close);
 	},
 	ClassDirective(node) {
-		error(node, 'INTERNAL', 'Node should have been handled elsewhere');
+		throw new Error('Node should have been handled elsewhere');
 	},
 	StyleDirective(node) {
-		error(node, 'INTERNAL', 'Node should have been handled elsewhere');
+		throw new Error('Node should have been handled elsewhere');
 	},
 	RegularElement(node, context) {
 		const metadata = {
@@ -2106,14 +2105,17 @@ export function server_component(analysis, options) {
 		get init() {
 			/** @type {any[]} */
 			const a = [];
-			a.push = () => error(null, 'INTERNAL', 'init.push should not be called outside create_block');
+			a.push = () => {
+				throw new Error('init.push should not be called outside create_block');
+			};
 			return a;
 		},
 		get template() {
 			/** @type {any[]} */
 			const a = [];
-			a.push = () =>
-				error(null, 'INTERNAL', 'template.push should not be called outside create_block');
+			a.push = () => {
+				throw new Error('template.push should not be called outside create_block');
+			};
 			return a;
 		},
 		metadata: {
@@ -2181,7 +2183,7 @@ export function server_component(analysis, options) {
 	for (const [node] of analysis.reactive_statements) {
 		const statement = [...state.legacy_reactive_statements].find(([n]) => n === node);
 		if (statement === undefined) {
-			error(node, 'INTERNAL', 'Could not find reactive statement');
+			throw new Error('Could not find reactive statement');
 		}
 
 		if (
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index cfc2f0bb44..d815ff88fd 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -2,7 +2,7 @@ import is_reference from 'is-reference';
 import { walk } from 'zimmerframe';
 import { is_element_node } from './nodes.js';
 import * as b from '../utils/builders.js';
-import { error } from '../errors.js';
+import * as e from '../errors.js';
 import { extract_identifiers, extract_identifiers_from_destructuring } from '../utils/ast.js';
 import { JsKeywords, Runes } from './constants.js';
 
@@ -70,7 +70,7 @@ export class Scope {
 	 */
 	declare(node, kind, declaration_kind, initial = null) {
 		if (node.name === '$') {
-			error(node, 'invalid-dollar-binding');
+			e.invalid_dollar_binding(node);
 		}
 
 		if (
@@ -80,7 +80,7 @@ export class Scope {
 			declaration_kind !== 'rest_param' &&
 			this.function_depth <= 1
 		) {
-			error(node, 'invalid-dollar-prefix');
+			e.invalid_dollar_prefix(node);
 		}
 
 		if (this.parent) {
@@ -95,7 +95,7 @@ export class Scope {
 
 		if (this.declarations.has(node.name)) {
 			// This also errors on var/function types, but that's arguably a good thing
-			error(node, 'duplicate-declaration', node.name);
+			e.duplicate_declaration(node, node.name);
 		}
 
 		/** @type {import('#compiler').Binding} */
@@ -166,7 +166,7 @@ export class Scope {
 	get_bindings(node) {
 		const bindings = this.declarators.get(node);
 		if (!bindings) {
-			error(node, 'INTERNAL', 'No binding found for declarator');
+			throw new Error('No binding found for declarator');
 		}
 		return bindings;
 	}
@@ -767,7 +767,7 @@ export function get_rune(node, scope) {
 
 	joined = n.name + joined;
 
-	if (joined === '$derived.call') error(node, 'invalid-derived-call');
+	if (joined === '$derived.call') e.invalid_derived_call(node);
 	if (!Runes.includes(/** @type {any} */ (joined))) return null;
 
 	const binding = scope.get(n.name);
diff --git a/packages/svelte/src/compiler/utils/assert.js b/packages/svelte/src/compiler/utils/assert.js
index ac1cc2bd47..b6dc6bf90c 100644
--- a/packages/svelte/src/compiler/utils/assert.js
+++ b/packages/svelte/src/compiler/utils/assert.js
@@ -1,12 +1,10 @@
-import { error } from '../errors.js';
-
 /**
  * @template T
  * @param {T} value
  * @returns {asserts value is NonNullable<T>}
  */
 export function ok(value) {
-	if (!value) error(null, 'INTERNAL', 'Assertion failed');
+	if (!value) throw new Error('Assertion failed');
 }
 
 /**
@@ -16,5 +14,5 @@ export function ok(value) {
  * @returns {asserts actual is T}
  */
 export function equal(actual, expected) {
-	if (actual !== expected) error(null, 'INTERNAL', 'Assertion failed');
+	if (actual !== expected) throw new Error('Assertion failed');
 }
diff --git a/packages/svelte/src/compiler/validate-options.js b/packages/svelte/src/compiler/validate-options.js
index 6c12a43e2b..d9b0e9b1c3 100644
--- a/packages/svelte/src/compiler/validate-options.js
+++ b/packages/svelte/src/compiler/validate-options.js
@@ -1,4 +1,4 @@
-import { error } from './errors.js';
+import * as e from './errors.js';
 
 /**
  * @template [Input=any]
@@ -141,7 +141,7 @@ export const validate_component_options =
 function removed(msg) {
 	return (input) => {
 		if (input !== undefined) {
-			error(null, 'removed-compiler-option', msg);
+			e.removed_compiler_option(null, msg);
 		}
 		return /** @type {any} */ (undefined);
 	};
@@ -200,9 +200,8 @@ function object(children, allow_unknown = false) {
 				if (allow_unknown) {
 					output[key] = input[key];
 				} else {
-					error(
+					e.invalid_compiler_option(
 						null,
-						'invalid-compiler-option',
 						`Unexpected option ${keypath ? `${keypath}.${key}` : key}`
 					);
 				}
@@ -307,5 +306,5 @@ function fun(fallback) {
 
 /** @param {string} msg */
 function throw_error(msg) {
-	error(null, 'invalid-compiler-option', msg);
+	e.invalid_compiler_option(null, msg);
 }
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js
index 248fc1107e..9c29f505ee 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'missing-attribute-value',
+		code: 'missing_attribute_value',
 		message: 'Expected attribute value',
 		position: [12, 12]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js
index 5fc3e7b5fa..e655d40aae 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-sequence-expression',
+		code: 'invalid_sequence_expression',
 		message:
 			'Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses',
 		position: [124, 131]
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js
index 79ddec267b..15549974d3 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-sequence-expression',
+		code: 'invalid_sequence_expression',
 		message:
 			'Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses',
 		position: [163, 170]
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js
index e933cebbf5..5fb31858b7 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-attribute',
+		code: 'duplicate_attribute',
 		message: 'Attributes need to be unique',
 		position: [17, 17]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js
index e933cebbf5..5fb31858b7 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-attribute',
+		code: 'duplicate_attribute',
 		message: 'Attributes need to be unique',
 		position: [17, 17]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js
index e933cebbf5..5fb31858b7 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-attribute',
+		code: 'duplicate_attribute',
 		message: 'Attributes need to be unique',
 		position: [17, 17]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/catch-before-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/catch-before-closing/_config.js
index 1a50076da4..52786af6d8 100644
--- a/packages/svelte/tests/compiler-errors/samples/catch-before-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/catch-before-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'expected-token',
+		code: 'expected_token',
 		message: 'Expected token {:else}',
 		position: [35, 35]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js b/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js
index 64c85f85c9..b24874f1b4 100644
--- a/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-continuing-block-placement',
+		code: 'invalid_continuing_block_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [1, 1]
diff --git a/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js b/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js
index dca19b4606..d212e197f0 100644
--- a/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js
@@ -2,8 +2,9 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-state-location',
-		message: '$state(...) can only be used as a variable declaration initializer or a class field',
+		code: 'invalid_state_location',
+		message:
+			'`$state(...)` can only be used as a variable declaration initializer or a class field',
 		position: [33, 41]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/comment-unclosed/_config.js b/packages/svelte/tests/compiler-errors/samples/comment-unclosed/_config.js
index 7c00375ad6..38bc06f415 100644
--- a/packages/svelte/tests/compiler-errors/samples/comment-unclosed/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/comment-unclosed/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unexpected-eof',
-		message: 'Unexpected end of input (expected -->)',
+		code: 'expected_token',
+		message: 'Expected token -->',
 		position: [24, 24]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js
index 0085693908..2dafcd66b1 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-slot-name',
+		code: 'duplicate_slot_name',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js
index 0085693908..2dafcd66b1 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-slot-name',
+		code: 'duplicate_slot_name',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js
index 78e10808bd..1a8d68c564 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-default-slot-content',
+		code: 'invalid_default_slot_content',
 		message: 'Found default slot content alongside an explicit slot="default"'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js
index 0085693908..2dafcd66b1 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-slot-name',
+		code: 'duplicate_slot_name',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js
index 0085693908..2dafcd66b1 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-slot-name',
+		code: 'duplicate_slot_name',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js
index 0085693908..2dafcd66b1 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-slot-name',
+		code: 'duplicate_slot_name',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js
index 69c2adb23c..727e0c8bda 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-slot-placement',
+		code: 'invalid_slot_placement',
 		message:
 			"Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js
index 69c2adb23c..727e0c8bda 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-slot-placement',
+		code: 'invalid_slot_placement',
 		message:
 			"Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js
index 69c2adb23c..727e0c8bda 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-slot-placement',
+		code: 'invalid_slot_placement',
 		message:
 			"Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js
index 6a11aa63ec..77baf5a87e 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-css-global-block-combinator',
+		code: 'invalid_css_global_block_combinator',
 		message: 'A :global {...} block cannot follow a > combinator',
 		position: [12, 21]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js
index 7b637ca42e..5d2a52465f 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-css-global-block-declaration',
+		code: 'invalid_css_global_block_declaration',
 		message: 'A :global {...} block can only contain rules, not declarations',
 		position: [24, 34]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js
index 9e7cac667f..63b20e7e36 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-css-global-block-modifier',
+		code: 'invalid_css_global_block_modifier',
 		message: 'A :global {...} block cannot modify an existing selector',
 		position: [14, 21]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js
index 8021a9c677..bb189b05f5 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-css-global-block-list',
+		code: 'invalid_css_global_block_list',
 		message: 'A :global {...} block cannot be part of a selector list with more than one item',
 		position: [9, 31]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css/_config.js b/packages/svelte/tests/compiler-errors/samples/css/_config.js
index 9705cde6b5..74ef4c9c6c 100644
--- a/packages/svelte/tests/compiler-errors/samples/css/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-css-identifier',
+		code: 'invalid_css_identifier',
 		message: 'Expected a valid CSS identifier',
 		position: [25, 25]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js
index a49d35d090..7141ff1efd 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-dollar-binding',
+		code: 'invalid_dollar_binding',
 		message: 'The $ name is reserved, and cannot be used for variables and imports'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js
index 666b798323..ae86ca8d6b 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-global',
+		code: 'illegal_global',
 		message:
-			'$ is an illegal variable name. To reference a global variable called $, use globalThis.$'
+			'`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js
index 666b798323..ae86ca8d6b 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-global',
+		code: 'illegal_global',
 		message:
-			'$ is an illegal variable name. To reference a global variable called $, use globalThis.$'
+			'`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js
index a49d35d090..7141ff1efd 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-dollar-binding',
+		code: 'invalid_dollar_binding',
 		message: 'The $ name is reserved, and cannot be used for variables and imports'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js b/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js
index 6934ea4c55..4bb3edc27b 100644
--- a/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-binding',
-		message: "'value' binding can only be used with <input>, <textarea>, <select>"
+		code: 'bind_invalid_target',
+		message: '`bind:value` can only be used with <input>, <textarea>, <select>'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/else-before-closing-2/_config.js b/packages/svelte/tests/compiler-errors/samples/else-before-closing-2/_config.js
index dc9aff145c..54ef1afa7b 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-before-closing-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-before-closing-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'expected-token',
+		code: 'expected_token',
 		message: 'Expected token {:then ...} or {:catch ...}',
 		position: [24, 24]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js b/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js
index 80a2a136db..c052f05a18 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-continuing-block-placement',
+		code: 'invalid_continuing_block_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [6, 6]
diff --git a/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js
index 87c1296f49..6883152c09 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-continuing-block-placement',
+		code: 'invalid_continuing_block_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [18, 18]
diff --git a/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js b/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js
index 4b4059cf3b..d2ab9b9090 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-continuing-block-placement',
+		code: 'invalid_continuing_block_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [17, 17]
diff --git a/packages/svelte/tests/compiler-errors/samples/else-if-before-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/else-if-before-closing/_config.js
index ae20d2da8c..da19e5e806 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-if-before-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-if-before-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'expected-token',
+		code: 'expected_token',
 		message: 'Expected token {:then ...} or {:catch ...}',
 		position: [26, 26]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/else-if-without-if/_config.js b/packages/svelte/tests/compiler-errors/samples/else-if-without-if/_config.js
index 04d8342f20..706e610cba 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-if-without-if/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-if-without-if/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'expected-token',
+		code: 'expected_token',
 		message: 'Expected token {:then ...} or {:catch ...}',
 		position: [27, 27]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js b/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js
index 5c6855f41b..fd20583e57 100644
--- a/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'empty-attribute-shorthand',
+		code: 'empty_attribute_shorthand',
 		message: 'Attribute shorthand cannot be empty',
 		position: [6, 6]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js
index bd1d1d7682..087c2e55d9 100644
--- a/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'empty-directive-name',
+		code: 'empty_directive_name',
 		message: 'ClassDirective name cannot be empty',
 		position: [10, 10]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js b/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js
index 48a0eb32c4..22338ec818 100644
--- a/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'empty-directive-name',
+		code: 'empty_directive_name',
 		message: 'UseDirective name cannot be empty',
 		position: [8, 8]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js b/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js
index fd70495836..9e77a92f52 100644
--- a/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-derived-export',
+		code: 'invalid_derived_export',
 		message:
 			'Cannot export derived state from a module. To expose the current derived value, export a function returning its value',
 		position: [24, 66]
diff --git a/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js b/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js
index f1bad80670..3cc26ce501 100644
--- a/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-state-export',
+		code: 'invalid_state_export',
 		message:
 			"Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties",
 		position: [76, 114]
diff --git a/packages/svelte/tests/compiler-errors/samples/export-state/_config.js b/packages/svelte/tests/compiler-errors/samples/export-state/_config.js
index 1f7bd0f767..94d31700f2 100644
--- a/packages/svelte/tests/compiler-errors/samples/export-state/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/export-state/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-state-export',
+		code: 'invalid_state_export',
 		message:
 			"Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties",
 		position: [46, 86]
diff --git a/packages/svelte/tests/compiler-errors/samples/illegal-expression/_config.js b/packages/svelte/tests/compiler-errors/samples/illegal-expression/_config.js
index 887f11e882..bef5afd00d 100644
--- a/packages/svelte/tests/compiler-errors/samples/illegal-expression/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/illegal-expression/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'js-parse-error',
+		code: 'js_parse_error',
 		message: 'Assigning to rvalue',
 		position: [1, 1]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js
index a507812928..b0ee9ddfd4 100644
--- a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-snippet-assignment',
+		code: 'invalid_snippet_assignment',
 		message: 'Cannot reassign or bind to snippet parameter'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js
index a507812928..b0ee9ddfd4 100644
--- a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-snippet-assignment',
+		code: 'invalid_snippet_assignment',
 		message: 'Cannot reassign or bind to snippet parameter'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js
index f2503be0e3..247cc5b09f 100644
--- a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-const-assignment',
-		message: 'Invalid assignment to const variable'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js
index f2503be0e3..247cc5b09f 100644
--- a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-const-assignment',
-		message: 'Invalid assignment to const variable'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js b/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js
index 50cf2583af..f42fd1af86 100644
--- a/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-style-element',
-		message: 'A component can have a single top-level <style> element',
+		code: 'duplicate_style_element',
+		message: 'A component can have a single top-level `<style>` element',
 		position: [58, 58]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/options-children/_config.js b/packages/svelte/tests/compiler-errors/samples/options-children/_config.js
index d08406c499..5ec5f02752 100644
--- a/packages/svelte/tests/compiler-errors/samples/options-children/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/options-children/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-element-content',
+		code: 'invalid_element_content',
 		message: '<svelte:options> cannot have children',
 		position: [16, 16]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js b/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js
index 67d197780e..06adb4706c 100644
--- a/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'missing-whitespace',
+		code: 'missing_whitespace',
 		message: 'Expected whitespace',
 		position: [6, 6]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js b/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js
index 47bd37699c..f1380710e2 100644
--- a/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-render-call',
+		code: 'invalid_render_call',
 		message: 'Calling a snippet function using apply, bind or call is not allowed'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js
index d597478bb2..7b2f863d7c 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-runes-mode-import',
+		code: 'invalid_runes_mode_import',
 		message: 'beforeUpdate cannot be used in runes mode'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js
index d2a4eab786..9620704d61 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-props-rune',
-		message: 'Cannot use $props() more than once'
+		code: 'duplicate_props_rune',
+		message: 'Cannot use `$props()` more than once'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js
index 800bdbe853..50cfed6032 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-legacy-export',
+		code: 'invalid_legacy_export',
 		message: 'Cannot use `export let` in runes mode — use $props instead'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js
index fb1be5730b..22f2f6596a 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-state-export',
+		code: 'invalid_state_export',
 		message:
 			"Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties",
 		position: [28, 53]
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js
index 55eb0280ae..e60f4e86e7 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-each-assignment',
+		code: 'invalid_each_assignment',
 		message:
-			"Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. 'array[i] = value' instead of 'entry = value')"
+			'Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js
index 55eb0280ae..e60f4e86e7 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-each-assignment',
+		code: 'invalid_each_assignment',
 		message:
-			"Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. 'array[i] = value' instead of 'entry = value')"
+			'Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js
index f2503be0e3..247cc5b09f 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-const-assignment',
-		message: 'Invalid assignment to const variable'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js
index f2503be0e3..247cc5b09f 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-const-assignment',
-		message: 'Invalid assignment to const variable'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js
index 6e40da1a81..1fae570f91 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-derived-assignment',
-		message: 'Invalid assignment to derived state'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js
index 3a27b1f9bd..b2f418e384 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-derived-binding',
-		message: 'Invalid binding to derived state'
+		code: 'invalid_binding',
+		message: 'Cannot bind to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js
index 6e40da1a81..1fae570f91 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-derived-assignment',
-		message: 'Invalid assignment to derived state'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js
index 6e40da1a81..1fae570f91 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-derived-assignment',
-		message: 'Invalid assignment to derived state'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js
index 6e40da1a81..1fae570f91 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-derived-assignment',
-		message: 'Invalid assignment to derived state'
+		code: 'invalid_assignment',
+		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js
index 9089b6acca..00edfe51b3 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-state-location',
-		message: '$state(...) can only be used as a variable declaration initializer or a class field'
+		code: 'invalid_state_location',
+		message: '`$state(...)` can only be used as a variable declaration initializer or a class field'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js
index a6e4a4c018..cfd4f2cb67 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'conflicting-property-name',
+		code: 'conflicting_property_name',
 		message: 'Cannot have a property and a component export with the same name'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js
index 0d1d0e0709..1024076a6a 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-rune-args-length',
-		message: '$bindable can only be called with 0 or 1 arguments'
+		code: 'invalid_rune_args_length',
+		message: '`$bindable` must be called with zero or one arguments'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js
index bc92ee9ced..76d48b43be 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-bindable-location',
-		message: '$bindable() can only be used inside a $props() declaration'
+		code: 'invalid_bindable_location',
+		message: '`$bindable()` can only be used inside a `$props()` declaration'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js
index 7a37736485..4b9ad2c572 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-rune-args-length',
-		message: '$derived can only be called with 1 argument'
+		code: 'invalid_rune_args_length',
+		message: '`$derived` must be called with exactly one argument'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js
index 73c8bf1299..5bde7150ec 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js
@@ -2,7 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-state-location',
-		message: '$derived(...) can only be used as a variable declaration initializer or a class field'
+		code: 'invalid_state_location',
+		message:
+			'`$derived(...)` can only be used as a variable declaration initializer or a class field'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js
index 3ebcd022a9..ed08b7682a 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-rune-args-length',
-		message: '$effect can only be called with 1 argument'
+		code: 'invalid_rune_args_length',
+		message: '`$effect` must be called with exactly one argument'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js
index 529fe44137..b8c4ad0c05 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-effect-location',
-		message: '$effect() can only be used as an expression statement'
+		code: 'invalid_effect_location',
+		message: '`$effect()` can only be used as an expression statement'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js
index f848528c6c..37c34a7384 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-host-location',
-		message: '$host() can only be used inside custom element component instances'
+		code: 'invalid_host_location',
+		message: '`$host()` can only be used inside custom element component instances'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js
index c37b3486bd..eb6bc22ed5 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-rune-args-length',
-		message: '$props can only be called with 0 arguments'
+		code: 'invalid_rune_args',
+		message: '`$props` cannot be called with arguments'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js
index 0067f4f986..ebf5040fff 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-props-location',
+		code: 'invalid_props_location',
 		message:
-			'$props() can only be used at the top level of components as a variable declaration initializer'
+			'`$props()` can only be used at the top level of components as a variable declaration initializer'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js
index 2d995aa0c1..30fd430140 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-rune-args-length',
-		message: '$state can only be called with 0 or 1 arguments'
+		code: 'invalid_rune_args_length',
+		message: '`$state` must be called with zero or one arguments'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js
index 9089b6acca..00edfe51b3 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-state-location',
-		message: '$state(...) can only be used as a variable declaration initializer or a class field'
+		code: 'invalid_state_location',
+		message: '`$state(...)` can only be used as a variable declaration initializer or a class field'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js
index c701cfac7e..ab7ce7b201 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-rune-args-length',
-		message: '$state.snapshot can only be called with 1 argument'
+		code: 'invalid_rune_args_length',
+		message: '`$state.snapshot` must be called with exactly one argument'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/script-unclosed-eof/_config.js b/packages/svelte/tests/compiler-errors/samples/script-unclosed-eof/_config.js
index c8b496e41e..5c2c74eb54 100644
--- a/packages/svelte/tests/compiler-errors/samples/script-unclosed-eof/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/script-unclosed-eof/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unexpected-eof',
+		code: 'unexpected_eof',
 		message: 'Unexpected end of input',
 		position: [32, 32]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js b/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js
index 30c59d6f28..04ec9db510 100644
--- a/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed-element',
-		message: '<script> was left open',
+		code: 'unclosed_element',
+		message: '`<script>` was left open',
 		position: [32, 32]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js b/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js
index 8148e18332..be27484ce6 100644
--- a/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js
@@ -2,9 +2,9 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-self-placement',
+		code: 'invalid_self_placement',
 		message:
-			'<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components',
+			'`<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components',
 		position: [1, 1]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js b/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js
index c027d4fd5b..d85305d319 100644
--- a/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js
@@ -2,9 +2,9 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'conflicting-slot-usage',
+		code: 'conflicting_slot_usage',
 		message:
-			'Cannot use <slot> syntax and {@render ...} tags in the same component. Migrate towards {@render ...} tags completely.',
+			'Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.',
 		position: [71, 84]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js b/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js
index 3fd2caaeda..747c75ad3a 100644
--- a/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'conflicting-children-snippet',
+		code: 'conflicting_children_snippet',
 		message:
 			'Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block',
 		position: [320, 353]
diff --git a/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js b/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js
index 526d292530..5f45a792bf 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-subscription',
-		message: 'Cannot reference store value inside <script context="module">',
+		code: 'illegal_subscription',
+		message: 'Cannot reference store value inside `<script context="module">`',
 		position: [164, 168]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js b/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js
index 2a7d0fa0ec..6a49672737 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-store-subscription',
+		code: 'illegal_store_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js b/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js
index 94a461f3aa..649aeffd37 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-global',
+		code: 'illegal_global',
 		message:
-			'$foo is an illegal variable name. To reference a global variable called $foo, use globalThis.$foo'
+			'`$foo` is an illegal variable name. To reference a global variable called `$foo`, use `globalThis.$foo`'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js b/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js
index 97bc9d4c3d..d2ef4fa288 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-dollar-prefix',
+		code: 'invalid_dollar_prefix',
 		message: 'The $ prefix is reserved, and cannot be used for variables and imports'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js
index f320abac21..85112aa728 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-store-subscription',
+		code: 'illegal_store_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component',
 		position: [142, 147]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js
index 74e25f3bf1..dea59242b9 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-store-subscription',
+		code: 'illegal_store_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component',
 		position: [167, 172]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js
index 2a7d0fa0ec..6a49672737 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-store-subscription',
+		code: 'illegal_store_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js b/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js
index 2a7d0fa0ec..6a49672737 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal-store-subscription',
+		code: 'illegal_store_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/style-unclosed-eof/_config.js b/packages/svelte/tests/compiler-errors/samples/style-unclosed-eof/_config.js
index 8d27a7297d..e915428ca6 100644
--- a/packages/svelte/tests/compiler-errors/samples/style-unclosed-eof/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/style-unclosed-eof/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'expected-token',
+		code: 'expected_token',
 		message: 'Expected token </style',
 		position: [31, 31]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js b/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js
index 602f196039..294867d7f5 100644
--- a/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-css-identifier',
+		code: 'invalid_css_identifier',
 		message: 'Expected a valid CSS identifier',
 		position: [9, 9]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js b/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js
index b88609ffe9..f5ff354027 100644
--- a/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js
@@ -2,9 +2,9 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-svelte-tag',
+		code: 'invalid_svelte_tag',
 		message:
-			'Valid <svelte:...> tag names are svelte:head, svelte:options, svelte:window, svelte:document, svelte:body, svelte:element, svelte:component, svelte:self or svelte:fragment',
+			'Valid `<svelte:...>` tag names are svelte:head, svelte:options, svelte:window, svelte:document, svelte:body, svelte:element, svelte:component, svelte:self or svelte:fragment',
 		position: [10, 10]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js
index 7c1ea02cc1..cef6538067 100644
--- a/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-continuing-block-placement',
+		code: 'invalid_continuing_block_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [21, 21]
diff --git a/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js b/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js
index 64c85f85c9..b24874f1b4 100644
--- a/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-continuing-block-placement',
+		code: 'invalid_continuing_block_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [1, 1]
diff --git a/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js b/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js
index 2f4ec8835f..5a33a0c237 100644
--- a/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed-attribute-value',
+		code: 'unclosed_attribute_value',
 		message: 'Expected closing } character',
 		position: [19, 19]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-b/_config.js b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-b/_config.js
index e69ada8861..25dbf88c64 100644
--- a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-b/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-b/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unexpected-eof',
+		code: 'unexpected_eof',
 		message: 'Unexpected end of input',
 		position: [2, 2]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-c/_config.js b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-c/_config.js
index 47a1b49f03..edaeb89e40 100644
--- a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-c/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-c/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unexpected-eof',
+		code: 'unexpected_eof',
 		message: 'Unexpected end of input',
 		position: [1, 1]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js
index b10de772d3..5099013e16 100644
--- a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed-block',
+		code: 'unclosed_block',
 		message: 'Block was left open',
 		position: [0, 1]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js
index 8ff85b7243..6ab0c7f716 100644
--- a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed-element',
-		message: '<div> was left open',
+		code: 'unclosed_element',
+		message: '`<div>` was left open',
 		position: [0, 1]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js
index e0b8622711..824db2ae2e 100644
--- a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-closing-tag',
+		code: 'invalid_closing_tag',
 		message: '</p> attempted to close an element that was not open',
 		position: [38, 38]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js
index 38731fed64..bfd76bff4f 100644
--- a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-closing-tag-after-autoclose',
+		code: 'invalid_closing_tag_after_autoclose',
 		message:
 			'</p> attempted to close element that was already automatically closed by <pre> (cannot nest <pre> inside <p>)',
 		position: [24, 24]
diff --git a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js
index dd6995d832..6609a11e42 100644
--- a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-closing-tag',
+		code: 'invalid_closing_tag',
 		message: '</div> attempted to close an element that was not open',
 		position: [0, 0]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js
index 704d8c6029..360fcec971 100644
--- a/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-void-content',
+		code: 'invalid_void_content',
 		message: 'Void elements cannot have children or closing tags',
 		position: [23, 23]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/window-children/_config.js b/packages/svelte/tests/compiler-errors/samples/window-children/_config.js
index 33b57bf5f6..a788c01ad5 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-children/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-children/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-element-content',
+		code: 'invalid_element_content',
 		message: '<svelte:window> cannot have children',
 		position: [15, 15]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js b/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js
index 9c068c0297..fed30e9475 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate-svelte-element',
+		code: 'duplicate_svelte_element',
 		message: 'A component can only have one <svelte:window> element',
 		position: [17, 17]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js b/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js
index 698c3813e6..36bda11a77 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-svelte-element-placement',
+		code: 'invalid_svelte_element_placement',
 		message: '<svelte:window> tags cannot be inside elements or blocks',
 		position: [11, 11]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js b/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js
index 04aba56e54..844353ac1b 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid-svelte-element-placement',
+		code: 'invalid_svelte_element_placement',
 		message: '<svelte:window> tags cannot be inside elements or blocks',
 		position: [7, 7]
 	}
diff --git a/packages/svelte/tests/validator/samples/action-on-component/errors.json b/packages/svelte/tests/validator/samples/action-on-component/errors.json
index 6516cf9108..f190f2282f 100644
--- a/packages/svelte/tests/validator/samples/action-on-component/errors.json
+++ b/packages/svelte/tests/validator/samples/action-on-component/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-component-directive",
+		"code": "invalid_component_directive",
 		"message": "This type of directive is not valid on components",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/animation-duplicate/errors.json b/packages/svelte/tests/validator/samples/animation-duplicate/errors.json
index 2a1ba6b5ac..03229646be 100644
--- a/packages/svelte/tests/validator/samples/animation-duplicate/errors.json
+++ b/packages/svelte/tests/validator/samples/animation-duplicate/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "duplicate-animation",
+		"code": "animation_duplicate",
 		"message": "An element can only have one 'animate' directive",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/animation-not-in-each/errors.json b/packages/svelte/tests/validator/samples/animation-not-in-each/errors.json
index d296c8994d..2b5f73585d 100644
--- a/packages/svelte/tests/validator/samples/animation-not-in-each/errors.json
+++ b/packages/svelte/tests/validator/samples/animation-not-in-each/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-animation",
-		"message": "An element that uses the animate directive must be the immediate child of a keyed each block",
+		"code": "animation_invalid_placement",
+		"message": "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/animation-not-in-keyed-each/errors.json b/packages/svelte/tests/validator/samples/animation-not-in-keyed-each/errors.json
index 709ad5e196..945376a1b1 100644
--- a/packages/svelte/tests/validator/samples/animation-not-in-keyed-each/errors.json
+++ b/packages/svelte/tests/validator/samples/animation-not-in-keyed-each/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-animation",
-		"message": "An element that uses the animate directive must be used inside a keyed each block. Did you forget to add a key to your each block?",
+		"code": "animation_missing_key",
+		"message": "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?",
 		"start": {
 			"line": 6,
 			"column": 6
diff --git a/packages/svelte/tests/validator/samples/animation-on-component/errors.json b/packages/svelte/tests/validator/samples/animation-on-component/errors.json
index eabf72bb02..f904517a89 100644
--- a/packages/svelte/tests/validator/samples/animation-on-component/errors.json
+++ b/packages/svelte/tests/validator/samples/animation-on-component/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-component-directive",
+		"code": "invalid_component_directive",
 		"message": "This type of directive is not valid on components",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/animation-siblings/errors.json b/packages/svelte/tests/validator/samples/animation-siblings/errors.json
index 709f7006ce..b6412ebca4 100644
--- a/packages/svelte/tests/validator/samples/animation-siblings/errors.json
+++ b/packages/svelte/tests/validator/samples/animation-siblings/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-animation",
-		"message": "An element that uses the animate directive must be the sole child of a keyed each block",
+		"code": "animation_invalid_placement",
+		"message": "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block",
 		"start": {
 			"line": 6,
 			"column": 6
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json
index 1b74f51563..e4b6b6b329 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid assignment to const variable",
+		"code": "invalid_assignment",
+		"message": "Cannot assign to constant",
 		"start": {
 			"line": 13,
 			"column": 24
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json
index b00dd32495..7c92566f1f 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid assignment to const variable",
+		"code": "invalid_assignment",
+		"message": "Cannot assign to constant",
 		"start": {
 			"line": 14,
 			"column": 3
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json
index 1fcfaf2406..e714e99a38 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid assignment to const variable",
+		"code": "invalid_assignment",
+		"message": "Cannot assign to constant",
 		"start": {
 			"line": 17,
 			"column": 2
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json
index 9bff01645a..41002cd83e 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid assignment to const variable",
+		"code": "invalid_assignment",
+		"message": "Cannot assign to constant",
 		"start": {
 			"line": 3,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json
index 02e5503b16..01c1aefb7e 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid assignment to const variable",
+		"code": "invalid_assignment",
+		"message": "Cannot assign to constant",
 		"start": {
 			"line": 3,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const/errors.json
index 88d6b728b9..6963a3737b 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid assignment to const variable",
+		"code": "invalid_assignment",
+		"message": "Cannot assign to constant",
 		"start": {
 			"line": 16,
 			"column": 2
diff --git a/packages/svelte/tests/validator/samples/attribute-expected-equals/errors.json b/packages/svelte/tests/validator/samples/attribute-expected-equals/errors.json
index deb2331622..f3b90628ab 100644
--- a/packages/svelte/tests/validator/samples/attribute-expected-equals/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-expected-equals/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "expected-token",
+		"code": "expected_token",
 		"message": "Expected token =",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json
index 0e4afb3009..f99b36ff36 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-attribute-name",
+		"code": "invalid_attribute_name",
 		"message": "'3aa' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json
index c13a5c5b90..7c49600412 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-attribute-name",
+		"code": "invalid_attribute_name",
 		"message": "'a*a' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json
index 4cccb34b28..693c080dd1 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-attribute-name",
+		"code": "invalid_attribute_name",
 		"message": "'-a' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json
index b99bb946ae..4a5b59bbe8 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-attribute-name",
+		"code": "invalid_attribute_name",
 		"message": "'a;' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json
index 5b674a6f7d..6e9e2dc0f1 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-attribute-name",
+		"code": "invalid_attribute_name",
 		"message": "'}' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/binding-await-catch/errors.json b/packages/svelte/tests/validator/samples/binding-await-catch/errors.json
index 8cdef47534..4da88c4576 100644
--- a/packages/svelte/tests/validator/samples/binding-await-catch/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-await-catch/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid binding to const variable ($derived values, let: directives, :then/:catch variables and @const declarations count as const)",
-		"start": { "line": 6, "column": 9 },
-		"end": { "line": 6, "column": 27 }
+		"code": "invalid_binding",
+		"message": "Cannot bind to constant",
+		"start": {
+			"line": 6,
+			"column": 9
+		},
+		"end": {
+			"line": 6,
+			"column": 27
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json b/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json
index 050d02f42b..a5c222822c 100644
--- a/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid binding to const variable ($derived values, let: directives, :then/:catch variables and @const declarations count as const)",
-		"start": { "line": 6, "column": 9 },
-		"end": { "line": 6, "column": 19 }
+		"code": "invalid_binding",
+		"message": "Cannot bind to constant",
+		"start": {
+			"line": 6,
+			"column": 9
+		},
+		"end": {
+			"line": 6,
+			"column": 19
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/binding-await-then/errors.json b/packages/svelte/tests/validator/samples/binding-await-then/errors.json
index ec6467441e..69675cf0e7 100644
--- a/packages/svelte/tests/validator/samples/binding-await-then/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-await-then/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid binding to const variable ($derived values, let: directives, :then/:catch variables and @const declarations count as const)",
-		"start": { "line": 5, "column": 9 },
-		"end": { "line": 5, "column": 19 }
+		"code": "invalid_binding",
+		"message": "Cannot bind to constant",
+		"start": {
+			"line": 5,
+			"column": 9
+		},
+		"end": {
+			"line": 5,
+			"column": 19
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/binding-const/errors.json b/packages/svelte/tests/validator/samples/binding-const/errors.json
index cf3522eef1..d2f8b1a8b3 100644
--- a/packages/svelte/tests/validator/samples/binding-const/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-const/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid binding to const variable",
+		"code": "invalid_binding",
+		"message": "Cannot bind to constant",
 		"start": {
 			"line": 5,
 			"column": 7
diff --git a/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json b/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json
index b1969bfd5f..4d3819453c 100644
--- a/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'offsetWidth' binding can only be used with non-<svg> elements. Use 'clientWidth' for <svg> instead",
+		"code": "bind_invalid_target",
+		"message": "`bind:offsetWidth` can only be used with non-<svg> elements. Use 'clientWidth' for <svg> instead",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/binding-input-checked/errors.json b/packages/svelte/tests/validator/samples/binding-input-checked/errors.json
index 50abdd6df9..574b25e06f 100644
--- a/packages/svelte/tests/validator/samples/binding-input-checked/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-input-checked/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'checked' binding can only be used with <input type=\"checkbox\">",
+		"code": "bind_invalid_target",
+		"message": "`bind:checked` can only be used with <input type=\"checkbox\">",
 		"start": {
 			"line": 5,
 			"column": 7
diff --git a/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json b/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json
index 6a4807a7b1..87a3f6f8ea 100644
--- a/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-type-attribute",
+		"code": "invalid_type_attribute",
 		"message": "'type' attribute must be a static text value if input uses two-way binding",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
index 7b6d4f51db..de997e5394 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'value' is not a valid binding. Foreign elements only support bind:this",
+		"code": "bind_invalid_detailed",
+		"message": "`bind:value` is not a valid binding. Foreign elements only support `bind:this`",
 		"start": {
 			"line": 6,
 			"column": 7
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json
index c379a94d5a..92111a4ec2 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'open' binding can only be used with <details>",
+		"code": "bind_invalid_target",
+		"message": "`bind:open` can only be used with <details>",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json
index 9898ad8fa5..6626afc1d0 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'value' binding can only be used with <input>, <textarea>, <select>",
+		"code": "bind_invalid_target",
+		"message": "`bind:value` can only be used with <input>, <textarea>, <select>",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json
index cff83b012e..82e86887bd 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-binding-value",
+		"code": "invalid_binding_value",
 		"message": "Can only bind to state or props",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json
index a6e53e4e36..34026c52ac 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-binding-value",
+		"code": "invalid_binding_value",
 		"message": "Can only bind to state or props",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid/errors.json b/packages/svelte/tests/validator/samples/binding-invalid/errors.json
index fdd0ada258..9e0e455eaf 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'whatever' is not a valid binding",
+		"code": "bind_invalid",
+		"message": "`bind:whatever` is not a valid binding",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/binding-let/errors.json b/packages/svelte/tests/validator/samples/binding-let/errors.json
index c6c734cf91..88e038bba5 100644
--- a/packages/svelte/tests/validator/samples/binding-let/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-let/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid binding to const variable ($derived values, let: directives, :then/:catch variables and @const declarations count as const)",
+		"code": "invalid_binding",
+		"message": "Cannot bind to constant",
 		"start": {
 			"line": 6,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json b/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json
index 95ab7f91d4..b280929333 100644
--- a/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-multiple-attribute",
+		"code": "invalid_multiple_attribute",
 		"message": "'multiple' attribute must be static if select uses two-way binding",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json b/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json
index 3edd0059a3..14288a1385 100644
--- a/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Event modifiers other than 'once' can only be used on DOM elements",
-		"code": "invalid-event-modifier",
+		"code": "invalid_component_event_modifier",
 		"start": {
 			"line": 6,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json b/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json
index 6c37a888ff..3eeb050cdb 100644
--- a/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json
+++ b/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-component-directive",
+		"code": "invalid_component_directive",
 		"message": "This type of directive is not valid on components",
-		"start": { "line": 7, "column": 19 },
-		"end": { "line": 7, "column": 36 }
+		"start": {
+			"line": 7,
+			"column": 19
+		},
+		"end": {
+			"line": 7,
+			"column": 36
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json b/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json
index 5347d4737f..190c4d81a2 100644
--- a/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-slot-name",
-		"message": "default is a reserved word — it cannot be used as a slot name",
+		"code": "invalid_slot_name_default",
+		"message": "`default` is a reserved word — it cannot be used as a slot name",
 		"start": {
 			"line": 1,
 			"column": 6
diff --git a/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json b/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json
index 9194e8aa9b..238bd48d90 100644
--- a/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-slot-attribute",
+		"code": "invalid_slot_attribute",
 		"message": "slot attribute must be a static value",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json b/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json
index 963cb1f40d..0c08ef2dad 100644
--- a/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-slot-name",
+		"code": "invalid_slot_name",
 		"message": "slot attribute must be a static value",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json b/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json
index da10838a69..63960b846b 100644
--- a/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-slot-placement",
+		"code": "invalid_slot_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
-		"start": { "line": 10, "column": 9 },
-		"end": { "line": 10, "column": 19 }
+		"start": {
+			"line": 10,
+			"column": 9
+		},
+		"end": {
+			"line": 10,
+			"column": 19
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json b/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json
index 12d2407540..b04ef9e4aa 100644
--- a/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-slot-placement",
+		"code": "invalid_slot_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json b/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json
index 12d2407540..b04ef9e4aa 100644
--- a/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-slot-placement",
+		"code": "invalid_slot_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json b/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json
index 78beca08c7..07c6cbadca 100644
--- a/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "duplicate-declaration",
-		"message": "'a' has already been declared",
-		"start": { "line": 7, "column": 10 },
-		"end": { "line": 7, "column": 11 }
+		"code": "duplicate_declaration",
+		"message": "`a` has already been declared",
+		"start": {
+			"line": 7,
+			"column": 10
+		},
+		"end": {
+			"line": 7,
+			"column": 11
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json b/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json
index dc3c1322c7..543f2a0217 100644
--- a/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "duplicate-declaration",
-		"message": "'item' has already been declared",
-		"start": { "line": 6, "column": 10 },
-		"end": { "line": 6, "column": 14 }
+		"code": "duplicate_declaration",
+		"message": "`item` has already been declared",
+		"start": {
+			"line": 6,
+			"column": 10
+		},
+		"end": {
+			"line": 6,
+			"column": 14
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json b/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
index 66ff86663f..4db0868c16 100644
--- a/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-const-placement",
+		"code": "invalid_const_placement",
 		"message": "{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>",
-		"start": { "line": 5, "column": 0 },
-		"end": { "line": 5, "column": 18 }
+		"start": {
+			"line": 5,
+			"column": 0
+		},
+		"end": {
+			"line": 5,
+			"column": 18
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json b/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
index 6c14fdbaf7..33b24f369e 100644
--- a/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-const-placement",
+		"code": "invalid_const_placement",
 		"message": "{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>",
-		"start": { "line": 7, "column": 4 },
-		"end": { "line": 7, "column": 18 }
+		"start": {
+			"line": 7,
+			"column": 4
+		},
+		"end": {
+			"line": 7,
+			"column": 18
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json b/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json
index abe738f6cf..42f9deb4df 100644
--- a/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid assignment to const variable ($derived values, let: directives, :then/:catch variables and @const declarations count as const)",
-		"start": { "line": 7, "column": 26 },
-		"end": { "line": 7, "column": 30 }
+		"code": "invalid_assignment",
+		"message": "Cannot assign to constant",
+		"start": {
+			"line": 7,
+			"column": 26
+		},
+		"end": {
+			"line": 7,
+			"column": 30
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json b/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json
index a8c60a8b56..9f0d1d51e8 100644
--- a/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-const-assignment",
-		"message": "Invalid binding to const variable ($derived values, let: directives, :then/:catch variables and @const declarations count as const)",
-		"start": { "line": 7, "column": 9 },
-		"end": { "line": 7, "column": 23 }
+		"code": "invalid_binding",
+		"message": "Cannot bind to constant",
+		"start": {
+			"line": 7,
+			"column": 9
+		},
+		"end": {
+			"line": 7,
+			"column": 23
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json b/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json
index 27cc3e98c7..285a6f921d 100644
--- a/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json
+++ b/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "dynamic-contenteditable-attribute",
+		"code": "dynamic_contenteditable_attribute",
 		"message": "'contenteditable' attribute cannot be dynamic if element uses two-way binding",
 		"start": {
 			"line": 11,
diff --git a/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json b/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json
index 24a072dac8..616c45021b 100644
--- a/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json
+++ b/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "missing-contenteditable-attribute",
+		"code": "missing_contenteditable_attribute",
 		"message": "'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json
index d49bf7437a..eccbf62094 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-selector",
+		"code": "invalid_css_selector",
 		"message": "Invalid selector",
 		"start": {
 			"line": 10,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json
index 2fdf3e96d1..37cfb99c87 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-selector",
+		"code": "invalid_css_selector",
 		"message": "Invalid selector",
 		"start": {
 			"line": 8,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json
index b355260623..74fd26a692 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-selector",
+		"code": "invalid_css_selector",
 		"message": "Invalid selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json
index aab0a130c7..24f83fee73 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-selector",
+		"code": "invalid_css_selector",
 		"message": "Invalid selector",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json
index 1d359c01b3..1a11759e43 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-placement",
+		"code": "invalid_css_global_placement",
 		"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 		"start": {
 			"line": 8,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json
index 53e24d8d81..14fe638188 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-placement",
+		"code": "invalid_css_global_placement",
 		"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json
index fcc96361dd..539d91fb4d 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector-list",
+		"code": "invalid_css_global_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json
index fbbdefb60e..a3a6a13b77 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector-list",
+		"code": "invalid_css_global_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json
index 2b03fa8c2b..008a8ec266 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector-list",
+		"code": "invalid_css_global_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json
index 7ba32a53fb..a2c76f2366 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-placement",
+		"code": "invalid_css_global_placement",
 		"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json
index 36b3ec4753..e6952aca16 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector",
+		"code": "invalid_css_global_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 11,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json
index f4a75dcb17..5eaaee69d3 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector",
+		"code": "invalid_css_global_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json
index a6ae2d595b..d3f84026d6 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector",
+		"code": "invalid_css_global_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json
index 5ac729aa23..06ad62ef10 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector",
+		"code": "invalid_css_global_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json
index 5ac729aa23..06ad62ef10 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector",
+		"code": "invalid_css_global_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json
index 25399f6369..41fc6235e2 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector-list",
+		"code": "invalid_css_global_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 20,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json
index 40bae7d4d7..50dfec051b 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-global-selector",
+		"code": "invalid_css_global_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 11,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json b/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json
index f58f92d6ee..d5a2602fb6 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-type-selector-placement",
+		"code": "invalid_css_type_selector_placement",
 		"message": ":global(...) must not be followed with a type selector",
 		"start": {
 			"line": 17,
diff --git a/packages/svelte/tests/validator/samples/css-mismatched-quotes/errors.json b/packages/svelte/tests/validator/samples/css-mismatched-quotes/errors.json
index 6919f50ce9..cf5ade9b0e 100644
--- a/packages/svelte/tests/validator/samples/css-mismatched-quotes/errors.json
+++ b/packages/svelte/tests/validator/samples/css-mismatched-quotes/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "unexpected-eof",
+		"code": "unexpected_eof",
 		"message": "Unexpected end of input",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json b/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json
index b21af2c438..40d459912c 100644
--- a/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json
+++ b/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-debug",
+		"code": "invalid_debug",
 		"message": "{@debug ...} arguments must be identifiers, not arbitrary expressions",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json b/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json
index 064c5a4f5a..4615556188 100644
--- a/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json
+++ b/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "default-export",
+		"code": "default_export",
 		"message": "A component cannot have a default export",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json b/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json
index 7e20c7c9d4..652aff0e54 100644
--- a/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json
+++ b/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "default-export",
+		"code": "default_export",
 		"message": "A component cannot have a default export",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/default-export/errors.json b/packages/svelte/tests/validator/samples/default-export/errors.json
index 6131408037..5b786d2222 100644
--- a/packages/svelte/tests/validator/samples/default-export/errors.json
+++ b/packages/svelte/tests/validator/samples/default-export/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "default-export",
+		"code": "default_export",
 		"message": "A component cannot have a default export",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/directive-non-expression/errors.json b/packages/svelte/tests/validator/samples/directive-non-expression/errors.json
index 4d36ab28b3..f7a825454e 100644
--- a/packages/svelte/tests/validator/samples/directive-non-expression/errors.json
+++ b/packages/svelte/tests/validator/samples/directive-non-expression/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-directive-value",
+		"code": "invalid_directive_value",
 		"message": "Directive value must be a JavaScript expression enclosed in curly braces",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json
index 5624217e87..630f8c5ea2 100644
--- a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "illegal-global",
-		"message": "$$billsyall is an illegal variable name. To reference a global variable called $$billsyall, use globalThis.$$billsyall",
+		"code": "illegal_global",
+		"message": "`$$billsyall` is an illegal variable name. To reference a global variable called `$$billsyall`, use `globalThis.$$billsyall`",
 		"start": {
 			"line": 1,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json
index fac768b195..5876bcae80 100644
--- a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "illegal-global",
-		"message": "$$billsyall is an illegal variable name. To reference a global variable called $$billsyall, use globalThis.$$billsyall",
+		"code": "illegal_global",
+		"message": "`$$billsyall` is an illegal variable name. To reference a global variable called `$$billsyall`, use `globalThis.$$billsyall`",
 		"start": {
 			"line": 2,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json b/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json
index 847dacbca8..1623518ca0 100644
--- a/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "illegal-global",
-		"message": "$ is an illegal variable name. To reference a global variable called $, use globalThis.$",
+		"code": "illegal_global",
+		"message": "`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`",
 		"start": {
 			"line": 1,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json b/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json
index b924a535d8..5d33dc3d83 100644
--- a/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "illegal-global",
-		"message": "$ is an illegal variable name. To reference a global variable called $, use globalThis.$",
+		"code": "illegal_global",
+		"message": "`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`",
 		"start": {
 			"line": 2,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json b/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json
index 752d26e1b3..ccd34029d2 100644
--- a/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json
+++ b/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-svelte-element-definition",
+		"code": "invalid_svelte_element_definition",
 		"message": "Invalid element definition — must be an {expression}",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json b/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json
index 58c8af5c66..d31bd1964c 100644
--- a/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json
+++ b/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "missing-svelte-element-definition",
-		"message": "<svelte:element> must have a 'this' attribute",
+		"code": "missing_svelte_element_definition",
+		"message": "`<svelte:element>` must have a 'this' attribute",
 		"start": {
 			"line": 2,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/dynamic-element-this/errors.json b/packages/svelte/tests/validator/samples/dynamic-element-this/errors.json
index 4efad529ff..78ee8835be 100644
--- a/packages/svelte/tests/validator/samples/dynamic-element-this/errors.json
+++ b/packages/svelte/tests/validator/samples/dynamic-element-this/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "unexpected-reserved-word",
+		"code": "unexpected_reserved_word",
 		"message": "'this' is a reserved word in JavaScript and cannot be used here",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/each-block-destructured-object-rest-comma-after/errors.json b/packages/svelte/tests/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
index 13c3d150db..62494b230e 100644
--- a/packages/svelte/tests/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
+++ b/packages/svelte/tests/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "js-parse-error",
+		"code": "js_parse_error",
 		"message": "Comma is not permitted after the rest element",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured-object/errors.json b/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured-object/errors.json
index 3cb3bbe0db..7800f62247 100644
--- a/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured-object/errors.json
+++ b/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured-object/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "js-parse-error",
+		"code": "js_parse_error",
 		"message": "Unexpected keyword 'case'",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured/errors.json b/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured/errors.json
index 888bc761ac..42c0eb3883 100644
--- a/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured/errors.json
+++ b/packages/svelte/tests/validator/samples/each-block-invalid-context-destructured/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "js-parse-error",
+		"code": "js_parse_error",
 		"message": "Unexpected token",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/each-block-invalid-context/errors.json b/packages/svelte/tests/validator/samples/each-block-invalid-context/errors.json
index 72c68836a3..7b6d28004b 100644
--- a/packages/svelte/tests/validator/samples/each-block-invalid-context/errors.json
+++ b/packages/svelte/tests/validator/samples/each-block-invalid-context/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "unexpected-reserved-word",
+		"code": "unexpected_reserved_word",
 		"message": "'case' is a reserved word in JavaScript and cannot be used here",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/event-attribute/errors.json b/packages/svelte/tests/validator/samples/event-attribute/errors.json
index 28a8f9f11a..7204ea671b 100644
--- a/packages/svelte/tests/validator/samples/event-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/event-attribute/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Event attribute must be a JavaScript expression, not a string",
-		"code": "invalid-event-attribute-value",
+		"code": "invalid_event_attribute_value",
 		"start": {
 			"line": 4,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json b/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json
index 0230959777..c53951cb67 100644
--- a/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json
+++ b/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "The 'passive' and 'nonpassive' modifiers cannot be used together",
-		"code": "invalid-event-modifier-combination",
+		"code": "invalid_event_modifier_combination",
 		"start": {
 			"line": 1,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json b/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json
index db8289791a..d1def4dcb3 100644
--- a/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json
+++ b/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "The 'passive' and 'preventDefault' modifiers cannot be used together",
-		"code": "invalid-event-modifier-combination",
+		"code": "invalid_event_modifier_combination",
 		"start": {
 			"line": 1,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json b/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json
index b398cea5e4..178a5b5543 100644
--- a/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Valid event modifiers are preventDefault, stopPropagation, stopImmediatePropagation, capture, once, passive, nonpassive, self or trusted",
-		"code": "invalid-event-modifier",
+		"code": "invalid_event_modifier",
 		"start": {
 			"line": 1,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json b/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json
index 6c7237f030..5eedfb8971 100644
--- a/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-tag-placement",
+		"code": "invalid_tag_placement",
 		"message": "{@html ...} tag cannot be in attribute value",
-		"start": { "line": 1, "column": 12 },
-		"end": { "line": 1, "column": 12 }
+		"start": {
+			"line": 1,
+			"column": 12
+		},
+		"end": {
+			"line": 1,
+			"column": 12
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json b/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json
index 8d98066d55..c0e5d0e66a 100644
--- a/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json
+++ b/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-tag-placement",
+		"code": "invalid_tag_placement",
 		"message": "{@html ...} tag cannot be inside <textarea>",
-		"start": { "line": 2, "column": 1 },
-		"end": { "line": 2, "column": 1 }
+		"start": {
+			"line": 2,
+			"column": 1
+		},
+		"end": {
+			"line": 2,
+			"column": 1
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json b/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json
index 788784d1d8..d55986ec5a 100644
--- a/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json
+++ b/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "illegal-variable-declaration",
-		"message": "Cannot declare same variable name which is imported inside <script context=\"module\">",
+		"code": "illegal_variable_declaration",
+		"message": "Cannot declare same variable name which is imported inside `<script context=\"module\">`",
 		"start": {
 			"line": 12,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json b/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json
index 2ceb3a3694..299cb2fff5 100644
--- a/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json
+++ b/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-css-declaration",
+		"code": "invalid_css_declaration",
 		"message": "Declaration cannot be empty",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json b/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json
index fdd8af19c2..99fce66db0 100644
--- a/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-node-placement",
+		"code": "invalid_node_placement",
 		"message": "<div> is invalid inside <p>",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json b/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json
index 259b8f613b..1b43c778ee 100644
--- a/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-node-placement",
+		"code": "invalid_node_placement",
 		"message": "<a> is invalid inside <a>",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/let-directive/errors.json b/packages/svelte/tests/validator/samples/let-directive/errors.json
index bb239bafa7..5e4138812e 100644
--- a/packages/svelte/tests/validator/samples/let-directive/errors.json
+++ b/packages/svelte/tests/validator/samples/let-directive/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-let-directive-placement",
-		"message": "let directive at invalid position",
-		"start": { "line": 6, "column": 15 },
-		"end": { "line": 6, "column": 20 }
+		"code": "invalid_let_directive_placement",
+		"message": "`let:` directive at invalid position",
+		"start": {
+			"line": 6,
+			"column": 15
+		},
+		"end": {
+			"line": 6,
+			"column": 20
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json b/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json
index 883fc0e479..c1169837ea 100644
--- a/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-block-placement",
+		"code": "invalid_block_placement",
 		"message": "{#if ...} block cannot be in attribute value",
-		"start": { "line": 1, "column": 12 },
-		"end": { "line": 1, "column": 12 }
+		"start": {
+			"line": 1,
+			"column": 12
+		},
+		"end": {
+			"line": 1,
+			"column": 12
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json b/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json
index a371f9b76b..e9f8a9decf 100644
--- a/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json
+++ b/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-block-placement",
+		"code": "invalid_block_placement",
 		"message": "{#each ...} block cannot be inside <textarea>",
-		"start": { "line": 2, "column": 1 },
-		"end": { "line": 2, "column": 1 }
+		"start": {
+			"line": 2,
+			"column": 1
+		},
+		"end": {
+			"line": 2,
+			"column": 1
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json b/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json
index 58eb092928..ab06795527 100644
--- a/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json
+++ b/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-script-element",
-		"message": "A component can have a single top-level <script> element and/or a single top-level <script context=\"module\"> element",
+		"code": "duplicate_script_element",
+		"message": "A component can have a single top-level `<script>` element and/or a single top-level `<script context=\"module\">` element",
 		"start": {
 			"line": 5,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json b/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json
index 58eb092928..ab06795527 100644
--- a/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json
+++ b/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-script-element",
-		"message": "A component can have a single top-level <script> element and/or a single top-level <script context=\"module\"> element",
+		"code": "duplicate_script_element",
+		"message": "A component can have a single top-level `<script>` element and/or a single top-level `<script context=\"module\">` element",
 		"start": {
 			"line": 5,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/namespace-invalid/errors.json b/packages/svelte/tests/validator/samples/namespace-invalid/errors.json
index 7081b9da27..e381545dc0 100644
--- a/packages/svelte/tests/validator/samples/namespace-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/namespace-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-svelte-option-namespace",
-		"message": "Unsupported <svelte:option> value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\".",
+		"code": "invalid_svelte_option_namespace",
+		"message": "Unsupported `<svelte:option>` value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\"",
 		"start": {
 			"line": 1,
 			"column": 16
diff --git a/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json b/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json
index 30c7ea279e..f8b2c75f05 100644
--- a/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json
+++ b/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-svelte-option-namespace",
-		"message": "Unsupported <svelte:option> value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\".",
+		"code": "invalid_svelte_option_namespace",
+		"message": "Unsupported `<svelte:option>` value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\"",
 		"start": {
 			"line": 1,
 			"column": 16
diff --git a/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json b/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json
index b4e3161be6..26fbd26534 100644
--- a/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json
+++ b/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json
@@ -1,8 +1,14 @@
 [
 	{
 		"message": "Cyclical dependency detected: a → b → a",
-		"code": "cyclical-reactive-declaration",
-		"start": { "line": 5, "column": 1 },
-		"end": { "line": 5, "column": 14 }
+		"code": "cyclical_reactive_declaration",
+		"start": {
+			"line": 5,
+			"column": 1
+		},
+		"end": {
+			"line": 5,
+			"column": 14
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/script-invalid-context/errors.json b/packages/svelte/tests/validator/samples/script-invalid-context/errors.json
index d7a502a2f7..173958d6c6 100644
--- a/packages/svelte/tests/validator/samples/script-invalid-context/errors.json
+++ b/packages/svelte/tests/validator/samples/script-invalid-context/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-script-context",
+		"code": "invalid_script_context",
 		"message": "If the context attribute is supplied, its value must be \"module\"",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json b/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json
index a5a3855787..e421039874 100644
--- a/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-slot-placement",
+		"code": "invalid_slot_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json b/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json
index ba88102f40..3d1373e8cd 100644
--- a/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Invalid 'style:' modifier. Valid modifiers are: 'important'",
-		"code": "invalid-style-directive-modifier",
+		"code": "invalid_style_directive_modifier",
 		"start": {
 			"line": 1,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json b/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json
index 955d756a6d..cf34adc56b 100644
--- a/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-svelte-fragment-placement",
-		"message": "<svelte:fragment> must be the direct child of a component",
-		"start": { "line": 5, "column": 0 },
-		"end": { "line": 7, "column": 18 }
+		"code": "invalid_svelte_fragment_placement",
+		"message": "`<svelte:fragment>` must be the direct child of a component",
+		"start": {
+			"line": 5,
+			"column": 0
+		},
+		"end": {
+			"line": 7,
+			"column": 18
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json b/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json
index 2ad4c8390f..195b0fca19 100644
--- a/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-svelte-fragment-placement",
-		"message": "<svelte:fragment> must be the direct child of a component",
-		"start": { "line": 7, "column": 2 },
-		"end": { "line": 9, "column": 20 }
+		"code": "invalid_svelte_fragment_placement",
+		"message": "`<svelte:fragment>` must be the direct child of a component",
+		"start": {
+			"line": 7,
+			"column": 2
+		},
+		"end": {
+			"line": 9,
+			"column": 20
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json b/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json
index 026ba121ab..f230f20788 100644
--- a/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json
+++ b/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "illegal-svelte-head-attribute",
-		"message": "<svelte:head> cannot have attributes nor directives",
-		"start": { "line": 1, "column": 13 },
-		"end": { "line": 1, "column": 14 }
+		"code": "illegal_svelte_head_attribute",
+		"message": "`<svelte:head>` cannot have attributes nor directives",
+		"start": {
+			"line": 1,
+			"column": 13
+		},
+		"end": {
+			"line": 1,
+			"column": 14
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/tag-invalid/errors.json b/packages/svelte/tests/validator/samples/tag-invalid/errors.json
index 7fc929b226..84d7f49de6 100644
--- a/packages/svelte/tests/validator/samples/tag-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/tag-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-tag-property",
-		"message": "tag name must be two or more words joined by the \"-\" character",
+		"code": "invalid_tag_property",
+		"message": "Tag name must be two or more words joined by the \"-\" character",
 		"start": {
 			"line": 1,
 			"column": 16
diff --git a/packages/svelte/tests/validator/samples/tag-non-string/errors.json b/packages/svelte/tests/validator/samples/tag-non-string/errors.json
index 46c98b70d5..0a41e50b9d 100644
--- a/packages/svelte/tests/validator/samples/tag-non-string/errors.json
+++ b/packages/svelte/tests/validator/samples/tag-non-string/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-svelte-option-customElement",
+		"code": "invalid_svelte_option_customElement",
 		"message": "\"customElement\" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: \"open\" | \"none\"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/textarea-value-children/errors.json b/packages/svelte/tests/validator/samples/textarea-value-children/errors.json
index c4aed6b426..e2ea3e48fc 100644
--- a/packages/svelte/tests/validator/samples/textarea-value-children/errors.json
+++ b/packages/svelte/tests/validator/samples/textarea-value-children/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-textarea-content",
-		"message": "A <textarea> can have either a value attribute or (equivalently) child content, but not both",
+		"code": "invalid_textarea_content",
+		"message": "A `<textarea>` can have either a value attribute or (equivalently) child content, but not both",
 		"start": {
 			"line": 1,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/title-no-attributes/errors.json b/packages/svelte/tests/validator/samples/title-no-attributes/errors.json
index 3f0410a6b0..85768c1fa9 100644
--- a/packages/svelte/tests/validator/samples/title-no-attributes/errors.json
+++ b/packages/svelte/tests/validator/samples/title-no-attributes/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "illegal-title-attribute",
-		"message": "<title> cannot have attributes nor directives",
+		"code": "illegal_title_attribute",
+		"message": "`<title>` cannot have attributes nor directives",
 		"start": {
 			"line": 2,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/title-no-children/errors.json b/packages/svelte/tests/validator/samples/title-no-children/errors.json
index 9d7a7667a1..6a4d2475e1 100644
--- a/packages/svelte/tests/validator/samples/title-no-children/errors.json
+++ b/packages/svelte/tests/validator/samples/title-no-children/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-title-content",
-		"message": "<title> can only contain text and {tags}",
+		"code": "invalid_title_content",
+		"message": "`<title>` can only contain text and {tags}",
 		"start": {
 			"line": 2,
 			"column": 11
diff --git a/packages/svelte/tests/validator/samples/transition-duplicate-in-transition/errors.json b/packages/svelte/tests/validator/samples/transition-duplicate-in-transition/errors.json
index 2af6bfca8b..f4d13f4f54 100644
--- a/packages/svelte/tests/validator/samples/transition-duplicate-in-transition/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-duplicate-in-transition/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-transition",
-		"message": "An element cannot have both an 'in' directive and a 'transition' directive",
+		"code": "transition_conflict",
+		"message": "Cannot use `in:` alongside existing `transition:` directive",
 		"start": {
 			"line": 6,
 			"column": 12
diff --git a/packages/svelte/tests/validator/samples/transition-duplicate-in/errors.json b/packages/svelte/tests/validator/samples/transition-duplicate-in/errors.json
index eba48be226..1f1690d256 100644
--- a/packages/svelte/tests/validator/samples/transition-duplicate-in/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-duplicate-in/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-transition",
-		"message": "An element can only have one 'in' directive",
+		"code": "transition_duplicate",
+		"message": "Cannot use multiple `in:` directives on a single element",
 		"start": {
 			"line": 6,
 			"column": 12
diff --git a/packages/svelte/tests/validator/samples/transition-duplicate-out-transition/errors.json b/packages/svelte/tests/validator/samples/transition-duplicate-out-transition/errors.json
index cb1a474216..16e4e09e8d 100644
--- a/packages/svelte/tests/validator/samples/transition-duplicate-out-transition/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-duplicate-out-transition/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-transition",
-		"message": "An element cannot have both an 'out' directive and a 'transition' directive",
+		"code": "transition_conflict",
+		"message": "Cannot use `out:` alongside existing `transition:` directive",
 		"start": {
 			"line": 6,
 			"column": 13
diff --git a/packages/svelte/tests/validator/samples/transition-duplicate-out/errors.json b/packages/svelte/tests/validator/samples/transition-duplicate-out/errors.json
index 34c57ab1b8..1dd1acde96 100644
--- a/packages/svelte/tests/validator/samples/transition-duplicate-out/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-duplicate-out/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-transition",
-		"message": "An element can only have one 'out' directive",
+		"code": "transition_duplicate",
+		"message": "Cannot use multiple `out:` directives on a single element",
 		"start": {
 			"line": 6,
 			"column": 13
diff --git a/packages/svelte/tests/validator/samples/transition-duplicate-transition-in/errors.json b/packages/svelte/tests/validator/samples/transition-duplicate-transition-in/errors.json
index c88dd30d16..89c6414100 100644
--- a/packages/svelte/tests/validator/samples/transition-duplicate-transition-in/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-duplicate-transition-in/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-transition",
-		"message": "An element cannot have both a 'transition' directive and an 'in' directive",
+		"code": "transition_conflict",
+		"message": "Cannot use `transition:` alongside existing `in:` directive",
 		"start": {
 			"line": 6,
 			"column": 20
diff --git a/packages/svelte/tests/validator/samples/transition-duplicate-transition-out/errors.json b/packages/svelte/tests/validator/samples/transition-duplicate-transition-out/errors.json
index 8c1a2a2706..3f0cbc0eee 100644
--- a/packages/svelte/tests/validator/samples/transition-duplicate-transition-out/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-duplicate-transition-out/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-transition",
-		"message": "An element cannot have both a 'transition' directive and an 'out' directive",
+		"code": "transition_conflict",
+		"message": "Cannot use `transition:` alongside existing `out:` directive",
 		"start": {
 			"line": 6,
 			"column": 20
diff --git a/packages/svelte/tests/validator/samples/transition-duplicate-transition/errors.json b/packages/svelte/tests/validator/samples/transition-duplicate-transition/errors.json
index 1c93b5cb87..6e9d2f900a 100644
--- a/packages/svelte/tests/validator/samples/transition-duplicate-transition/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-duplicate-transition/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "duplicate-transition",
-		"message": "An element can only have one 'transition' directive",
+		"code": "transition_duplicate",
+		"message": "Cannot use multiple `transition:` directives on a single element",
 		"start": {
 			"line": 6,
 			"column": 20
diff --git a/packages/svelte/tests/validator/samples/transition-on-component/errors.json b/packages/svelte/tests/validator/samples/transition-on-component/errors.json
index 7b2403bee6..52155a1480 100644
--- a/packages/svelte/tests/validator/samples/transition-on-component/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-on-component/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-component-directive",
+		"code": "invalid_component_directive",
 		"message": "This type of directive is not valid on components",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json b/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
index 7f7a7eb6f9..99a1c892d3 100644
--- a/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
+++ b/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'innerwidth' is not a valid binding (did you mean 'innerWidth'?)",
+		"code": "bind_invalid_detailed",
+		"message": "`bind:innerwidth` is not a valid binding. Did you mean 'innerWidth'?",
 		"start": {
 			"line": 5,
 			"column": 15
diff --git a/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json b/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json
index dc1fadfc08..fc6c219444 100644
--- a/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-binding",
-		"message": "'potato' is not a valid binding",
+		"code": "bind_invalid",
+		"message": "`bind:potato` is not a valid binding",
 		"start": {
 			"line": 5,
 			"column": 15

From 5405ec6c91911f66f71a05b4fe79aef077896d9e Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 23 Apr 2024 13:34:06 -0400
Subject: [PATCH 06/27] chore: refactor logic for ignoring warnings (#11300)

* reimplement svelte-ignore logic

* simplify

* remove unused code

* remove ignores array from comment node

* unused

* regenerate types

* types

* oops, again
---
 packages/svelte/src/compiler/legacy.js        |  9 +-
 .../compiler/phases/1-parse/state/element.js  |  5 +-
 .../src/compiler/phases/2-analyze/a11y.js     | 10 +--
 .../compiler/phases/2-analyze/css/css-warn.js |  2 +-
 .../src/compiler/phases/2-analyze/index.js    | 88 ++++++++++++++++---
 .../src/compiler/phases/2-analyze/types.d.ts  |  1 +
 .../compiler/phases/2-analyze/validation.js   | 47 ++++------
 .../src/compiler/types/legacy-nodes.d.ts      |  9 ++
 .../svelte/src/compiler/types/template.d.ts   |  2 -
 .../compiler/utils/extract_svelte_ignore.js   | 38 --------
 packages/svelte/src/compiler/warnings.js      | 50 +----------
 .../samples/comment-before-script/output.json |  3 +-
 packages/svelte/types/index.d.ts              | 11 ++-
 13 files changed, 132 insertions(+), 143 deletions(-)

diff --git a/packages/svelte/src/compiler/legacy.js b/packages/svelte/src/compiler/legacy.js
index 49d2f78260..0357953060 100644
--- a/packages/svelte/src/compiler/legacy.js
+++ b/packages/svelte/src/compiler/legacy.js
@@ -4,6 +4,7 @@ import {
 	regex_not_whitespace,
 	regex_starts_with_whitespaces
 } from './phases/patterns.js';
+import { extract_svelte_ignore } from './utils/extract_svelte_ignore.js';
 
 /**
  * Some of the legacy Svelte AST nodes remove whitespace from the start and end of their children.
@@ -197,7 +198,13 @@ export function convert(source, ast) {
 			ClassDirective(node) {
 				return { ...node, type: 'Class' };
 			},
-			ComplexSelector(node, { visit }) {
+			Comment(node) {
+				return {
+					...node,
+					ignores: extract_svelte_ignore(node.data)
+				};
+			},
+			ComplexSelector(node) {
 				const children = [];
 
 				for (const child of node.children) {
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/element.js b/packages/svelte/src/compiler/phases/1-parse/state/element.js
index 134f322967..7696b23a66 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -1,5 +1,3 @@
-import { extract_svelte_ignore } from '../../../utils/extract_svelte_ignore.js';
-import fuzzymatch from '../utils/fuzzymatch.js';
 import { is_void } from '../utils/names.js';
 import read_expression from '../read/expression.js';
 import { read_script } from '../read/script.js';
@@ -87,8 +85,7 @@ export default function tag(parser) {
 			type: 'Comment',
 			start,
 			end: parser.index,
-			data,
-			ignores: extract_svelte_ignore(data)
+			data
 		});
 
 		return;
diff --git a/packages/svelte/src/compiler/phases/2-analyze/a11y.js b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
index eb87b5ddbf..7d01c6fdb3 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/a11y.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
@@ -667,9 +667,8 @@ function get_static_text_value(attribute) {
 /**
  * @param {import('#compiler').RegularElement | import('#compiler').SvelteElement} node
  * @param {import('./types.js').AnalysisState} state
- * @param {import('#compiler').SvelteNode[]} path
  */
-function check_element(node, state, path) {
+function check_element(node, state) {
 	// foreign namespace means elements can have completely different meanings, therefore we don't check them
 	if (state.options.namespace === 'foreign') return;
 
@@ -680,8 +679,7 @@ function check_element(node, state, path) {
 	 * @param  {Parameters<import('../../warnings.js').AllWarnings[T]>} args
 	 * @returns {void}
 	 */
-	const push_warning = (node, code, ...args) =>
-		warn(state.analysis.warnings, node, path, code, ...args);
+	const push_warning = (node, code, ...args) => warn(state.analysis.warnings, node, code, ...args);
 
 	/** @type {Map<string, import('#compiler').Attribute>} */
 	const attribute_map = new Map();
@@ -1165,9 +1163,9 @@ function check_element(node, state, path) {
  */
 export const a11y_validators = {
 	RegularElement(node, context) {
-		check_element(node, context.state, context.path);
+		check_element(node, context.state);
 	},
 	SvelteElement(node, context) {
-		check_element(node, context.state, context.path);
+		check_element(node, context.state);
 	}
 };
diff --git a/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js b/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js
index 3aa2382205..e2d137198b 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js
@@ -26,7 +26,7 @@ const visitors = {
 		if (!node.metadata.used) {
 			const content = context.state.stylesheet.content;
 			const text = content.styles.substring(node.start - content.start, node.end - content.start);
-			warn(context.state.warnings, node, context.path, 'css-unused-selector', text);
+			warn(context.state.warnings, node, 'css-unused-selector', text);
 		}
 
 		context.next();
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 10091a7105..d2a331e253 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -24,6 +24,7 @@ import { analyze_css } from './css/css-analyze.js';
 import { prune } from './css/css-prune.js';
 import { hash } from './utils.js';
 import { warn_unused } from './css/css-warn.js';
+import { extract_svelte_ignore } from '../../utils/extract_svelte_ignore.js';
 
 /**
  * @param {import('#compiler').Script | null} script
@@ -330,7 +331,7 @@ export function analyze_component(root, source, options) {
 				} else if (declaration !== null && Runes.includes(/** @type {any} */ (name))) {
 					for (const { node, path } of references) {
 						if (path.at(-1)?.type === 'CallExpression') {
-							warn(warnings, node, [], 'store-with-rune-name', store_name);
+							warn(warnings, node, 'store-with-rune-name', store_name);
 						}
 					}
 				}
@@ -407,7 +408,7 @@ export function analyze_component(root, source, options) {
 	};
 
 	if (!options.customElement && root.options?.customElement) {
-		warn(analysis.warnings, root.options, [], 'missing-custom-element-compile-option');
+		warn(analysis.warnings, root.options, 'missing-custom-element-compile-option');
 	}
 
 	if (analysis.runes) {
@@ -433,7 +434,8 @@ export function analyze_component(root, source, options) {
 				component_slots: new Set(),
 				expression: null,
 				private_derived_state: [],
-				function_depth: scope.function_depth
+				function_depth: scope.function_depth,
+				ignores: new Set()
 			};
 
 			walk(
@@ -475,7 +477,8 @@ export function analyze_component(root, source, options) {
 				component_slots: new Set(),
 				expression: null,
 				private_derived_state: [],
-				function_depth: scope.function_depth
+				function_depth: scope.function_depth,
+				ignores: new Set()
 			};
 
 			walk(
@@ -495,7 +498,7 @@ export function analyze_component(root, source, options) {
 					(r) => r.node !== binding.node && r.path.at(-1)?.type !== 'ExportSpecifier'
 				);
 				if (!references.length && !instance.scope.declarations.has(`$${name}`)) {
-					warn(warnings, binding.node, [], 'unused-export-let', name);
+					warn(warnings, binding.node, 'unused-export-let', name);
 				}
 			}
 		}
@@ -535,7 +538,7 @@ export function analyze_component(root, source, options) {
 									type === 'AwaitBlock' ||
 									type === 'KeyBlock'
 								) {
-									warn(warnings, binding.node, [], 'non-state-reference', name);
+									warn(warnings, binding.node, 'non-state-reference', name);
 									continue outer;
 								}
 							}
@@ -543,7 +546,7 @@ export function analyze_component(root, source, options) {
 						}
 					}
 
-					warn(warnings, binding.node, [], 'non-state-reference', name);
+					warn(warnings, binding.node, 'non-state-reference', name);
 					continue outer;
 				}
 			}
@@ -557,7 +560,13 @@ export function analyze_component(root, source, options) {
 		for (const element of analysis.elements) {
 			prune(analysis.css.ast, element);
 		}
-		warn_unused(analysis.css.ast, analysis.warnings);
+
+		if (
+			!analysis.css.ast.content.comment ||
+			!extract_svelte_ignore(analysis.css.ast.content.comment.data).includes('css-unused-selector')
+		) {
+			warn_unused(analysis.css.ast, analysis.warnings);
+		}
 
 		outer: for (const element of analysis.elements) {
 			if (element.metadata.scoped) {
@@ -679,7 +688,7 @@ const legacy_scope_tweaker = {
 				(d) => d.scope === state.analysis.module.scope && d.declaration_kind !== 'const'
 			)
 		) {
-			warn(state.analysis.warnings, node, path, 'module-script-reactive-declaration');
+			warn(state.analysis.warnings, node, 'module-script-reactive-declaration');
 		}
 
 		if (
@@ -1045,6 +1054,65 @@ const function_visitor = (node, context) => {
 
 /** @type {import('./types').Visitors} */
 const common_visitors = {
+	_(node, context) {
+		// @ts-expect-error
+		const comments = /** @type {import('estree').Comment[]} */ (node.leadingComments);
+
+		if (comments) {
+			/** @type {string[]} */
+			const ignores = [];
+
+			for (const comment of comments) {
+				ignores.push(...extract_svelte_ignore(comment.value));
+			}
+
+			if (ignores.length > 0) {
+				// @ts-expect-error see below
+				node.ignores = new Set([...context.state.ignores, ...ignores]);
+			}
+		}
+
+		// @ts-expect-error
+		if (node.ignores) {
+			context.next({
+				...context.state,
+				// @ts-expect-error see below
+				ignores: node.ignores
+			});
+		} else if (context.state.ignores.size > 0) {
+			// @ts-expect-error
+			node.ignores = context.state.ignores;
+		}
+	},
+	Fragment(node, context) {
+		/** @type {string[]} */
+		let ignores = [];
+
+		for (const child of node.nodes) {
+			if (child.type === 'Text' && child.data.trim() === '') {
+				continue;
+			}
+
+			if (child.type === 'Comment') {
+				ignores.push(...extract_svelte_ignore(child.data));
+			} else {
+				const combined_ignores = new Set(context.state.ignores);
+				for (const ignore of ignores) combined_ignores.add(ignore);
+
+				if (combined_ignores.size > 0) {
+					// TODO this is a grotesque hack that's made necessary by the fact that
+					// we can't call `context.visit(...)` here, because we do the convoluted
+					// visitor merging thing. I'm increasingly of the view that we should
+					// rearchitect this stuff and have a single visitor per node. It'd be
+					// more efficient and much simpler.
+					// @ts-expect-error
+					child.ignores = combined_ignores;
+				}
+
+				ignores = [];
+			}
+		}
+	},
 	Attribute(node, context) {
 		if (node.value === true) return;
 
@@ -1142,7 +1210,7 @@ const common_visitors = {
 					binding.kind === 'derived') &&
 				context.state.function_depth === binding.scope.function_depth
 			) {
-				warn(context.state.analysis.warnings, node, context.path, 'static-state-reference');
+				warn(context.state.analysis.warnings, node, 'static-state-reference');
 			}
 		}
 	},
diff --git a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
index d2c503e8b1..cc815fae7b 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
+++ b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
@@ -22,6 +22,7 @@ export interface AnalysisState {
 	expression: ExpressionTag | ClassDirective | SpreadAttribute | null;
 	private_derived_state: string[];
 	function_depth: number;
+	ignores: Set<string>;
 }
 
 export interface LegacyAnalysisState extends AnalysisState {
diff --git a/packages/svelte/src/compiler/phases/2-analyze/validation.js b/packages/svelte/src/compiler/phases/2-analyze/validation.js
index cd1aed4b2d..f4321b0101 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/validation.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/validation.js
@@ -134,7 +134,6 @@ function validate_element(node, context) {
 					warn(
 						context.state.analysis.warnings,
 						attribute,
-						context.path,
 						'global-event-reference',
 						attribute.name
 					);
@@ -147,7 +146,7 @@ function validate_element(node, context) {
 			}
 
 			if (attribute.name === 'is' && context.state.options.namespace !== 'foreign') {
-				warn(context.state.analysis.warnings, attribute, context.path, 'avoid-is');
+				warn(context.state.analysis.warnings, attribute, 'avoid-is');
 			}
 
 			const correct_name = react_attributes.get(attribute.name);
@@ -155,7 +154,6 @@ function validate_element(node, context) {
 				warn(
 					context.state.analysis.warnings,
 					attribute,
-					context.path,
 					'invalid-html-attribute',
 					attribute.name,
 					correct_name
@@ -235,7 +233,7 @@ function validate_attribute_name(attribute, context) {
 		!attribute.name.startsWith('xlink:') &&
 		!attribute.name.startsWith('xml:')
 	) {
-		warn(context.state.analysis.warnings, attribute, context.path, 'illegal-attribute-character');
+		warn(context.state.analysis.warnings, attribute, 'illegal-attribute-character');
 	}
 }
 
@@ -313,7 +311,7 @@ function validate_block_not_empty(node, context) {
 	// Assumption: If the block has zero elements, someone's in the middle of typing it out,
 	// so don't warn in that case because it would be distracting.
 	if (node.nodes.length === 1 && node.nodes[0].type === 'Text' && !node.nodes[0].raw.trim()) {
-		warn(context.state.analysis.warnings, node.nodes[0], context.path, 'empty-block');
+		warn(context.state.analysis.warnings, node.nodes[0], 'empty-block');
 	}
 }
 
@@ -377,7 +375,6 @@ const validation = {
 			warn(
 				context.state.analysis.warnings,
 				binding.node,
-				context.path,
 				'invalid-rest-eachblock-binding',
 				binding.node.name
 			);
@@ -534,13 +531,7 @@ const validation = {
 			binding.declaration_kind === 'import' &&
 			binding.references.length === 0
 		) {
-			warn(
-				context.state.analysis.warnings,
-				node,
-				context.path,
-				'component-name-lowercase',
-				node.name
-			);
+			warn(context.state.analysis.warnings, node, 'component-name-lowercase', node.name);
 		}
 
 		validate_element(node, context);
@@ -579,13 +570,7 @@ const validation = {
 			!VoidElements.includes(node.name) &&
 			!SVGElements.includes(node.name)
 		) {
-			warn(
-				context.state.analysis.warnings,
-				node,
-				context.path,
-				'invalid-self-closing-tag',
-				node.name
-			);
+			warn(context.state.analysis.warnings, node, 'invalid-self-closing-tag', node.name);
 		}
 
 		context.next({
@@ -781,7 +766,7 @@ export const validation_legacy = merge(validation, a11y_validators, {
 			(state.ast_type !== 'instance' ||
 				/** @type {import('#compiler').SvelteNode} */ (path.at(-1)).type !== 'Program')
 		) {
-			warn(state.analysis.warnings, node, path, 'no-reactive-declaration');
+			warn(state.analysis.warnings, node, 'no-reactive-declaration');
 		}
 	},
 	UpdateExpression(node, { state }) {
@@ -984,12 +969,12 @@ export const validation_runes_js = {
 		const allowed_depth = context.state.ast_type === 'module' ? 0 : 1;
 
 		if (context.state.scope.function_depth > allowed_depth) {
-			warn(context.state.analysis.warnings, node, context.path, 'avoid-nested-class');
+			warn(context.state.analysis.warnings, node, 'avoid-nested-class');
 		}
 	},
 	NewExpression(node, context) {
 		if (node.callee.type === 'ClassExpression' && context.state.scope.function_depth > 0) {
-			warn(context.state.analysis.warnings, node, context.path, 'avoid-inline-class');
+			warn(context.state.analysis.warnings, node, 'avoid-inline-class');
 		}
 	}
 };
@@ -1134,7 +1119,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 		}
 		next({ ...state });
 	},
-	VariableDeclarator(node, { state, path }) {
+	VariableDeclarator(node, { state }) {
 		ensure_no_module_import_conflict(node, state);
 
 		const init = node.init;
@@ -1142,7 +1127,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 
 		if (rune === null) {
 			if (init?.type === 'Identifier' && init.name === '$props' && !state.scope.get('props')) {
-				warn(state.analysis.warnings, node, path, 'invalid-props-declaration');
+				warn(state.analysis.warnings, node, 'invalid-props-declaration');
 			}
 			return;
 		}
@@ -1195,29 +1180,29 @@ export const validation_runes = merge(validation, a11y_validators, {
 				arg.type === 'CallExpression' &&
 				(arg.callee.type === 'ArrowFunctionExpression' || arg.callee.type === 'FunctionExpression')
 			) {
-				warn(state.analysis.warnings, node, path, 'derived-iife');
+				warn(state.analysis.warnings, node, 'derived-iife');
 			}
 		}
 	},
-	AssignmentPattern(node, { state, path }) {
+	AssignmentPattern(node, { state }) {
 		if (
 			node.right.type === 'Identifier' &&
 			node.right.name === '$bindable' &&
 			!state.scope.get('bindable')
 		) {
-			warn(state.analysis.warnings, node, path, 'invalid-bindable-declaration');
+			warn(state.analysis.warnings, node, 'invalid-bindable-declaration');
 		}
 	},
-	SlotElement(node, { state, path }) {
+	SlotElement(node, { state }) {
 		if (!state.analysis.custom_element) {
-			warn(state.analysis.warnings, node, path, 'deprecated-slot-element');
+			warn(state.analysis.warnings, node, 'deprecated-slot-element');
 		}
 	},
 	OnDirective(node, { state, path }) {
 		const parent_type = path.at(-1)?.type;
 		// Don't warn on component events; these might not be under the author's control so the warning would be unactionable
 		if (parent_type === 'RegularElement' || parent_type === 'SvelteElement') {
-			warn(state.analysis.warnings, node, path, 'deprecated-event-handler', node.name);
+			warn(state.analysis.warnings, node, 'deprecated-event-handler', node.name);
 		}
 	},
 	// TODO this is a code smell. need to refactor this stuff
diff --git a/packages/svelte/src/compiler/types/legacy-nodes.d.ts b/packages/svelte/src/compiler/types/legacy-nodes.d.ts
index 45b26aa70f..0ba61c053c 100644
--- a/packages/svelte/src/compiler/types/legacy-nodes.d.ts
+++ b/packages/svelte/src/compiler/types/legacy-nodes.d.ts
@@ -198,6 +198,14 @@ export interface LegacyWindow extends BaseElement {
 	type: 'Window';
 }
 
+export interface LegacyComment extends BaseNode {
+	type: 'Comment';
+	/** the contents of the comment */
+	data: string;
+	/** any svelte-ignore directives — <!-- svelte-ignore a b c --> would result in ['a', 'b', 'c'] */
+	ignores: string[];
+}
+
 type LegacyDirective =
 	| LegacyAnimation
 	| LegacyBinding
@@ -213,6 +221,7 @@ export type LegacyAttributeLike = LegacyAttribute | LegacySpread | LegacyDirecti
 export type LegacyElementLike =
 	| LegacyBody
 	| LegacyCatchBlock
+	| LegacyComment
 	| LegacyDocument
 	| LegacyElement
 	| LegacyHead
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index 4ddee3096f..e8f20c9b33 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -131,8 +131,6 @@ export interface Comment extends BaseNode {
 	type: 'Comment';
 	/** the contents of the comment */
 	data: string;
-	/** any svelte-ignore directives — <!-- svelte-ignore a b c --> would result in ['a', 'b', 'c'] */
-	ignores: string[];
 }
 
 /** A `{@const ...}` tag */
diff --git a/packages/svelte/src/compiler/utils/extract_svelte_ignore.js b/packages/svelte/src/compiler/utils/extract_svelte_ignore.js
index e45ff53b03..bdc8c15851 100644
--- a/packages/svelte/src/compiler/utils/extract_svelte_ignore.js
+++ b/packages/svelte/src/compiler/utils/extract_svelte_ignore.js
@@ -15,41 +15,3 @@ export function extract_svelte_ignore(text) {
 				.filter(Boolean)
 		: [];
 }
-
-/**
- * @template {{ leadingComments?: Array<{ value: string }> }} Node
- * @param {Node} node
- * @returns {string[]}
- */
-export function extract_svelte_ignore_from_comments(node) {
-	return (node.leadingComments || []).flatMap(
-		/** @param {any} comment */ (comment) => extract_svelte_ignore(comment.value)
-	);
-}
-
-/**
- * @param {import('#compiler').TemplateNode} node
- * @param {import('#compiler').TemplateNode[]} template_nodes
- * @returns {string[]}
- */
-export function extract_ignores_above_position(node, template_nodes) {
-	const previous_node_idx = template_nodes.indexOf(node) - 1;
-	if (previous_node_idx < 0) {
-		return [];
-	}
-
-	const ignores = [];
-	for (let i = previous_node_idx; i >= 0; i--) {
-		const node = template_nodes[i];
-		if (node.type !== 'Comment' && node.type !== 'Text') {
-			return ignores;
-		}
-		if (node.type === 'Comment') {
-			if (node.ignores.length) {
-				ignores.push(...node.ignores);
-			}
-		}
-	}
-
-	return ignores;
-}
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index fc5897aa93..3983d3686e 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -1,8 +1,3 @@
-import {
-	extract_ignores_above_position,
-	extract_svelte_ignore_from_comments
-} from './utils/extract_svelte_ignore.js';
-
 /** @typedef {Record<string, (...args: any[]) => string>} Warnings */
 
 /** @satisfies {Warnings} */
@@ -277,52 +272,15 @@ const warnings = {
  * @template {keyof AllWarnings} T
  * @param {import('./phases/types').RawWarning[]} array the array to push the warning to, if not ignored
  * @param {{ start?: number, end?: number, type?: string, parent?: import('#compiler').SvelteNode | null, leadingComments?: import('estree').Comment[] } | null} node the node related to the warning
- * @param {import('#compiler').SvelteNode[]} path the path to the node, so that we can traverse upwards to find svelte-ignore comments
  * @param {T} code the warning code
  * @param  {Parameters<AllWarnings[T]>} args the arguments to pass to the warning function
  * @returns {void}
  */
-export function warn(array, node, path, code, ...args) {
-	const fn = warnings[code];
+export function warn(array, node, code, ...args) {
+	// @ts-expect-error
+	if (node.ignores?.has(code)) return;
 
-	// Traverse the AST upwards to find any svelte-ignore comments.
-	// This assumes that people don't have their code littered with warnings,
-	// at which point this might become inefficient.
-	/** @type {string[]} */
-	const ignores = [];
-
-	if (node) {
-		// comments inside JavaScript (estree)
-		if ('leadingComments' in node) {
-			ignores.push(...extract_svelte_ignore_from_comments(node));
-		}
-	}
-
-	for (let i = path.length - 1; i >= 0; i--) {
-		const current = path[i];
-
-		// comments inside JavaScript (estree)
-		if ('leadingComments' in current) {
-			ignores.push(...extract_svelte_ignore_from_comments(current));
-		}
-
-		// Svelte nodes
-		if (current.type === 'Fragment') {
-			ignores.push(
-				...extract_ignores_above_position(
-					/** @type {import('#compiler').TemplateNode} */ (path[i + 1] ?? node),
-					current.nodes
-				)
-			);
-		}
-
-		// Style nodes
-		if (current.type === 'StyleSheet' && current.content.comment) {
-			ignores.push(...current.content.comment.ignores);
-		}
-	}
-
-	if (ignores.includes(code)) return;
+	const fn = warnings[code];
 
 	const start = node?.start;
 	const end = node?.end;
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
index e7e5dfe244..b0305d709b 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
@@ -11,8 +11,7 @@
 				"type": "Comment",
 				"start": 0,
 				"end": 27,
-				"data": "should not error out",
-				"ignores": []
+				"data": "should not error out"
 			},
 			{
 				"type": "Text",
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 633a910991..5563610b94 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -955,6 +955,14 @@ declare module 'svelte/compiler' {
 		type: 'Window';
 	}
 
+	interface LegacyComment extends BaseNode_1 {
+		type: 'Comment';
+		/** the contents of the comment */
+		data: string;
+		/** any svelte-ignore directives — <!-- svelte-ignore a b c --> would result in ['a', 'b', 'c'] */
+		ignores: string[];
+	}
+
 	type LegacyDirective =
 		| LegacyAnimation
 		| LegacyBinding
@@ -970,6 +978,7 @@ declare module 'svelte/compiler' {
 	type LegacyElementLike =
 		| LegacyBody
 		| LegacyCatchBlock
+		| LegacyComment
 		| LegacyDocument
 		| LegacyElement
 		| LegacyHead
@@ -1355,8 +1364,6 @@ declare module 'svelte/compiler' {
 		type: 'Comment';
 		/** the contents of the comment */
 		data: string;
-		/** any svelte-ignore directives — <!-- svelte-ignore a b c --> would result in ['a', 'b', 'c'] */
-		ignores: string[];
 	}
 
 	/** A `{@const ...}` tag */

From 7b55bd4d89e0642da8e091021d0926493bbad973 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 23 Apr 2024 21:32:28 -0400
Subject: [PATCH 07/27] chore: markdown warnings (#11302)

* rename warnings.js to warnings-tmp.js

* start porting warnings

* centralise stuff

* finish porting warnings

* tidy up

* get messages into JSDoc annotations

* prettier

* lint
---
 .prettierignore                               |   1 +
 .../svelte/messages/compile-warnings/a11y.md  | 171 ++++
 .../messages/compile-warnings/attributes.md   |  15 +
 .../svelte/messages/compile-warnings/block.md |   3 +
 .../messages/compile-warnings/components.md   |   3 +
 .../svelte/messages/compile-warnings/css.md   |   3 +
 .../messages/compile-warnings/legacy.md       |  19 +
 .../svelte/messages/compile-warnings/misc.md  |   3 +
 .../messages/compile-warnings/options.md      |   3 +
 .../messages/compile-warnings/performance.md  |   7 +
 .../svelte/messages/compile-warnings/runes.md |  19 +
 .../svelte/messages/compile-warnings/state.md |   7 +
 packages/svelte/package.json                  |   4 +-
 .../svelte/scripts/process-messages/index.js  |  11 +-
 .../templates/compile-errors.js               |   2 +-
 .../templates/compile-warnings.js             |  52 +
 packages/svelte/src/compiler/errors.js        | 257 ++---
 packages/svelte/src/compiler/index.js         |   8 +-
 .../src/compiler/phases/2-analyze/a11y.js     | 216 +++--
 .../compiler/phases/2-analyze/css/css-warn.js |  11 +-
 .../src/compiler/phases/2-analyze/index.js    |  36 +-
 .../compiler/phases/2-analyze/validation.js   |  59 +-
 .../src/compiler/phases/3-transform/index.js  |  43 +-
 .../svelte/src/compiler/phases/types.d.ts     |  10 +-
 packages/svelte/src/compiler/utils/string.js  |   9 +
 packages/svelte/src/compiler/warnings.js      | 910 ++++++++++++------
 .../_config.js                                |   2 +-
 .../descendant-selector-unmatched/_config.js  |   2 +-
 .../css/samples/dynamic-element/_config.js    |   2 +-
 .../tests/css/samples/empty-class/_config.js  |   2 +-
 .../_config.js                                |   6 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../general-siblings-combinator-if/_config.js |   6 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |  12 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../general-siblings-combinator/_config.js    |   8 +-
 .../tests/css/samples/global-block/_config.js |   2 +-
 .../global-with-unused-descendant/_config.js  |   2 +-
 .../svelte/tests/css/samples/host/_config.js  |   2 +-
 .../svelte/tests/css/samples/is/_config.js    |   2 +-
 .../tests/css/samples/nested-css/_config.js   |  14 +-
 .../_config.js                                |   2 +-
 .../samples/preserve-specificity/input.svelte |   4 +-
 .../siblings-combinator-await/_config.js      |   8 +-
 .../siblings-combinator-each-2/_config.js     |   2 +-
 .../_config.js                                |  20 +-
 .../siblings-combinator-each-else/_config.js  |   4 +-
 .../_config.js                                |  16 +-
 .../siblings-combinator-global/_config.js     |   4 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../samples/siblings-combinator-if/_config.js |   8 +-
 .../siblings-combinator-slot/_config.js       |   6 +-
 .../siblings-combinator-star/_config.js       |   2 +-
 .../samples/siblings-combinator/_config.js    |   8 +-
 .../_config.js                                |   6 +-
 .../_config.js                                |   2 +-
 .../unused-selector-leading/_config.js        |   4 +-
 .../unused-selector-string-concat/_config.js  |  20 +-
 .../unused-selector-ternary-concat/_config.js |   2 +-
 .../unused-selector-ternary-nested/_config.js |   4 +-
 .../unused-selector-ternary/_config.js        |   2 +-
 .../unused-selector-trailing/_config.js       |   2 +-
 .../css/samples/unused-selector/_config.js    |   2 +-
 .../extended-builtin/_config.js               |   2 +-
 .../samples/a11y-alt-text/warnings.json       |  16 +-
 .../a11y-anchor-has-content/warnings.json     |   4 +-
 .../a11y-anchor-in-svg-is-valid/warnings.json |  12 +-
 .../a11y-anchor-is-valid/warnings.json        |  24 +-
 .../a11y-aria-activedescendant/warnings.json  |   4 +-
 .../samples/a11y-aria-props/warnings.json     |   8 +-
 .../a11y-aria-proptypes-boolean/warnings.json |   8 +-
 .../a11y-aria-proptypes-integer/warnings.json |  12 +-
 .../a11y-aria-proptypes-number/warnings.json  |  12 +-
 .../a11y-aria-proptypes-string/warnings.json  |   4 +-
 .../a11y-aria-proptypes-token/warnings.json   |  16 +-
 .../warnings.json                             |  20 +-
 .../warnings.json                             |   8 +-
 .../samples/a11y-aria-role/warnings.json      |   8 +-
 .../warnings.json                             |   8 +-
 .../a11y-autocomplete-valid/warnings.json     |  12 +-
 .../input.svelte                              |  42 +-
 .../warnings.json                             |  32 +-
 .../a11y-figcaption-wrong-place/warnings.json |   8 +-
 .../a11y-heading-has-content/warnings.json    |   8 +-
 .../samples/a11y-html-has-lang/warnings.json  |   4 +-
 .../a11y-iframe-has-title/warnings.json       |   4 +-
 .../a11y-img-redundant-alt/warnings.json      |  12 +-
 .../warnings.json                             |  92 +-
 .../warnings.json                             |   8 +-
 .../a11y-media-has-caption/warnings.json      |  16 +-
 .../input.svelte                              |  12 +-
 .../warnings.json                             |  16 +-
 .../a11y-no-abstract-roles/warnings.json      |  48 +-
 .../samples/a11y-no-access-key/warnings.json  |   4 +-
 .../samples/a11y-no-autofocus/warnings.json   |   4 +-
 .../warnings.json                             |   8 +-
 .../warnings.json                             | 236 ++---
 .../warnings.json                             |  20 +-
 .../warnings.json                             | 196 ++--
 .../warnings.json                             |  16 +-
 .../a11y-no-redundant-roles/input.svelte      |   2 +-
 .../a11y-no-redundant-roles/warnings.json     | 156 +--
 .../input.svelte                              |   6 +-
 .../warnings.json                             |   8 +-
 .../a11y-not-on-components/warnings.json      |   4 +-
 .../warnings.json                             |  16 +-
 .../warnings.json                             | 716 +++++++-------
 .../samples/a11y-scope/warnings.json          |   4 +-
 .../a11y-tabindex-no-positive/warnings.json   |   4 +-
 .../samples/component-dynamic/input.svelte    |   6 +-
 .../samples/component-dynamic/warnings.json   |   6 +-
 .../component-name-lowercase/warnings.json    |   2 +-
 .../samples/empty-block/warnings.json         |  48 +-
 .../samples/error-mode-warn/warnings.json     |   4 +-
 .../warnings.json                             |   2 +-
 .../global-event-reference/warnings.json      |   4 +-
 .../samples/ignore-warning/input.svelte       |   4 +-
 .../samples/ignore-warning/warnings.json      |   8 +-
 .../ignore-warnings-cumulative/input.svelte   |   6 +-
 .../ignore-warnings-cumulative/warnings.json  |   4 +-
 .../ignore-warnings-newline/input.svelte      |   6 +-
 .../ignore-warnings-newline/warnings.json     |   4 +-
 .../ignore-warnings-stacked/input.svelte      |   6 +-
 .../ignore-warnings-stacked/warnings.json     |   4 +-
 .../samples/ignore-warnings/input.svelte      |   4 +-
 .../samples/ignore-warnings/warnings.json     |   4 +-
 .../illegal-attribute-character/warnings.json |   4 +-
 .../samples/inline-new-class-2/warnings.json  |   2 +-
 .../samples/inline-new-class-4/warnings.json  |   2 +-
 .../samples/inline-new-class/warnings.json    |   2 +-
 .../invalid-self-closing-tag/warnings.json    |   4 +-
 .../warnings.json                             |  12 +-
 .../warnings.json                             |  12 +-
 .../reactive-module-variable/warnings.json    |   2 +-
 .../rest-eachblock-binding-2/warnings.json    |  12 +-
 .../rest-eachblock-binding-3/warnings.json    |  12 +-
 .../warnings.json                             |   4 +-
 .../rest-eachblock-binding/warnings.json      |  12 +-
 .../runes-bindable-not-called/warnings.json   |   4 +-
 .../warnings.json                             |   6 +-
 .../runes-props-not-called/warnings.json      |   4 +-
 .../warnings.json                             |   4 +-
 .../runes-referenced-nonstate/warnings.json   |   8 +-
 .../warnings.json                             |   2 +-
 .../samples/silence-warnings-2/input.svelte   |   2 +-
 .../samples/silence-warnings/input.svelte     |   4 +-
 .../samples/slot-warning-ignore/input.svelte  |   4 +-
 .../samples/slot-warning/input.svelte         |   2 +-
 .../samples/slot-warning/warnings.json        |   4 +-
 .../samples/slot-warning2/input.svelte        |   4 +-
 .../samples/slot-warning2/warnings.json       |   4 +-
 .../static-state-reference/warnings.json      |   4 +-
 .../store-runes-conflict/warnings.json        |   4 +-
 .../warnings.json                             |   2 +-
 .../unreferenced-variables-each/warnings.json |   4 +-
 .../unreferenced-variables/warnings.json      |  10 +-
 .../samples/use-the-platform/warnings.json    |   4 +-
 164 files changed, 2475 insertions(+), 1779 deletions(-)
 create mode 100644 packages/svelte/messages/compile-warnings/a11y.md
 create mode 100644 packages/svelte/messages/compile-warnings/attributes.md
 create mode 100644 packages/svelte/messages/compile-warnings/block.md
 create mode 100644 packages/svelte/messages/compile-warnings/components.md
 create mode 100644 packages/svelte/messages/compile-warnings/css.md
 create mode 100644 packages/svelte/messages/compile-warnings/legacy.md
 create mode 100644 packages/svelte/messages/compile-warnings/misc.md
 create mode 100644 packages/svelte/messages/compile-warnings/options.md
 create mode 100644 packages/svelte/messages/compile-warnings/performance.md
 create mode 100644 packages/svelte/messages/compile-warnings/runes.md
 create mode 100644 packages/svelte/messages/compile-warnings/state.md
 create mode 100644 packages/svelte/scripts/process-messages/templates/compile-warnings.js
 create mode 100644 packages/svelte/src/compiler/utils/string.js

diff --git a/.prettierignore b/.prettierignore
index 77bdd29cf3..4eea07c2e7 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,6 +4,7 @@ packages/**/npm/**/*
 packages/**/config/*.js
 packages/svelte/messages/**/*.md
 packages/svelte/src/compiler/errors.js
+packages/svelte/src/compiler/warnings.js
 packages/svelte/tests/**/*.svelte
 packages/svelte/tests/**/_expected*
 packages/svelte/tests/**/_actual*
diff --git a/packages/svelte/messages/compile-warnings/a11y.md b/packages/svelte/messages/compile-warnings/a11y.md
new file mode 100644
index 0000000000..0e2aaa92b0
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/a11y.md
@@ -0,0 +1,171 @@
+## a11y_aria_attributes
+
+<%name%> should not have aria-* attributes
+
+## a11y_unknown_aria_attribute
+
+Unknown aria attribute 'aria-%attribute%'
+
+## a11y_unknown_aria_attribute_suggestion
+
+Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
+
+## a11y_hidden
+
+<%name%> element should not be hidden
+
+## a11y_incorrect_aria_attribute_type_boolean
+
+The value of '%attribute%' must be either 'true' or 'false'
+
+## a11y_incorrect_aria_attribute_type_integer
+
+The value of '%attribute%' must be an integer
+
+## a11y_incorrect_aria_attribute_type_id
+
+The value of '%attribute%' must be a string that represents a DOM element ID
+
+## a11y_incorrect_aria_attribute_type_idlist
+
+The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
+
+## a11y_incorrect_aria_attribute_type_tristate
+
+The value of '%attribute%' must be exactly one of true, false, or mixed
+
+## a11y_incorrect_aria_attribute_type_token
+
+The value of '%attribute%' must be exactly one of %values%
+
+## a11y_incorrect_aria_attribute_type_tokenlist
+
+The value of '%attribute%' must be a space-separated list of one or more of %values%
+
+## a11y_incorrect_aria_attribute_type
+
+The value of '%attribute%' must be of type %type%
+
+## a11y_aria_activedescendant_has_tabindex
+
+Elements with attribute aria-activedescendant should have tabindex value
+
+## a11y_misplaced_role
+
+<%name%> should not have role attribute
+
+## a11y_no_abstract_role
+
+Abstract role '%role%' is forbidden
+
+## a11y_unknown_role
+
+Unknown role '%role%'
+
+## a11y_unknown_role_suggestion
+
+Unknown role '%role%'. Did you mean '%suggestion%'?
+
+## a11y_no_redundant_roles
+
+Redundant role '%role%'
+
+## a11y_role_has_required_aria_props
+
+Elements with the ARIA role "%role%" must have the following attributes defined: %props%
+
+## a11y_interactive_supports_focus
+
+Elements with the '%role%' interactive role must have a tabindex value.
+
+## a11y_no_interactive_element_to_noninteractive_role
+
+<%element%> cannot have role '%role%'
+
+## a11y_no_noninteractive_element_to_interactive_role
+
+Non-interactive element <%element%> cannot have interactive role '%role%'
+
+## a11y_accesskey
+
+Avoid using accesskey
+
+## a11y_autofocus
+
+Avoid using autofocus
+
+## a11y_misplaced_scope
+
+The scope attribute should only be used with <th> elements
+
+## a11y_positive_tabindex
+
+Avoid tabindex values above zero
+
+## a11y_click_events_have_key_events
+
+Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type="button"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
+
+## a11y_no_noninteractive_tabindex
+
+noninteractive element cannot have nonnegative tabIndex value
+
+## a11y_role_supports_aria_props
+
+The attribute '%attribute%' is not supported by the role '%role%'
+
+## a11y_role_supports_aria_props_implicit
+
+The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element <%name%>
+
+## a11y_no_noninteractive_element_interactions
+
+Non-interactive element <%element%> should not be assigned mouse or keyboard event listeners.
+
+## a11y_no_static_element_interactions
+
+<%element%> with a %handler% handler must have an ARIA role
+
+## a11y_invalid_attribute
+
+'%href_value%' is not a valid %href_attribute% attribute
+
+## a11y_missing_attribute
+
+<%name%> element should have %article% %sequence% attribute
+
+## a11y_autocomplete_valid
+
+The value '%value%' is not supported by the attribute 'autocomplete' on element <input type="%type%">
+
+## a11y_img_redundant_alt
+
+Screenreaders already announce <img> elements as an image.
+
+## a11y_label_has_associated_control
+
+A form label must be associated with a control.
+
+## a11y_media_has_caption
+
+<video> elements must have a <track kind="captions">
+
+## a11y_distracting_elements
+
+Avoid <%name%> elements
+
+## a11y_figcaption_parent
+
+`<figcaption>` must be an immediate child of `<figure>`
+
+## a11y_figcaption_index
+
+`<figcaption>` must be first or last child of `<figure>`
+
+## a11y_mouse_events_have_key_events
+
+'%event%' event must be accompanied by '%accompanied_by%' event
+
+## a11y_missing_content
+
+<%name%> element should have child content
diff --git a/packages/svelte/messages/compile-warnings/attributes.md b/packages/svelte/messages/compile-warnings/attributes.md
new file mode 100644
index 0000000000..dba95975e8
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/attributes.md
@@ -0,0 +1,15 @@
+## avoid_is
+
+The "is" attribute is not supported cross-browser and should be avoided
+
+## global_event_reference
+
+You are referencing globalThis.%name%. Did you forget to declare a variable with that name?
+
+## illegal_attribute_character
+
+Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
+
+## invalid_html_attribute
+
+'%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
diff --git a/packages/svelte/messages/compile-warnings/block.md b/packages/svelte/messages/compile-warnings/block.md
new file mode 100644
index 0000000000..bf4f07c31e
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/block.md
@@ -0,0 +1,3 @@
+## empty_block
+
+Empty block
diff --git a/packages/svelte/messages/compile-warnings/components.md b/packages/svelte/messages/compile-warnings/components.md
new file mode 100644
index 0000000000..f13f105a68
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/components.md
@@ -0,0 +1,3 @@
+## component_name_lowercase
+
+<%name%> will be treated as an HTML element unless it begins with a capital letter
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/css.md b/packages/svelte/messages/compile-warnings/css.md
new file mode 100644
index 0000000000..1272fe69a1
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/css.md
@@ -0,0 +1,3 @@
+## css_unused_selector
+
+Unused CSS selector "%name%"
diff --git a/packages/svelte/messages/compile-warnings/legacy.md b/packages/svelte/messages/compile-warnings/legacy.md
new file mode 100644
index 0000000000..c87d717d2d
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/legacy.md
@@ -0,0 +1,19 @@
+## no_reactive_declaration
+
+Reactive declarations only exist at the top level of the instance script
+
+## module_script_reactive_declaration
+
+All dependencies of the reactive declaration are declared in a module script and will not be reactive
+
+## unused_export_let
+
+Component has unused export property '%name%'. If it is for external reference only, please consider using `export const %name%`
+
+## deprecated_slot_element
+
+Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.
+
+## deprecated_event_handler
+
+Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
diff --git a/packages/svelte/messages/compile-warnings/misc.md b/packages/svelte/messages/compile-warnings/misc.md
new file mode 100644
index 0000000000..dfdf6bdef2
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/misc.md
@@ -0,0 +1,3 @@
+## invalid_self_closing_tag
+
+Self-closing HTML tags for non-void elements are ambiguous — use <%name% ...></%name%> rather than <%name% ... />
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/options.md b/packages/svelte/messages/compile-warnings/options.md
new file mode 100644
index 0000000000..0b970fb26c
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/options.md
@@ -0,0 +1,3 @@
+## missing_custom_element_compile_option
+
+The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?
diff --git a/packages/svelte/messages/compile-warnings/performance.md b/packages/svelte/messages/compile-warnings/performance.md
new file mode 100644
index 0000000000..b39511370d
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/performance.md
@@ -0,0 +1,7 @@
+## avoid_inline_class
+
+Avoid 'new class' — instead, declare the class at the top level scope
+
+## avoid_nested_class
+
+Avoid declaring classes below the top level scope
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/runes.md b/packages/svelte/messages/compile-warnings/runes.md
new file mode 100644
index 0000000000..a29d6c41b5
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/runes.md
@@ -0,0 +1,19 @@
+## store_with_rune_name
+
+It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
+
+## non_state_reference
+
+`%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
+
+## derived_iife
+
+Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
+
+## invalid_props_declaration
+
+Component properties are declared using `$props()` in runes mode. Did you forget to call the function?
+
+## invalid_bindable_declaration
+
+Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?
diff --git a/packages/svelte/messages/compile-warnings/state.md b/packages/svelte/messages/compile-warnings/state.md
new file mode 100644
index 0000000000..f77fbe514e
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/state.md
@@ -0,0 +1,7 @@
+## static_state_reference
+
+State referenced in its own scope will never update. Did you mean to reference it inside a closure?
+
+## invalid_rest_eachblock_binding
+
+The rest operator (...) will create a new object and binding '%name%' with the original object will not work
\ No newline at end of file
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 11b8c7a46c..ff2640b432 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -99,8 +99,8 @@
     "templating"
   ],
   "scripts": {
-    "build": "rollup -c && pnpm generate:types && node scripts/check-treeshakeability.js",
-    "dev": "rollup -cw",
+    "build": "node scripts/process-messages && rollup -c && pnpm generate:types && node scripts/check-treeshakeability.js",
+    "dev": "node scripts/process-messages && rollup -cw",
     "check": "tsc && cd ./tests/types && tsc",
     "check:watch": "tsc --watch",
     "generate:version": "node ./scripts/generate-version.js",
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
index 52cb23aec3..80c3a811d9 100644
--- a/packages/svelte/scripts/process-messages/index.js
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -111,12 +111,20 @@ function transform(name, dest) {
 				const value = node.value
 					.split('\n')
 					.map((line) => {
+						if (line === ' * MESSAGE') {
+							return message
+								.split('\n')
+								.map((line) => ` * ${line}`)
+								.join('\n');
+						}
+
 						if (line.includes('PARAMETER')) {
 							return vars.map((name) => ` * @param {string} ${name}`).join('\n');
 						}
 
 						return line;
 					})
+					.filter((x) => x !== '')
 					.join('\n');
 
 				if (value !== node.value) {
@@ -168,7 +176,7 @@ function transform(name, dest) {
 					for (let i = 0; i < parts.length; i += 1) {
 						const part = parts[i];
 						if (i % 2 === 0) {
-							const str = part.replace(/(`|\$)/g, '\\$1');
+							const str = part.replace(/(`|\${)/g, '\\$1');
 							quasis.push({
 								type: 'TemplateElement',
 								value: { raw: str, cooked: str },
@@ -211,3 +219,4 @@ function transform(name, dest) {
 }
 
 transform('compile-errors', 'src/compiler/errors.js');
+transform('compile-warnings', 'src/compiler/warnings.js');
diff --git a/packages/svelte/scripts/process-messages/templates/compile-errors.js b/packages/svelte/scripts/process-messages/templates/compile-errors.js
index 96dcb72b3f..cd4d0d56ed 100644
--- a/packages/svelte/scripts/process-messages/templates/compile-errors.js
+++ b/packages/svelte/scripts/process-messages/templates/compile-errors.js
@@ -47,7 +47,6 @@ export class CompileError extends Error {
 }
 
 /**
- *
  * @param {null | number | NodeLike} node
  * @param {string} code
  * @param {string} message
@@ -65,6 +64,7 @@ function e(node, code, message) {
 }
 
 /**
+ * MESSAGE
  * @param {null | number | NodeLike} node
  * @param {string} PARAMETER
  * @returns {never}
diff --git a/packages/svelte/scripts/process-messages/templates/compile-warnings.js b/packages/svelte/scripts/process-messages/templates/compile-warnings.js
new file mode 100644
index 0000000000..e9a0ad3a7d
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/compile-warnings.js
@@ -0,0 +1,52 @@
+import { getLocator } from 'locate-character';
+
+/** @typedef {{ start?: number, end?: number }} NodeLike */
+
+/** @type {import('#compiler').Warning[]} */
+let warnings = [];
+
+/** @type {string | undefined} */
+let filename;
+
+let locator = getLocator('', { offsetLine: 1 });
+
+/**
+ * @param {{
+ *   source: string;
+ *   filename: string | undefined;
+ * }} options
+ * @returns {import('#compiler').Warning[]}
+ */
+export function reset_warnings(options) {
+	filename = options.filename;
+	locator = getLocator(options.source, { offsetLine: 1 });
+
+	return (warnings = []);
+}
+
+/**
+ * @param {null | NodeLike} node
+ * @param {string} code
+ * @param {string} message
+ */
+function w(node, code, message) {
+	// @ts-expect-error
+	if (node.ignores?.has(code)) return;
+
+	warnings.push({
+		code,
+		message,
+		filename,
+		start: node?.start !== undefined ? locator(node.start) : undefined,
+		end: node?.end !== undefined ? locator(node.end) : undefined
+	});
+}
+
+/**
+ * MESSAGE
+ * @param {null | NodeLike} node
+ * @param {string} PARAMETER
+ */
+export function CODE(node, PARAMETER) {
+	w(node, 'CODE', MESSAGE);
+}
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index ee2a961868..761478c24c 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -44,7 +44,6 @@ export class CompileError extends Error {
 }
 
 /**
- *
  * @param {null | number | NodeLike} node
  * @param {string} code
  * @param {string} message
@@ -58,8 +57,8 @@ function e(node, code, message) {
 }
 
 /**
+ * Attribute shorthand cannot be empty
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function empty_attribute_shorthand(node) {
@@ -67,8 +66,8 @@ export function empty_attribute_shorthand(node) {
 }
 
 /**
+ * Attributes need to be unique
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function duplicate_attribute(node) {
@@ -76,8 +75,8 @@ export function duplicate_attribute(node) {
 }
 
 /**
+ * Event attribute must be a JavaScript expression, not a string
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_event_attribute_value(node) {
@@ -85,6 +84,7 @@ export function invalid_event_attribute_value(node) {
 }
 
 /**
+ * '%name%' is not a valid attribute name
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -94,8 +94,8 @@ export function invalid_attribute_name(node, name) {
 }
 
 /**
+ * An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function animation_invalid_placement(node) {
@@ -103,8 +103,8 @@ export function animation_invalid_placement(node) {
 }
 
 /**
+ * An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function animation_missing_key(node) {
@@ -112,8 +112,8 @@ export function animation_missing_key(node) {
 }
 
 /**
+ * An element can only have one 'animate' directive
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function animation_duplicate(node) {
@@ -121,6 +121,7 @@ export function animation_duplicate(node) {
 }
 
 /**
+ * Valid event modifiers are %list%
  * @param {null | number | NodeLike} node
  * @param {string} list
  * @returns {never}
@@ -130,8 +131,8 @@ export function invalid_event_modifier(node, list) {
 }
 
 /**
+ * Event modifiers other than 'once' can only be used on DOM elements
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_component_event_modifier(node) {
@@ -139,6 +140,7 @@ export function invalid_component_event_modifier(node) {
 }
 
 /**
+ * The '%modifier1%' and '%modifier2%' modifiers cannot be used together
  * @param {null | number | NodeLike} node
  * @param {string} modifier1
  * @param {string} modifier2
@@ -149,6 +151,7 @@ export function invalid_event_modifier_combination(node, modifier1, modifier2) {
 }
 
 /**
+ * Cannot use multiple `%type%:` directives on a single element
  * @param {null | number | NodeLike} node
  * @param {string} type
  * @returns {never}
@@ -158,6 +161,7 @@ export function transition_duplicate(node, type) {
 }
 
 /**
+ * Cannot use `%type%:` alongside existing `%existing%:` directive
  * @param {null | number | NodeLike} node
  * @param {string} type
  * @param {string} existing
@@ -168,8 +172,8 @@ export function transition_conflict(node, type, existing) {
 }
 
 /**
+ * `let:` directive at invalid position
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_let_directive_placement(node) {
@@ -177,8 +181,8 @@ export function invalid_let_directive_placement(node) {
 }
 
 /**
+ * Invalid 'style:' modifier. Valid modifiers are: 'important'
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_style_directive_modifier(node) {
@@ -186,8 +190,8 @@ export function invalid_style_directive_modifier(node) {
 }
 
 /**
+ * Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_sequence_expression(node) {
@@ -195,8 +199,8 @@ export function invalid_sequence_expression(node) {
 }
 
 /**
+ * Can only bind to an Identifier or MemberExpression
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_binding_expression(node) {
@@ -204,8 +208,8 @@ export function invalid_binding_expression(node) {
 }
 
 /**
+ * Can only bind to state or props
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_binding_value(node) {
@@ -213,6 +217,7 @@ export function invalid_binding_value(node) {
 }
 
 /**
+ * `bind:%name%` can only be used with %elements%
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @param {string} elements
@@ -223,6 +228,7 @@ export function bind_invalid_target(node, name, elements) {
 }
 
 /**
+ * `bind:%name%` is not a valid binding
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -232,6 +238,7 @@ export function bind_invalid(node, name) {
 }
 
 /**
+ * `bind:%name%` is not a valid binding. %explanation%
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @param {string} explanation
@@ -242,8 +249,8 @@ export function bind_invalid_detailed(node, name, explanation) {
 }
 
 /**
+ * 'type' attribute must be a static text value if input uses two-way binding
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_type_attribute(node) {
@@ -251,8 +258,8 @@ export function invalid_type_attribute(node) {
 }
 
 /**
+ * 'multiple' attribute must be static if select uses two-way binding
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_multiple_attribute(node) {
@@ -260,8 +267,8 @@ export function invalid_multiple_attribute(node) {
 }
 
 /**
+ * 'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function missing_contenteditable_attribute(node) {
@@ -269,8 +276,8 @@ export function missing_contenteditable_attribute(node) {
 }
 
 /**
+ * 'contenteditable' attribute cannot be dynamic if element uses two-way binding
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function dynamic_contenteditable_attribute(node) {
@@ -278,6 +285,7 @@ export function dynamic_contenteditable_attribute(node) {
 }
 
 /**
+ * Invalid compiler option: %msg%
  * @param {null | number | NodeLike} node
  * @param {string} msg
  * @returns {never}
@@ -287,6 +295,7 @@ export function invalid_compiler_option(node, msg) {
 }
 
 /**
+ * Invalid compiler option: %msg%
  * @param {null | number | NodeLike} node
  * @param {string} msg
  * @returns {never}
@@ -296,8 +305,8 @@ export function removed_compiler_option(node, msg) {
 }
 
 /**
+ * This type of directive is not valid on components
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_component_directive(node) {
@@ -305,8 +314,8 @@ export function invalid_component_directive(node) {
 }
 
 /**
+ * {@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_const_placement(node) {
@@ -314,8 +323,8 @@ export function invalid_const_placement(node) {
 }
 
 /**
+ * Declaration cannot be empty
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_empty_declaration(node) {
@@ -323,8 +332,8 @@ export function invalid_css_empty_declaration(node) {
 }
 
 /**
+ * A :global {...} block cannot be part of a selector list with more than one item
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_global_block_list(node) {
@@ -332,8 +341,8 @@ export function invalid_css_global_block_list(node) {
 }
 
 /**
+ * A :global {...} block cannot modify an existing selector
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_global_block_modifier(node) {
@@ -341,6 +350,7 @@ export function invalid_css_global_block_modifier(node) {
 }
 
 /**
+ * A :global {...} block cannot follow a %name% combinator
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -350,8 +360,8 @@ export function invalid_css_global_block_combinator(node, name) {
 }
 
 /**
+ * A :global {...} block can only contain rules, not declarations
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_global_block_declaration(node) {
@@ -359,8 +369,8 @@ export function invalid_css_global_block_declaration(node) {
 }
 
 /**
+ * :global(...) can be at the start or end of a selector sequence, but not in the middle
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_global_placement(node) {
@@ -368,8 +378,8 @@ export function invalid_css_global_placement(node) {
 }
 
 /**
+ * :global(...) must contain exactly one selector
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_global_selector(node) {
@@ -377,8 +387,8 @@ export function invalid_css_global_selector(node) {
 }
 
 /**
+ * :global(...) must not contain type or universal selectors when used in a compound selector
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_global_selector_list(node) {
@@ -386,8 +396,8 @@ export function invalid_css_global_selector_list(node) {
 }
 
 /**
+ * :global(...) must not be followed with a type selector
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_type_selector_placement(node) {
@@ -395,8 +405,8 @@ export function invalid_css_type_selector_placement(node) {
 }
 
 /**
+ * Invalid selector
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_selector(node) {
@@ -404,8 +414,8 @@ export function invalid_css_selector(node) {
 }
 
 /**
+ * Expected a valid CSS identifier
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_identifier(node) {
@@ -413,8 +423,8 @@ export function invalid_css_identifier(node) {
 }
 
 /**
+ * Nesting selectors can only be used inside a rule
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_nesting_selector(node) {
@@ -422,8 +432,8 @@ export function invalid_nesting_selector(node) {
 }
 
 /**
+ * Declaration cannot be empty
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_css_declaration(node) {
@@ -431,8 +441,8 @@ export function invalid_css_declaration(node) {
 }
 
 /**
+ * A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_textarea_content(node) {
@@ -440,8 +450,8 @@ export function invalid_textarea_content(node) {
 }
 
 /**
+ * Void elements cannot have children or closing tags
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_void_content(node) {
@@ -449,6 +459,7 @@ export function invalid_void_content(node) {
 }
 
 /**
+ * <%name%> cannot have children
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -458,8 +469,8 @@ export function invalid_element_content(node, name) {
 }
 
 /**
+ * Expected valid tag name
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_tag_name(node) {
@@ -467,6 +478,7 @@ export function invalid_tag_name(node) {
 }
 
 /**
+ * %thing% is invalid inside <%parent%>
  * @param {null | number | NodeLike} node
  * @param {string} thing
  * @param {string} parent
@@ -477,8 +489,8 @@ export function invalid_node_placement(node, thing, parent) {
 }
 
 /**
+ * `<title>` cannot have attributes nor directives
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function illegal_title_attribute(node) {
@@ -486,8 +498,8 @@ export function illegal_title_attribute(node) {
 }
 
 /**
+ * `<title>` can only contain text and {tags}
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_title_content(node) {
@@ -495,6 +507,7 @@ export function invalid_title_content(node) {
 }
 
 /**
+ * Cyclical dependency detected: %cycle%
  * @param {null | number | NodeLike} node
  * @param {string} cycle
  * @returns {never}
@@ -504,6 +517,7 @@ export function cyclical_reactive_declaration(node, cycle) {
 }
 
 /**
+ * `<%name%>` was left open
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -513,8 +527,8 @@ export function unclosed_element(node, name) {
 }
 
 /**
+ * Block was left open
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function unclosed_block(node) {
@@ -522,8 +536,8 @@ export function unclosed_block(node) {
 }
 
 /**
+ * Unexpected block closing tag
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function unexpected_block_close(node) {
@@ -531,8 +545,8 @@ export function unexpected_block_close(node) {
 }
 
 /**
+ * Unexpected end of input
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function unexpected_eof(node) {
@@ -540,6 +554,7 @@ export function unexpected_eof(node) {
 }
 
 /**
+ * %message%
  * @param {null | number | NodeLike} node
  * @param {string} message
  * @returns {never}
@@ -549,6 +564,7 @@ export function js_parse_error(node, message) {
 }
 
 /**
+ * Expected token %token%
  * @param {null | number | NodeLike} node
  * @param {string} token
  * @returns {never}
@@ -558,6 +574,7 @@ export function expected_token(node, token) {
 }
 
 /**
+ * '%word%' is a reserved word in JavaScript and cannot be used here
  * @param {null | number | NodeLike} node
  * @param {string} word
  * @returns {never}
@@ -567,8 +584,8 @@ export function unexpected_reserved_word(node, word) {
 }
 
 /**
+ * Expected whitespace
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function missing_whitespace(node) {
@@ -576,8 +593,8 @@ export function missing_whitespace(node) {
 }
 
 /**
+ * Expected identifier or destructure pattern
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function expected_pattern(node) {
@@ -585,8 +602,8 @@ export function expected_pattern(node) {
 }
 
 /**
+ * If the context attribute is supplied, its value must be "module"
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_script_context(node) {
@@ -594,8 +611,8 @@ export function invalid_script_context(node) {
 }
 
 /**
+ * 'elseif' should be 'else if'
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_elseif(node) {
@@ -603,8 +620,8 @@ export function invalid_elseif(node) {
 }
 
 /**
+ * {:...} block is invalid at this position (did you forget to close the preceeding element or block?)
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_continuing_block_placement(node) {
@@ -612,6 +629,7 @@ export function invalid_continuing_block_placement(node) {
 }
 
 /**
+ * %child% block must be a child of %parent%
  * @param {null | number | NodeLike} node
  * @param {string} child
  * @param {string} parent
@@ -622,6 +640,7 @@ export function invalid_block_missing_parent(node, child, parent) {
 }
 
 /**
+ * %name% cannot appear more than once within a block
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -631,8 +650,8 @@ export function duplicate_block_part(node, name) {
 }
 
 /**
+ * Expected 'if', 'each', 'await', 'key' or 'snippet'
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function expected_block_type(node) {
@@ -640,8 +659,8 @@ export function expected_block_type(node) {
 }
 
 /**
+ * Expected an identifier
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function expected_identifier(node) {
@@ -649,8 +668,8 @@ export function expected_identifier(node) {
 }
 
 /**
+ * {@debug ...} arguments must be identifiers, not arbitrary expressions
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_debug(node) {
@@ -658,8 +677,8 @@ export function invalid_debug(node) {
 }
 
 /**
+ * {@const ...} must be an assignment
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_const(node) {
@@ -667,6 +686,7 @@ export function invalid_const(node) {
 }
 
 /**
+ * {#%name% ...} block cannot be %location%
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @param {string} location
@@ -677,6 +697,7 @@ export function invalid_block_placement(node, name, location) {
 }
 
 /**
+ * {@%name% ...} tag cannot be %location%
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @param {string} location
@@ -687,8 +708,8 @@ export function invalid_tag_placement(node, name, location) {
 }
 
 /**
+ * Expected attribute value
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function missing_attribute_value(node) {
@@ -696,6 +717,7 @@ export function missing_attribute_value(node) {
 }
 
 /**
+ * Expected closing %delimiter% character
  * @param {null | number | NodeLike} node
  * @param {string} delimiter
  * @returns {never}
@@ -705,8 +727,8 @@ export function unclosed_attribute_value(node, delimiter) {
 }
 
 /**
+ * Directive value must be a JavaScript expression enclosed in curly braces
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_directive_value(node) {
@@ -714,6 +736,7 @@ export function invalid_directive_value(node) {
 }
 
 /**
+ * %type% name cannot be empty
  * @param {null | number | NodeLike} node
  * @param {string} type
  * @returns {never}
@@ -723,6 +746,7 @@ export function empty_directive_name(node, type) {
 }
 
 /**
+ * </%name%> attempted to close an element that was not open
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -732,6 +756,7 @@ export function invalid_closing_tag(node, name) {
 }
 
 /**
+ * </%name%> attempted to close element that was already automatically closed by <%reason%> (cannot nest <%reason%> inside <%name%>)
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @param {string} reason
@@ -742,8 +767,8 @@ export function invalid_closing_tag_after_autoclose(node, name, reason) {
 }
 
 /**
+ * The $ name is reserved, and cannot be used for variables and imports
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_dollar_binding(node) {
@@ -751,8 +776,8 @@ export function invalid_dollar_binding(node) {
 }
 
 /**
+ * The $ prefix is reserved, and cannot be used for variables and imports
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_dollar_prefix(node) {
@@ -760,8 +785,8 @@ export function invalid_dollar_prefix(node) {
 }
 
 /**
+ * The $ name is reserved. To reference a global variable called $, use globalThis.$
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_dollar_global(node) {
@@ -769,8 +794,8 @@ export function invalid_dollar_global(node) {
 }
 
 /**
+ * Cannot reference store value inside `<script context="module">`
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function illegal_subscription(node) {
@@ -778,8 +803,8 @@ export function illegal_subscription(node) {
 }
 
 /**
+ * A component can have a single top-level `<style>` element
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function duplicate_style_element(node) {
@@ -787,8 +812,8 @@ export function duplicate_style_element(node) {
 }
 
 /**
+ * A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function duplicate_script_element(node) {
@@ -796,8 +821,8 @@ export function duplicate_script_element(node) {
 }
 
 /**
+ * {@render ...} tags can only contain call expressions
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_render_expression(node) {
@@ -805,8 +830,8 @@ export function invalid_render_expression(node) {
 }
 
 /**
+ * expected at most one argument
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_render_arguments(node) {
@@ -814,8 +839,8 @@ export function invalid_render_arguments(node) {
 }
 
 /**
+ * Calling a snippet function using apply, bind or call is not allowed
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_render_call(node) {
@@ -823,8 +848,8 @@ export function invalid_render_call(node) {
 }
 
 /**
+ * cannot use spread arguments in {@render ...} tags
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_render_spread_argument(node) {
@@ -832,8 +857,8 @@ export function invalid_render_spread_argument(node) {
 }
 
 /**
+ * snippets do not support rest parameters; use an array instead
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_snippet_rest_parameter(node) {
@@ -841,8 +866,8 @@ export function invalid_snippet_rest_parameter(node) {
 }
 
 /**
+ * Cannot use `$$props` in runes mode
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_legacy_props(node) {
@@ -850,8 +875,8 @@ export function invalid_legacy_props(node) {
 }
 
 /**
+ * Cannot use `$$restProps` in runes mode
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_legacy_rest_props(node) {
@@ -859,8 +884,8 @@ export function invalid_legacy_rest_props(node) {
 }
 
 /**
+ * `$:` is not allowed in runes mode, use `$derived` or `$effect` instead
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_legacy_reactive_statement(node) {
@@ -868,8 +893,8 @@ export function invalid_legacy_reactive_statement(node) {
 }
 
 /**
+ * Cannot use `export let` in runes mode — use $props instead
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_legacy_export(node) {
@@ -877,6 +902,7 @@ export function invalid_legacy_export(node) {
 }
 
 /**
+ * Cannot use %rune% rune in non-runes mode
  * @param {null | number | NodeLike} node
  * @param {string} rune
  * @returns {never}
@@ -886,8 +912,8 @@ export function invalid_rune_usage(node, rune) {
 }
 
 /**
+ * Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_state_export(node) {
@@ -895,8 +921,8 @@ export function invalid_state_export(node) {
 }
 
 /**
+ * Cannot export derived state from a module. To expose the current derived value, export a function returning its value
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_derived_export(node) {
@@ -904,8 +930,8 @@ export function invalid_derived_export(node) {
 }
 
 /**
+ * `$props()` can only be used with an object destructuring pattern
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_props_id(node) {
@@ -913,8 +939,8 @@ export function invalid_props_id(node) {
 }
 
 /**
+ * `$props()` assignment must not contain nested properties or computed keys
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_props_pattern(node) {
@@ -922,8 +948,8 @@ export function invalid_props_pattern(node) {
 }
 
 /**
+ * `$props()` can only be used at the top level of components as a variable declaration initializer
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_props_location(node) {
@@ -931,8 +957,8 @@ export function invalid_props_location(node) {
 }
 
 /**
+ * `$bindable()` can only be used inside a `$props()` declaration
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_bindable_location(node) {
@@ -940,6 +966,7 @@ export function invalid_bindable_location(node) {
 }
 
 /**
+ * `%rune%(...)` can only be used as a variable declaration initializer or a class field
  * @param {null | number | NodeLike} node
  * @param {string} rune
  * @returns {never}
@@ -949,8 +976,8 @@ export function invalid_state_location(node, rune) {
 }
 
 /**
+ * `$effect()` can only be used as an expression statement
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_effect_location(node) {
@@ -958,8 +985,8 @@ export function invalid_effect_location(node) {
 }
 
 /**
+ * `$host()` can only be used inside custom element component instances
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_host_location(node) {
@@ -967,6 +994,7 @@ export function invalid_host_location(node) {
 }
 
 /**
+ * Cannot assign to %thing%
  * @param {null | number | NodeLike} node
  * @param {string} thing
  * @returns {never}
@@ -976,6 +1004,7 @@ export function invalid_assignment(node, thing) {
 }
 
 /**
+ * Cannot bind to %thing%
  * @param {null | number | NodeLike} node
  * @param {string} thing
  * @returns {never}
@@ -985,6 +1014,7 @@ export function invalid_binding(node, thing) {
 }
 
 /**
+ * `%rune%` cannot be called with arguments
  * @param {null | number | NodeLike} node
  * @param {string} rune
  * @returns {never}
@@ -994,6 +1024,7 @@ export function invalid_rune_args(node, rune) {
 }
 
 /**
+ * `%rune%` must be called with %args%
  * @param {null | number | NodeLike} node
  * @param {string} rune
  * @param {string} args
@@ -1004,6 +1035,7 @@ export function invalid_rune_args_length(node, rune, args) {
 }
 
 /**
+ * %name% cannot be used in runes mode
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -1013,8 +1045,8 @@ export function invalid_runes_mode_import(node, name) {
 }
 
 /**
+ * Cannot use `$props()` more than once
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function duplicate_props_rune(node) {
@@ -1022,8 +1054,8 @@ export function duplicate_props_rune(node) {
 }
 
 /**
+ * Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_each_assignment(node) {
@@ -1031,8 +1063,8 @@ export function invalid_each_assignment(node) {
 }
 
 /**
+ * Cannot reassign or bind to snippet parameter
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_snippet_assignment(node) {
@@ -1040,8 +1072,8 @@ export function invalid_snippet_assignment(node) {
 }
 
 /**
+ * `$derived.call(...)` has been replaced with `$derived.by(...)`
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_derived_call(node) {
@@ -1049,8 +1081,8 @@ export function invalid_derived_call(node) {
 }
 
 /**
+ * Cannot have a property and a component export with the same name
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function conflicting_property_name(node) {
@@ -1058,8 +1090,8 @@ export function conflicting_property_name(node) {
 }
 
 /**
+ * `<slot>` can only receive attributes and (optionally) let directives
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_slot_element_attribute(node) {
@@ -1067,8 +1099,8 @@ export function invalid_slot_element_attribute(node) {
 }
 
 /**
+ * slot attribute must be a static value
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_slot_attribute(node) {
@@ -1076,8 +1108,8 @@ export function invalid_slot_attribute(node) {
 }
 
 /**
+ * `default` is a reserved word — it cannot be used as a slot name
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_slot_name_default(node) {
@@ -1085,8 +1117,8 @@ export function invalid_slot_name_default(node) {
 }
 
 /**
+ * slot attribute must be a static value
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_slot_name(node) {
@@ -1094,8 +1126,8 @@ export function invalid_slot_name(node) {
 }
 
 /**
+ * Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_slot_placement(node) {
@@ -1103,6 +1135,7 @@ export function invalid_slot_placement(node) {
 }
 
 /**
+ * Duplicate slot name '%name%' in <%component%>
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @param {string} component
@@ -1113,8 +1146,8 @@ export function duplicate_slot_name(node, name, component) {
 }
 
 /**
+ * Found default slot content alongside an explicit slot="default"
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_default_slot_content(node) {
@@ -1122,8 +1155,8 @@ export function invalid_default_slot_content(node) {
 }
 
 /**
+ * Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function conflicting_children_snippet(node) {
@@ -1131,8 +1164,8 @@ export function conflicting_children_snippet(node) {
 }
 
 /**
+ * `<svelte:options>` can only receive static attributes
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_option_attribute(node) {
@@ -1140,8 +1173,8 @@ export function invalid_svelte_option_attribute(node) {
 }
 
 /**
+ * Unsupported `<svelte:option>` value for "namespace". Valid values are "html", "svg" or "foreign"
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_option_namespace(node) {
@@ -1149,8 +1182,8 @@ export function invalid_svelte_option_namespace(node) {
 }
 
 /**
+ * "tag" option is deprecated — use "customElement" instead
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function tag_option_deprecated(node) {
@@ -1158,8 +1191,8 @@ export function tag_option_deprecated(node) {
 }
 
 /**
+ * Unsupported `<svelte:option>` value for "runes". Valid values are true or false
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_option_runes(node) {
@@ -1167,8 +1200,8 @@ export function invalid_svelte_option_runes(node) {
 }
 
 /**
+ * Unsupported `<svelte:option>` value for "accessors". Valid values are true or false
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_option_accessors(node) {
@@ -1176,8 +1209,8 @@ export function invalid_svelte_option_accessors(node) {
 }
 
 /**
+ * Unsupported `<svelte:option>` value for "preserveWhitespace". Valid values are true or false
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_option_preserveWhitespace(node) {
@@ -1185,8 +1218,8 @@ export function invalid_svelte_option_preserveWhitespace(node) {
 }
 
 /**
+ * Unsupported `<svelte:option>` value for "immutable". Valid values are true or false
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_option_immutable(node) {
@@ -1194,8 +1227,8 @@ export function invalid_svelte_option_immutable(node) {
 }
 
 /**
+ * Tag name must be two or more words joined by the "-" character
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_tag_property(node) {
@@ -1203,8 +1236,8 @@ export function invalid_tag_property(node) {
 }
 
 /**
+ * "customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_option_customElement(node) {
@@ -1212,8 +1245,8 @@ export function invalid_svelte_option_customElement(node) {
 }
 
 /**
+ * "props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_customElement_props_attribute(node) {
@@ -1221,8 +1254,8 @@ export function invalid_customElement_props_attribute(node) {
 }
 
 /**
+ * "shadow" must be either "open" or "none"
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_customElement_shadow_attribute(node) {
@@ -1230,6 +1263,7 @@ export function invalid_customElement_shadow_attribute(node) {
 }
 
 /**
+ * `<svelte:options>` unknown attribute '%name%'
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -1239,8 +1273,8 @@ export function unknown_svelte_option_attribute(node, name) {
 }
 
 /**
+ * `<svelte:head>` cannot have attributes nor directives
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function illegal_svelte_head_attribute(node) {
@@ -1248,8 +1282,8 @@ export function illegal_svelte_head_attribute(node) {
 }
 
 /**
+ * `<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_fragment_attribute(node) {
@@ -1257,8 +1291,8 @@ export function invalid_svelte_fragment_attribute(node) {
 }
 
 /**
+ * `<svelte:fragment>` slot attribute must have a static value
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_fragment_slot(node) {
@@ -1266,8 +1300,8 @@ export function invalid_svelte_fragment_slot(node) {
 }
 
 /**
+ * `<svelte:fragment>` must be the direct child of a component
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_fragment_placement(node) {
@@ -1275,6 +1309,7 @@ export function invalid_svelte_fragment_placement(node) {
 }
 
 /**
+ * <%name%> tags cannot be inside elements or blocks
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -1284,6 +1319,7 @@ export function invalid_svelte_element_placement(node, name) {
 }
 
 /**
+ * A component can only have one <%name%> element
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -1293,8 +1329,8 @@ export function duplicate_svelte_element(node, name) {
 }
 
 /**
+ * `<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_self_placement(node) {
@@ -1302,8 +1338,8 @@ export function invalid_self_placement(node) {
 }
 
 /**
+ * `<svelte:element>` must have a 'this' attribute
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function missing_svelte_element_definition(node) {
@@ -1311,8 +1347,8 @@ export function missing_svelte_element_definition(node) {
 }
 
 /**
+ * `<svelte:component>` must have a 'this' attribute
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function missing_svelte_component_definition(node) {
@@ -1320,8 +1356,8 @@ export function missing_svelte_component_definition(node) {
 }
 
 /**
+ * Invalid element definition — must be an {expression}
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_element_definition(node) {
@@ -1329,8 +1365,8 @@ export function invalid_svelte_element_definition(node) {
 }
 
 /**
+ * Invalid component definition — must be an {expression}
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function invalid_svelte_component_definition(node) {
@@ -1338,6 +1374,7 @@ export function invalid_svelte_component_definition(node) {
 }
 
 /**
+ * Valid `<svelte:...>` tag names are %list%
  * @param {null | number | NodeLike} node
  * @param {string} list
  * @returns {never}
@@ -1347,8 +1384,8 @@ export function invalid_svelte_tag(node, list) {
 }
 
 /**
+ * Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function conflicting_slot_usage(node) {
@@ -1356,6 +1393,7 @@ export function conflicting_slot_usage(node) {
 }
 
 /**
+ * `%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -1365,6 +1403,7 @@ export function illegal_global(node, name) {
 }
 
 /**
+ * `%name%` has already been declared
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
@@ -1374,8 +1413,8 @@ export function duplicate_declaration(node, name) {
 }
 
 /**
+ * A component cannot have a default export
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function default_export(node) {
@@ -1383,8 +1422,8 @@ export function default_export(node) {
 }
 
 /**
+ * Cannot declare same variable name which is imported inside `<script context="module">`
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function illegal_variable_declaration(node) {
@@ -1392,8 +1431,8 @@ export function illegal_variable_declaration(node) {
 }
 
 /**
+ * Cannot subscribe to stores that are not declared at the top level of the component
  * @param {null | number | NodeLike} node
-
  * @returns {never}
  */
 export function illegal_store_subscription(node) {
diff --git a/packages/svelte/src/compiler/index.js b/packages/svelte/src/compiler/index.js
index eee35bf2a8..c2516a2e5f 100644
--- a/packages/svelte/src/compiler/index.js
+++ b/packages/svelte/src/compiler/index.js
@@ -8,6 +8,7 @@ import { remove_typescript_nodes } from './phases/1-parse/remove_typescript_node
 import { analyze_component, analyze_module } from './phases/2-analyze/index.js';
 import { transform_component, transform_module } from './phases/3-transform/index.js';
 import { validate_component_options, validate_module_options } from './validate-options.js';
+import { reset_warnings } from './warnings.js';
 export { default as preprocess } from './preprocess/index.js';
 
 /**
@@ -20,6 +21,7 @@ export { default as preprocess } from './preprocess/index.js';
  */
 export function compile(source, options) {
 	try {
+		const warnings = reset_warnings({ source, filename: options.filename });
 		const validated = validate_component_options(options, '');
 		let parsed = _parse(source);
 
@@ -44,6 +46,7 @@ export function compile(source, options) {
 		const analysis = analyze_component(parsed, source, combined_options);
 
 		const result = transform_component(analysis, source, combined_options);
+		result.warnings = warnings;
 		result.ast = to_public_ast(source, parsed, options.modernAst);
 		return result;
 	} catch (e) {
@@ -65,9 +68,12 @@ export function compile(source, options) {
  */
 export function compileModule(source, options) {
 	try {
+		const warnings = reset_warnings({ source, filename: options.filename });
 		const validated = validate_module_options(options, '');
 		const analysis = analyze_module(parse_acorn(source, false), validated);
-		return transform_module(analysis, source, validated);
+		const result = transform_module(analysis, source, validated);
+		result.warnings = warnings;
+		return result;
 	} catch (e) {
 		if (e instanceof CompileError) {
 			handle_compile_error(e, options.filename, source);
diff --git a/packages/svelte/src/compiler/phases/2-analyze/a11y.js b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
index 7d01c6fdb3..0b54af4b85 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/a11y.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
@@ -7,11 +7,12 @@ import {
 	regex_starts_with_vowel,
 	regex_whitespaces
 } from '../patterns.js';
-import { warn } from '../../warnings.js';
+import * as w from '../../warnings.js';
 import fuzzymatch from '../1-parse/utils/fuzzymatch.js';
 import { is_event_attribute, is_text_attribute } from '../../utils/ast.js';
 import { ContentEditableBindings } from '../constants.js';
 import { walk } from 'zimmerframe';
+import { list } from '../../utils/string.js';
 
 const aria_roles = roles_map.keys();
 const abstract_roles = aria_roles.filter((role) => roles_map.get(role)?.abstract);
@@ -593,40 +594,53 @@ function is_parent(parent, elements) {
 }
 
 /**
+ * @param {import('#compiler').Attribute} attribute
+ * @param {import('aria-query').ARIAProperty} name
  * @param {import('aria-query').ARIAPropertyDefinition} schema
- * @param {string | boolean} value
- * @returns {boolean}
+ * @param {string | true | null} value
  */
-function is_valid_aria_attribute_value(schema, value) {
-	switch (schema.type) {
-		case 'boolean':
-			return typeof value === 'boolean';
-		case 'string':
-		case 'id':
-			return typeof value === 'string';
-		case 'tristate':
-			return typeof value === 'boolean' || value === 'mixed';
-		case 'integer':
-		case 'number':
-			return typeof value !== 'boolean' && isNaN(Number(value)) === false;
-		case 'token': // single token
-			return (
-				(schema.values || []).indexOf(typeof value === 'string' ? value.toLowerCase() : value) > -1
-			);
-		case 'idlist': // if list of ids, split each
-			return (
-				typeof value === 'string' &&
-				value.split(regex_whitespaces).every((id) => typeof id === 'string')
+function validate_aria_attribute_value(attribute, name, schema, value) {
+	const type = schema.type;
+	const is_string = typeof value === 'string';
+
+	if (value === null) return;
+	if (value === true) value = 'true'; // TODO this is actually incorrect, and we should fix it
+
+	if (type === 'boolean' && value !== 'true' && value !== 'false') {
+		w.a11y_incorrect_aria_attribute_type_boolean(attribute, name);
+	} else if (type === 'integer' && !Number.isInteger(+value)) {
+		w.a11y_incorrect_aria_attribute_type_integer(attribute, name);
+	} else if (type === 'number' && isNaN(+value)) {
+		w.a11y_incorrect_aria_attribute_type(attribute, name, 'number');
+	} else if ((type === 'string' || type === 'id') && !is_string) {
+		w.a11y_incorrect_aria_attribute_type(attribute, name, 'string');
+	} else if (type === 'idlist' && !is_string) {
+		w.a11y_incorrect_aria_attribute_type_idlist(attribute, name);
+	} else if (type === 'token') {
+		const values = (schema.values ?? []).map((value) => value.toString());
+		if (!values.includes(value.toLowerCase())) {
+			w.a11y_incorrect_aria_attribute_type_token(
+				attribute,
+				name,
+				list(values.map((v) => `"${v}"`))
 			);
-		case 'tokenlist': // if list of tokens, split each
-			return (
-				typeof value === 'string' &&
-				value
-					.split(regex_whitespaces)
-					.every((token) => (schema.values || []).indexOf(token.toLowerCase()) > -1)
+		}
+	} else if (type === 'tokenlist') {
+		const values = (schema.values ?? []).map((value) => value.toString());
+		if (
+			value
+				.toLowerCase()
+				.split(regex_whitespaces)
+				.some((value) => !values.includes(value))
+		) {
+			w.a11y_incorrect_aria_attribute_type_tokenlist(
+				attribute,
+				name,
+				list(values.map((v) => `"${v}"`))
 			);
-		default:
-			return false;
+		}
+	} else if (type === 'tristate' && value !== 'true' && value !== 'false' && value !== 'mixed') {
+		w.a11y_incorrect_aria_attribute_type_tristate(attribute, name);
 	}
 }
 
@@ -642,7 +656,8 @@ function warn_missing_attribute(node, attributes, name = node.name) {
 		attributes.length > 1
 			? attributes.slice(0, -1).join(', ') + ` or ${attributes[attributes.length - 1]}`
 			: attributes[0];
-	return /** @type {const} */ ([node, 'a11y-missing-attribute', name, article, sequence]);
+
+	w.a11y_missing_attribute(node, name, article, sequence);
 }
 
 /**
@@ -672,15 +687,6 @@ function check_element(node, state) {
 	// foreign namespace means elements can have completely different meanings, therefore we don't check them
 	if (state.options.namespace === 'foreign') return;
 
-	/**
-	 * @template {keyof import('../../warnings.js').AllWarnings} T
-	 * @param {{ start?: number, end?: number }} node
-	 * @param {T} code
-	 * @param  {Parameters<import('../../warnings.js').AllWarnings[T]>} args
-	 * @returns {void}
-	 */
-	const push_warning = (node, code, ...args) => warn(state.analysis.warnings, node, code, ...args);
-
 	/** @type {Map<string, import('#compiler').Attribute>} */
 	const attribute_map = new Map();
 
@@ -727,28 +733,35 @@ function check_element(node, state) {
 		if (name.startsWith('aria-')) {
 			if (invisible_elements.includes(node.name)) {
 				// aria-unsupported-elements
-				push_warning(attribute, 'a11y-aria-attributes', node.name);
+				w.a11y_aria_attributes(attribute, node.name);
 			}
 
 			const type = name.slice(5);
 			if (!aria_attributes.includes(type)) {
 				const match = fuzzymatch(type, aria_attributes);
-				push_warning(attribute, 'a11y-unknown-aria-attribute', type, match);
+				if (match) {
+					// TODO allow 'overloads' in messages, so that we can use the same code with and without suggestions
+					w.a11y_unknown_aria_attribute_suggestion(attribute, type, match);
+				} else {
+					w.a11y_unknown_aria_attribute(attribute, type);
+				}
 			}
 
 			if (name === 'aria-hidden' && regex_heading_tags.test(node.name)) {
-				push_warning(attribute, 'a11y-hidden', node.name);
+				w.a11y_hidden(attribute, node.name);
 			}
 
 			// aria-proptypes
 			let value = get_static_value(attribute);
-			if (value === 'true') value = true;
-			if (value === 'false') value = false;
-			if (value !== null && value !== undefined) {
-				const schema = aria.get(/** @type {import('aria-query').ARIAProperty} */ (name));
-				if (schema !== undefined && !is_valid_aria_attribute_value(schema, value)) {
-					push_warning(attribute, 'a11y-incorrect-aria-attribute-type', schema, name);
-				}
+
+			const schema = aria.get(/** @type {import('aria-query').ARIAProperty} */ (name));
+			if (schema !== undefined) {
+				validate_aria_attribute_value(
+					attribute,
+					/** @type {import('aria-query').ARIAProperty} */ (name),
+					schema,
+					value
+				);
 			}
 
 			// aria-activedescendant-has-tabindex
@@ -758,7 +771,7 @@ function check_element(node, state) {
 				!is_interactive_element(node.name, attribute_map) &&
 				!attribute_map.has('tabindex')
 			) {
-				push_warning(attribute, 'a11y-aria-activedescendant-has-tabindex');
+				w.a11y_aria_activedescendant_has_tabindex(attribute);
 			}
 		}
 
@@ -766,7 +779,7 @@ function check_element(node, state) {
 		if (name === 'role') {
 			if (invisible_elements.includes(node.name)) {
 				// aria-unsupported-elements
-				push_warning(attribute, 'a11y-misplaced-role', node.name);
+				w.a11y_misplaced_role(attribute, node.name);
 			}
 
 			const value = get_static_value(attribute);
@@ -776,10 +789,14 @@ function check_element(node, state) {
 						/** @type {import('aria-query').ARIARoleDefinitionKey} current_role */ (c_r);
 
 					if (current_role && is_abstract_role(current_role)) {
-						push_warning(attribute, 'a11y-no-abstract-role', current_role);
+						w.a11y_no_abstract_role(attribute, current_role);
 					} else if (current_role && !aria_roles.includes(current_role)) {
 						const match = fuzzymatch(current_role, aria_roles);
-						push_warning(attribute, 'a11y-unknown-role', current_role, match);
+						if (match) {
+							w.a11y_unknown_role_suggestion(attribute, current_role, match);
+						} else {
+							w.a11y_unknown_role(attribute, current_role);
+						}
 					}
 
 					// no-redundant-roles
@@ -788,7 +805,7 @@ function check_element(node, state) {
 						// <ul role="list"> is ok because CSS list-style:none removes the semantics and this is a way to bring them back
 						!['ul', 'ol', 'li'].includes(node.name)
 					) {
-						push_warning(attribute, 'a11y-no-redundant-roles', current_role);
+						w.a11y_no_redundant_roles(attribute, current_role);
 					}
 
 					// Footers and headers are special cases, and should not have redundant roles unless they are the children of sections or articles.
@@ -797,7 +814,7 @@ function check_element(node, state) {
 						const has_nested_redundant_role =
 							current_role === a11y_nested_implicit_semantics.get(node.name);
 						if (has_nested_redundant_role) {
-							push_warning(attribute, 'a11y-no-redundant-roles', current_role);
+							w.a11y_no_redundant_roles(attribute, current_role);
 						}
 					}
 
@@ -813,11 +830,13 @@ function check_element(node, state) {
 								(prop) => !attributes.find((a) => a.name === prop)
 							);
 							if (has_missing_props) {
-								push_warning(
+								w.a11y_role_has_required_aria_props(
 									attribute,
-									'a11y-role-has-required-aria-props',
 									current_role,
-									required_role_props
+									list(
+										required_role_props.map((v) => `"${v}"`),
+										'and'
+									)
 								);
 							}
 						}
@@ -836,7 +855,7 @@ function check_element(node, state) {
 							a11y_interactive_handlers.includes(handler)
 						);
 						if (has_interactive_handlers) {
-							push_warning(node, 'a11y-interactive-supports-focus', current_role);
+							w.a11y_interactive_supports_focus(node, current_role);
 						}
 					}
 
@@ -845,12 +864,7 @@ function check_element(node, state) {
 						is_interactive_element(node.name, attribute_map) &&
 						(is_non_interactive_roles(current_role) || is_presentation_role(current_role))
 					) {
-						push_warning(
-							node,
-							'a11y-no-interactive-element-to-noninteractive-role',
-							current_role,
-							node.name
-						);
+						w.a11y_no_interactive_element_to_noninteractive_role(node, node.name, current_role);
 					}
 
 					// no-noninteractive-element-to-interactive-role
@@ -861,12 +875,7 @@ function check_element(node, state) {
 							current_role
 						)
 					) {
-						push_warning(
-							node,
-							'a11y-no-noninteractive-element-to-interactive-role',
-							current_role,
-							node.name
-						);
+						w.a11y_no_noninteractive_element_to_interactive_role(node, node.name, current_role);
 					}
 				}
 			}
@@ -874,17 +883,17 @@ function check_element(node, state) {
 
 		// no-access-key
 		if (name === 'accesskey') {
-			push_warning(attribute, 'a11y-accesskey');
+			w.a11y_accesskey(attribute);
 		}
 
 		// no-autofocus
 		if (name === 'autofocus') {
-			push_warning(attribute, 'a11y-autofocus');
+			w.a11y_autofocus(attribute);
 		}
 
 		// scope
 		if (name === 'scope' && !is_dynamic_element && node.name !== 'th') {
-			push_warning(attribute, 'a11y-misplaced-scope');
+			w.a11y_misplaced_scope(attribute);
 		}
 
 		// tabindex-no-positive
@@ -892,7 +901,7 @@ function check_element(node, state) {
 			const value = get_static_value(attribute);
 			// @ts-ignore todo is tabindex=true correct case?
 			if (!isNaN(value) && +value > 0) {
-				push_warning(attribute, 'a11y-positive-tabindex');
+				w.a11y_positive_tabindex(attribute);
 			}
 		}
 	}
@@ -916,7 +925,7 @@ function check_element(node, state) {
 			const has_key_event =
 				handlers.has('keydown') || handlers.has('keyup') || handlers.has('keypress');
 			if (!has_key_event) {
-				push_warning(node, 'a11y-click-events-have-key-events');
+				w.a11y_click_events_have_key_events(node);
 			}
 		}
 	}
@@ -934,7 +943,7 @@ function check_element(node, state) {
 		const tab_index = attribute_map.get('tabindex');
 		const tab_index_value = get_static_text_value(tab_index);
 		if (tab_index && (tab_index_value === null || Number(tab_index_value) >= 0)) {
-			push_warning(node, 'a11y-no-noninteractive-tabindex');
+			w.a11y_no_noninteractive_tabindex(node);
 		}
 	}
 
@@ -949,14 +958,11 @@ function check_element(node, state) {
 			if (
 				invalid_aria_props.includes(/** @type {import('aria-query').ARIAProperty} */ (attr.name))
 			) {
-				push_warning(
-					attr,
-					'a11y-role-supports-aria-props',
-					attr.name,
-					role_value,
-					is_implicit,
-					node.name
-				);
+				if (is_implicit) {
+					w.a11y_role_supports_aria_props_implicit(attr, attr.name, role_value, node.name);
+				} else {
+					w.a11y_role_supports_aria_props(attr, attr.name, role_value);
+				}
 			}
 		}
 	}
@@ -974,7 +980,7 @@ function check_element(node, state) {
 			a11y_recommended_interactive_handlers.includes(handler)
 		);
 		if (has_interactive_handlers) {
-			push_warning(node, 'a11y-no-noninteractive-element-interactions', node.name);
+			w.a11y_no_noninteractive_element_interactions(node, node.name);
 		}
 	}
 
@@ -993,16 +999,16 @@ function check_element(node, state) {
 			a11y_interactive_handlers.includes(handler)
 		);
 		if (interactive_handlers.length > 0) {
-			push_warning(node, 'a11y-no-static-element-interactions', node.name, interactive_handlers);
+			w.a11y_no_static_element_interactions(node, node.name, list(interactive_handlers));
 		}
 	}
 
 	if (handlers.has('mouseover') && !handlers.has('focus')) {
-		push_warning(node, 'a11y-mouse-events-have-key-events', 'mouseover', 'focus');
+		w.a11y_mouse_events_have_key_events(node, 'mouseover', 'focus');
 	}
 
 	if (handlers.has('mouseout') && !handlers.has('blur')) {
-		push_warning(node, 'a11y-mouse-events-have-key-events', 'mouseout', 'blur');
+		w.a11y_mouse_events_have_key_events(node, 'mouseout', 'blur');
 	}
 
 	// element-specific checks
@@ -1021,14 +1027,14 @@ function check_element(node, state) {
 			const href_value = get_static_text_value(href);
 			if (href_value !== null) {
 				if (href_value === '' || href_value === '#' || /^\W*javascript:/i.test(href_value)) {
-					push_warning(href, 'a11y-invalid-attribute', href.name, href_value);
+					w.a11y_invalid_attribute(href, href_value, href.name);
 				}
 			}
 		} else if (!has_spread) {
 			const id_attribute = get_static_value(attribute_map.get('id'));
 			const name_attribute = get_static_value(attribute_map.get('name'));
 			if (!id_attribute && !name_attribute) {
-				push_warning(...warn_missing_attribute(node, ['href']));
+				warn_missing_attribute(node, ['href']);
 			}
 		}
 	} else if (!has_spread) {
@@ -1036,7 +1042,7 @@ function check_element(node, state) {
 		if (required_attributes) {
 			const has_attribute = required_attributes.some((name) => attribute_map.has(name));
 			if (!has_attribute) {
-				push_warning(...warn_missing_attribute(node, required_attributes));
+				warn_missing_attribute(node, required_attributes);
 			}
 		}
 	}
@@ -1048,7 +1054,7 @@ function check_element(node, state) {
 			const required_attributes = ['alt', 'aria-label', 'aria-labelledby'];
 			const has_attribute = required_attributes.some((name) => attribute_map.has(name));
 			if (!has_attribute) {
-				push_warning(...warn_missing_attribute(node, required_attributes, 'input type="image"'));
+				warn_missing_attribute(node, required_attributes, 'input type="image"');
 			}
 		}
 		// autocomplete-valid
@@ -1056,7 +1062,11 @@ function check_element(node, state) {
 		if (type && autocomplete) {
 			const autocomplete_value = get_static_value(autocomplete);
 			if (!is_valid_autocomplete(autocomplete_value)) {
-				push_warning(autocomplete, 'a11y-autocomplete-valid', type_value, autocomplete_value);
+				w.a11y_autocomplete_valid(
+					autocomplete,
+					/** @type {string} */ (autocomplete_value),
+					type_value ?? '...'
+				);
 			}
 		}
 	}
@@ -1066,7 +1076,7 @@ function check_element(node, state) {
 		const aria_hidden = get_static_value(attribute_map.get('aria-hidden'));
 		if (alt_attribute && !aria_hidden) {
 			if (/\b(image|picture|photo)\b/i.test(alt_attribute)) {
-				push_warning(node, 'a11y-img-redundant-alt');
+				w.a11y_img_redundant_alt(node);
 			}
 		}
 	}
@@ -1096,7 +1106,7 @@ function check_element(node, state) {
 			return has;
 		};
 		if (!attribute_map.has('for') && !has_input_child(node)) {
-			push_warning(node, 'a11y-label-has-associated-control');
+			w.a11y_label_has_associated_control(node);
 		}
 	}
 
@@ -1118,13 +1128,13 @@ function check_element(node, state) {
 			);
 		}
 		if (!has_caption) {
-			push_warning(node, 'a11y-media-has-caption');
+			w.a11y_media_has_caption(node);
 		}
 	}
 
 	if (node.name === 'figcaption') {
 		if (!is_parent(node.parent, ['figure'])) {
-			push_warning(node, 'a11y-structure', true);
+			w.a11y_figcaption_parent(node);
 		}
 	}
 
@@ -1138,13 +1148,13 @@ function check_element(node, state) {
 			(child) => child.type === 'RegularElement' && child.name === 'figcaption'
 		);
 		if (index !== -1 && index !== 0 && index !== children.length - 1) {
-			push_warning(children[index], 'a11y-structure', false);
+			w.a11y_figcaption_index(children[index]);
 		}
 	}
 
 	if (a11y_distracting_elements.includes(node.name)) {
 		// no-distracting-elements
-		push_warning(node, 'a11y-distracting-elements', node.name);
+		w.a11y_distracting_elements(node, node.name);
 	}
 
 	// Check content
@@ -1154,7 +1164,7 @@ function check_element(node, state) {
 		a11y_required_content.includes(node.name) &&
 		node.fragment.nodes.length === 0
 	) {
-		push_warning(node, 'a11y-missing-content', node.name);
+		w.a11y_missing_content(node, node.name);
 	}
 }
 
diff --git a/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js b/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js
index e2d137198b..72f54aec24 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/css/css-warn.js
@@ -1,16 +1,15 @@
 import { walk } from 'zimmerframe';
-import { warn } from '../../../warnings.js';
+import * as w from '../../../warnings.js';
 import { is_keyframes_node } from '../../css.js';
 
 /**
  * @param {import('#compiler').Css.StyleSheet} stylesheet
- * @param {import('../../types.js').RawWarning[]} warnings
  */
-export function warn_unused(stylesheet, warnings) {
-	walk(stylesheet, { warnings, stylesheet }, visitors);
+export function warn_unused(stylesheet) {
+	walk(stylesheet, { stylesheet }, visitors);
 }
 
-/** @type {import('zimmerframe').Visitors<import('#compiler').Css.Node, { warnings: import('../../types.js').RawWarning[], stylesheet: import('#compiler').Css.StyleSheet }>} */
+/** @type {import('zimmerframe').Visitors<import('#compiler').Css.Node, { stylesheet: import('#compiler').Css.StyleSheet }>} */
 const visitors = {
 	Atrule(node, context) {
 		if (!is_keyframes_node(node)) {
@@ -26,7 +25,7 @@ const visitors = {
 		if (!node.metadata.used) {
 			const content = context.state.stylesheet.content;
 			const text = content.styles.substring(node.start - content.start, node.end - content.start);
-			warn(context.state.warnings, node, 'css-unused-selector', text);
+			w.css_unused_selector(node, text);
 		}
 
 		context.next();
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index d2a331e253..848ea4ebfa 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -1,6 +1,7 @@
 import is_reference from 'is-reference';
 import { walk } from 'zimmerframe';
 import * as e from '../../errors.js';
+import * as w from '../../warnings.js';
 import {
 	extract_identifiers,
 	extract_all_identifiers_from_expression,
@@ -14,7 +15,6 @@ import { ReservedKeywords, Runes, SVGElements } from '../constants.js';
 import { Scope, ScopeRoot, create_scopes, get_rune, set_scope } from '../scope.js';
 import { merge } from '../visitors.js';
 import { validation_legacy, validation_runes, validation_runes_js } from './validation.js';
-import { warn } from '../../warnings.js';
 import check_graph_for_cycles from './utils/check_graph_for_cycles.js';
 import { regex_starts_with_newline } from '../patterns.js';
 import { create_attribute, is_element_node } from '../nodes.js';
@@ -234,16 +234,9 @@ export function analyze_module(ast, options) {
 		}
 	}
 
-	/** @type {import('../types').RawWarning[]} */
-	const warnings = [];
-
-	const analysis = {
-		warnings
-	};
-
 	walk(
 		/** @type {import('estree').Node} */ (ast),
-		{ scope, analysis },
+		{ scope },
 		// @ts-expect-error TODO clean this mess up
 		merge(set_scope(scopes), validation_runes_js, runes_scope_js_tweaker)
 	);
@@ -251,7 +244,6 @@ export function analyze_module(ast, options) {
 	return {
 		module: { ast, scope, scopes },
 		name: options.filename || 'module',
-		warnings,
 		accessors: false,
 		runes: true,
 		immutable: true
@@ -275,9 +267,6 @@ export function analyze_component(root, source, options) {
 	/** @type {import('../types.js').Template} */
 	const template = { ast: root.fragment, scope, scopes };
 
-	/** @type {import('../types').RawWarning[]} */
-	const warnings = [];
-
 	// create synthetic bindings for store subscriptions
 	for (const [name, references] of module.scope.references) {
 		if (name[0] !== '$' || ReservedKeywords.includes(name)) continue;
@@ -331,7 +320,7 @@ export function analyze_component(root, source, options) {
 				} else if (declaration !== null && Runes.includes(/** @type {any} */ (name))) {
 					for (const { node, path } of references) {
 						if (path.at(-1)?.type === 'CallExpression') {
-							warn(warnings, node, 'store-with-rune-name', store_name);
+							w.store_with_rune_name(node, store_name);
 						}
 					}
 				}
@@ -391,7 +380,6 @@ export function analyze_component(root, source, options) {
 		reactive_statements: new Map(),
 		binding_groups: new Map(),
 		slot_names: new Map(),
-		warnings,
 		css: {
 			ast: root.css,
 			hash: root.css
@@ -408,7 +396,7 @@ export function analyze_component(root, source, options) {
 	};
 
 	if (!options.customElement && root.options?.customElement) {
-		warn(analysis.warnings, root.options, 'missing-custom-element-compile-option');
+		w.missing_custom_element_compile_option(root.options);
 	}
 
 	if (analysis.runes) {
@@ -498,7 +486,7 @@ export function analyze_component(root, source, options) {
 					(r) => r.node !== binding.node && r.path.at(-1)?.type !== 'ExportSpecifier'
 				);
 				if (!references.length && !instance.scope.declarations.has(`$${name}`)) {
-					warn(warnings, binding.node, 'unused-export-let', name);
+					w.unused_export_let(binding.node, name);
 				}
 			}
 		}
@@ -538,7 +526,7 @@ export function analyze_component(root, source, options) {
 									type === 'AwaitBlock' ||
 									type === 'KeyBlock'
 								) {
-									warn(warnings, binding.node, 'non-state-reference', name);
+									w.non_state_reference(binding.node, name);
 									continue outer;
 								}
 							}
@@ -546,7 +534,7 @@ export function analyze_component(root, source, options) {
 						}
 					}
 
-					warn(warnings, binding.node, 'non-state-reference', name);
+					w.non_state_reference(binding.node, name);
 					continue outer;
 				}
 			}
@@ -563,9 +551,9 @@ export function analyze_component(root, source, options) {
 
 		if (
 			!analysis.css.ast.content.comment ||
-			!extract_svelte_ignore(analysis.css.ast.content.comment.data).includes('css-unused-selector')
+			!extract_svelte_ignore(analysis.css.ast.content.comment.data).includes('css_unused_selector')
 		) {
-			warn_unused(analysis.css.ast, analysis.warnings);
+			warn_unused(analysis.css.ast);
 		}
 
 		outer: for (const element of analysis.elements) {
@@ -688,7 +676,7 @@ const legacy_scope_tweaker = {
 				(d) => d.scope === state.analysis.module.scope && d.declaration_kind !== 'const'
 			)
 		) {
-			warn(state.analysis.warnings, node, 'module-script-reactive-declaration');
+			w.module_script_reactive_declaration(node);
 		}
 
 		if (
@@ -874,7 +862,7 @@ const legacy_scope_tweaker = {
 	}
 };
 
-/** @type {import('zimmerframe').Visitors<import('#compiler').SvelteNode, { scope: Scope, analysis: { warnings: import('../types').RawWarning[] } }>} */
+/** @type {import('zimmerframe').Visitors<import('#compiler').SvelteNode, { scope: Scope }>} */
 const runes_scope_js_tweaker = {
 	VariableDeclarator(node, { state }) {
 		if (node.init?.type !== 'CallExpression') return;
@@ -1210,7 +1198,7 @@ const common_visitors = {
 					binding.kind === 'derived') &&
 				context.state.function_depth === binding.scope.function_depth
 			) {
-				warn(context.state.analysis.warnings, node, 'static-state-reference');
+				w.static_state_reference(node);
 			}
 		}
 	},
diff --git a/packages/svelte/src/compiler/phases/2-analyze/validation.js b/packages/svelte/src/compiler/phases/2-analyze/validation.js
index f4321b0101..55ae8c64d2 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/validation.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/validation.js
@@ -12,7 +12,7 @@ import {
 	object,
 	unwrap_optional
 } from '../../utils/ast.js';
-import { warn } from '../../warnings.js';
+import * as w from '../../warnings.js';
 import fuzzymatch from '../1-parse/utils/fuzzymatch.js';
 import { binding_properties } from '../bindings.js';
 import {
@@ -67,7 +67,7 @@ function validate_component(node, context) {
 				}
 			}
 
-			validate_attribute_name(attribute, context);
+			validate_attribute_name(attribute);
 
 			if (attribute.name === 'slot') {
 				validate_slot_attribute(context, attribute);
@@ -131,12 +131,7 @@ function validate_element(node, context) {
 					value.name === attribute.name &&
 					!context.state.scope.get(value.name)
 				) {
-					warn(
-						context.state.analysis.warnings,
-						attribute,
-						'global-event-reference',
-						attribute.name
-					);
+					w.global_event_reference(attribute, attribute.name);
 				}
 			}
 
@@ -146,21 +141,15 @@ function validate_element(node, context) {
 			}
 
 			if (attribute.name === 'is' && context.state.options.namespace !== 'foreign') {
-				warn(context.state.analysis.warnings, attribute, 'avoid-is');
+				w.avoid_is(attribute);
 			}
 
 			const correct_name = react_attributes.get(attribute.name);
 			if (correct_name) {
-				warn(
-					context.state.analysis.warnings,
-					attribute,
-					'invalid-html-attribute',
-					attribute.name,
-					correct_name
-				);
+				w.invalid_html_attribute(attribute, attribute.name, correct_name);
 			}
 
-			validate_attribute_name(attribute, context);
+			validate_attribute_name(attribute);
 		} else if (attribute.type === 'AnimateDirective') {
 			const parent = context.path.at(-2);
 			if (parent?.type !== 'EachBlock') {
@@ -224,16 +213,15 @@ function validate_element(node, context) {
 
 /**
  * @param {import('#compiler').Attribute} attribute
- * @param {import('zimmerframe').Context<import('#compiler').SvelteNode, import('./types.js').AnalysisState>} context
  */
-function validate_attribute_name(attribute, context) {
+function validate_attribute_name(attribute) {
 	if (
 		attribute.name.includes(':') &&
 		!attribute.name.startsWith('xmlns:') &&
 		!attribute.name.startsWith('xlink:') &&
 		!attribute.name.startsWith('xml:')
 	) {
-		warn(context.state.analysis.warnings, attribute, 'illegal-attribute-character');
+		w.illegal_attribute_character(attribute);
 	}
 }
 
@@ -311,7 +299,7 @@ function validate_block_not_empty(node, context) {
 	// Assumption: If the block has zero elements, someone's in the middle of typing it out,
 	// so don't warn in that case because it would be distracting.
 	if (node.nodes.length === 1 && node.nodes[0].type === 'Text' && !node.nodes[0].raw.trim()) {
-		warn(context.state.analysis.warnings, node.nodes[0], 'empty-block');
+		w.empty_block(node.nodes[0]);
 	}
 }
 
@@ -372,12 +360,7 @@ const validation = {
 		}
 
 		if (binding?.kind === 'each' && binding.metadata?.inside_rest) {
-			warn(
-				context.state.analysis.warnings,
-				binding.node,
-				'invalid-rest-eachblock-binding',
-				binding.node.name
-			);
+			w.invalid_rest_eachblock_binding(binding.node, binding.node.name);
 		}
 
 		const parent = context.path.at(-1);
@@ -531,7 +514,7 @@ const validation = {
 			binding.declaration_kind === 'import' &&
 			binding.references.length === 0
 		) {
-			warn(context.state.analysis.warnings, node, 'component-name-lowercase', node.name);
+			w.component_name_lowercase(node, node.name);
 		}
 
 		validate_element(node, context);
@@ -570,7 +553,7 @@ const validation = {
 			!VoidElements.includes(node.name) &&
 			!SVGElements.includes(node.name)
 		) {
-			warn(context.state.analysis.warnings, node, 'invalid-self-closing-tag', node.name);
+			w.invalid_self_closing_tag(node, node.name);
 		}
 
 		context.next({
@@ -766,7 +749,7 @@ export const validation_legacy = merge(validation, a11y_validators, {
 			(state.ast_type !== 'instance' ||
 				/** @type {import('#compiler').SvelteNode} */ (path.at(-1)).type !== 'Program')
 		) {
-			warn(state.analysis.warnings, node, 'no-reactive-declaration');
+			w.no_reactive_declaration(node);
 		}
 	},
 	UpdateExpression(node, { state }) {
@@ -969,12 +952,12 @@ export const validation_runes_js = {
 		const allowed_depth = context.state.ast_type === 'module' ? 0 : 1;
 
 		if (context.state.scope.function_depth > allowed_depth) {
-			warn(context.state.analysis.warnings, node, 'avoid-nested-class');
+			w.avoid_nested_class(node);
 		}
 	},
 	NewExpression(node, context) {
 		if (node.callee.type === 'ClassExpression' && context.state.scope.function_depth > 0) {
-			warn(context.state.analysis.warnings, node, 'avoid-inline-class');
+			w.avoid_inline_class(node);
 		}
 	}
 };
@@ -1127,7 +1110,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 
 		if (rune === null) {
 			if (init?.type === 'Identifier' && init.name === '$props' && !state.scope.get('props')) {
-				warn(state.analysis.warnings, node, 'invalid-props-declaration');
+				w.invalid_props_declaration(node);
 			}
 			return;
 		}
@@ -1180,7 +1163,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 				arg.type === 'CallExpression' &&
 				(arg.callee.type === 'ArrowFunctionExpression' || arg.callee.type === 'FunctionExpression')
 			) {
-				warn(state.analysis.warnings, node, 'derived-iife');
+				w.derived_iife(node);
 			}
 		}
 	},
@@ -1190,19 +1173,19 @@ export const validation_runes = merge(validation, a11y_validators, {
 			node.right.name === '$bindable' &&
 			!state.scope.get('bindable')
 		) {
-			warn(state.analysis.warnings, node, 'invalid-bindable-declaration');
+			w.invalid_bindable_declaration(node);
 		}
 	},
 	SlotElement(node, { state }) {
 		if (!state.analysis.custom_element) {
-			warn(state.analysis.warnings, node, 'deprecated-slot-element');
+			w.deprecated_slot_element(node);
 		}
 	},
-	OnDirective(node, { state, path }) {
+	OnDirective(node, { path }) {
 		const parent_type = path.at(-1)?.type;
 		// Don't warn on component events; these might not be under the author's control so the warning would be unactionable
 		if (parent_type === 'RegularElement' || parent_type === 'SvelteElement') {
-			warn(state.analysis.warnings, node, 'deprecated-event-handler', node.name);
+			w.deprecated_event_handler(node, node.name);
 		}
 	},
 	// TODO this is a code smell. need to refactor this stuff
diff --git a/packages/svelte/src/compiler/phases/3-transform/index.js b/packages/svelte/src/compiler/phases/3-transform/index.js
index 2334b3318d..2c4adb3dc8 100644
--- a/packages/svelte/src/compiler/phases/3-transform/index.js
+++ b/packages/svelte/src/compiler/phases/3-transform/index.js
@@ -17,7 +17,7 @@ export function transform_component(analysis, source, options) {
 		return {
 			js: /** @type {any} */ (null),
 			css: null,
-			warnings: transform_warnings(source, options.filename, analysis.warnings),
+			warnings: /** @type {any} */ (null), // set afterwards
 			metadata: {
 				runes: analysis.runes
 			},
@@ -60,7 +60,7 @@ export function transform_component(analysis, source, options) {
 	return {
 		js,
 		css,
-		warnings: transform_warnings(source, options.filename, analysis.warnings), // TODO apply preprocessor sourcemap
+		warnings: /** @type {any} */ (null), // set afterwards. TODO apply preprocessor sourcemap
 		metadata: {
 			runes: analysis.runes
 		},
@@ -79,7 +79,7 @@ export function transform_module(analysis, source, options) {
 		return {
 			js: /** @type {any} */ (null),
 			css: null,
-			warnings: transform_warnings(source, analysis.name, analysis.warnings),
+			warnings: /** @type {any} */ (null), // set afterwards
 			metadata: {
 				runes: true
 			},
@@ -105,45 +105,10 @@ export function transform_module(analysis, source, options) {
 	return {
 		js: print(program, {}),
 		css: null,
-		warnings: transform_warnings(source, analysis.name, analysis.warnings),
 		metadata: {
 			runes: true
 		},
+		warnings: /** @type {any} */ (null), // set afterwards
 		ast: /** @type {any} */ (null) // set afterwards
 	};
 }
-
-/**
- * @param {string} source
- * @param {string | undefined} name
- * @param {import('../types').RawWarning[]} warnings
- * @returns {import('#compiler').Warning[]}
- */
-function transform_warnings(source, name, warnings) {
-	if (warnings.length === 0) return [];
-
-	const locate = getLocator(source, { offsetLine: 1 });
-
-	/** @type {import('#compiler').Warning[]} */
-	const result = [];
-
-	for (const warning of warnings) {
-		const start =
-			warning.position &&
-			/** @type {import('locate-character').Location} */ (locate(warning.position[0]));
-
-		const end =
-			warning.position &&
-			/** @type {import('locate-character').Location} */ (locate(warning.position[1]));
-
-		result.push({
-			start,
-			end,
-			filename: name,
-			message: warning.message,
-			code: warning.code
-		});
-	}
-
-	return result;
-}
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index 91fd68ca39..c2ece7d7fd 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -6,7 +6,8 @@ import type {
 	SlotElement,
 	SvelteElement,
 	SvelteNode,
-	SvelteOptions
+	SvelteOptions,
+	Warning
 } from '#compiler';
 import type { Identifier, LabeledStatement, Program } from 'estree';
 import type { Scope, ScopeRoot } from './scope.js';
@@ -28,19 +29,12 @@ export interface ReactiveStatement {
 	dependencies: Binding[];
 }
 
-export interface RawWarning {
-	code: string;
-	message: string;
-	position: [number, number] | undefined;
-}
-
 /**
  * Analysis common to modules and components
  */
 export interface Analysis {
 	module: Js;
 	name: string; // TODO should this be filename? it's used in `compileModule` as well as `compile`
-	warnings: RawWarning[];
 	runes: boolean;
 	immutable: boolean;
 
diff --git a/packages/svelte/src/compiler/utils/string.js b/packages/svelte/src/compiler/utils/string.js
new file mode 100644
index 0000000000..42eefa993b
--- /dev/null
+++ b/packages/svelte/src/compiler/utils/string.js
@@ -0,0 +1,9 @@
+/**
+ * @param {string[]} strings
+ * @param {string} conjunction
+ */
+export function list(strings, conjunction = 'or') {
+	if (strings.length === 1) return strings[0];
+	if (strings.length === 2) return `${strings[0]} ${conjunction} ${strings[1]}`;
+	return `${strings.slice(0, -1).join(', ')} ${conjunction} ${strings[strings.length - 1]}`;
+}
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index 3983d3686e..1e71aa51a6 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -1,294 +1,628 @@
-/** @typedef {Record<string, (...args: any[]) => string>} Warnings */
-
-/** @satisfies {Warnings} */
-const css = {
-	/** @param {string} name */
-	'css-unused-selector': (name) => `Unused CSS selector "${name}"`
-};
-
-/** @satisfies {Warnings} */
-const attributes = {
-	'avoid-is': () => 'The "is" attribute is not supported cross-browser and should be avoided',
-	/** @param {string} name */
-	'global-event-reference': (name) =>
-		`You are referencing globalThis.${name}. Did you forget to declare a variable with that name?`,
-	'illegal-attribute-character': () =>
-		"Attributes should not contain ':' characters to prevent ambiguity with Svelte directives",
-	/**
-	 * @param {string} wrong
-	 * @param {string} right
-	 */
-	'invalid-html-attribute': (wrong, right) =>
-		`'${wrong}' is not a valid HTML attribute. Did you mean '${right}'?`
-};
-
-/** @satisfies {Warnings} */
-const runes = {
-	/** @param {string} name */
-	'store-with-rune-name': (name) =>
-		`It looks like you're using the $${name} rune, but there is a local binding called ${name}. ` +
-		`Referencing a local variable with a $ prefix will create a store subscription. Please rename ${name} to avoid the ambiguity.`,
-	/** @param {string} name */
-	'non-state-reference': (name) =>
-		`${name} is updated, but is not declared with $state(...). Changing its value will not correctly trigger updates.`,
-	'derived-iife': () =>
-		`Use \`$derived.by(() => {...})\` instead of \`$derived((() => {...})());\``,
-	'invalid-props-declaration': () =>
-		`Component properties are declared using $props() in runes mode. Did you forget to call the function?`,
-	'invalid-bindable-declaration': () =>
-		`Bindable component properties are declared using $bindable() in runes mode. Did you forget to call the function?`
-};
-
-/** @satisfies {Warnings} */
-const a11y = {
-	/** @param {string} name */
-	'a11y-aria-attributes': (name) => `A11y: <${name}> should not have aria-* attributes`,
-	/**
-	 * @param {string} attribute
-	 * @param {string | null} [suggestion]
-	 */
-	'a11y-unknown-aria-attribute': (attribute, suggestion) =>
-		`A11y: Unknown aria attribute 'aria-${attribute}'` +
-		(suggestion ? ` (did you mean '${suggestion}'?)` : ''),
-	/** @param {string} name */
-	'a11y-hidden': (name) => `A11y: <${name}> element should not be hidden`,
-	/**
-	 * @param {import('aria-query').ARIAPropertyDefinition} schema
-	 * @param {string} attribute
-	 */
-	'a11y-incorrect-aria-attribute-type': (schema, attribute) => {
-		let message;
-		switch (schema.type) {
-			case 'boolean':
-				message = `The value of '${attribute}' must be exactly one of true or false`;
-				break;
-			case 'id':
-				message = `The value of '${attribute}' must be a string that represents a DOM element ID`;
-				break;
-			case 'idlist':
-				message = `The value of '${attribute}' must be a space-separated list of strings that represent DOM element IDs`;
-				break;
-			case 'tristate':
-				message = `The value of '${attribute}' must be exactly one of true, false, or mixed`;
-				break;
-			case 'token':
-				message = `The value of '${attribute}' must be exactly one of ${(schema.values || []).join(
-					', '
-				)}`;
-				break;
-			case 'tokenlist':
-				message = `The value of '${attribute}' must be a space-separated list of one or more of ${(
-					schema.values || []
-				).join(', ')}`;
-				break;
-			default:
-				message = `The value of '${attribute}' must be of type ${schema.type}`;
-		}
-		return `A11y: ${message}`;
-	},
-	'a11y-aria-activedescendant-has-tabindex': () =>
-		'A11y: Elements with attribute aria-activedescendant should have tabindex value',
-	/** @param {string} name */
-	'a11y-misplaced-role': (name) => `A11y: <${name}> should not have role attribute`,
-	/** @param {string | boolean} role */
-	'a11y-no-abstract-role': (role) => `A11y: Abstract role '${role}' is forbidden`,
-	/**
-	 * @param {string | boolean} role
-	 * @param {string | null} [suggestion]
-	 */
-	'a11y-unknown-role': (role, suggestion) =>
-		`A11y: Unknown role '${role}'` + (suggestion ? ` (did you mean '${suggestion}'?)` : ''),
-	/** @param {string | boolean} role */
-	'a11y-no-redundant-roles': (role) => `A11y: Redundant role '${role}'`,
-	/**
-	 * @param {string} role
-	 * @param {string[]} props
-	 */
-	'a11y-role-has-required-aria-props': (role, props) =>
-		`A11y: Elements with the ARIA role "${role}" must have the following attributes defined: ${props
-			.map((name) => `"${name}"`)
-			.join(', ')}`,
-	/** @param {string} role */
-	'a11y-interactive-supports-focus': (role) =>
-		`A11y: Elements with the '${role}' interactive role must have a tabindex value.`,
-	/**
-	 * @param {string | boolean} role
-	 * @param {string} element
-	 */
-	'a11y-no-interactive-element-to-noninteractive-role': (role, element) =>
-		`A11y: <${element}> cannot have role '${role}'`,
-	/**
-	 * @param {string | boolean} role
-	 * @param {string} element
-	 */
-	'a11y-no-noninteractive-element-to-interactive-role': (role, element) =>
-		`A11y: Non-interactive element <${element}> cannot have interactive role '${role}'`,
-	'a11y-accesskey': () => 'A11y: Avoid using accesskey',
-	'a11y-autofocus': () => 'A11y: Avoid using autofocus',
-	'a11y-misplaced-scope': () => 'A11y: The scope attribute should only be used with <th> elements',
-	'a11y-positive-tabindex': () => 'A11y: avoid tabindex values above zero',
-	'a11y-click-events-have-key-events': () =>
-		'A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type="button"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.',
-	'a11y-no-noninteractive-tabindex': () =>
-		'A11y: noninteractive element cannot have nonnegative tabIndex value',
-	/**
-	 * @param {string} attribute
-	 * @param {string} role
-	 * @param {boolean} is_implicit
-	 * @param {string} name
-	 */
-	'a11y-role-supports-aria-props': (attribute, role, is_implicit, name) => {
-		let message = `The attribute '${attribute}' is not supported by the role '${role}'.`;
-		if (is_implicit) {
-			message += ` This role is implicit on the element <${name}>.`;
-		}
-		return `A11y: ${message}`;
-	},
-	/** @param {string} element */
-	'a11y-no-noninteractive-element-interactions': (element) =>
-		`A11y: Non-interactive element <${element}> should not be assigned mouse or keyboard event listeners.`,
-	/**
-	 * @param {string} element
-	 * @param {string[]} handlers
-	 */
-	'a11y-no-static-element-interactions': (element, handlers) =>
-		`A11y: <${element}> with ${handlers.join(', ')} ${
-			handlers.length === 1 ? 'handler' : 'handlers'
-		} must have an ARIA role`,
-	/**
-	 * @param {string} href_attribute
-	 * @param {string} href_value
-	 */
-	'a11y-invalid-attribute': (href_attribute, href_value) =>
-		`A11y: '${href_value}' is not a valid ${href_attribute} attribute`,
-	/**
-	 * @param {string} name
-	 * @param {string} article
-	 * @param {string} sequence
-	 */
-	'a11y-missing-attribute': (name, article, sequence) =>
-		`A11y: <${name}> element should have ${article} ${sequence} attribute`,
-	/**
-	 * @param {null | true | string} type
-	 * @param {null | true | string} value
-	 */
-	'a11y-autocomplete-valid': (type, value) =>
-		`A11y: The value '${value}' is not supported by the attribute 'autocomplete' on element <input type="${
-			type || '...'
-		}">`,
-	'a11y-img-redundant-alt': () =>
-		'A11y: Screenreaders already announce <img> elements as an image.',
-	'a11y-label-has-associated-control': () =>
-		'A11y: A form label must be associated with a control.',
-	'a11y-media-has-caption': () => 'A11y: <video> elements must have a <track kind="captions">',
-	/** @param {string} name */
-	'a11y-distracting-elements': (name) => `A11y: Avoid <${name}> elements`,
-	/** @param {boolean} immediate */
-	'a11y-structure': (immediate) =>
-		immediate
-			? 'A11y: <figcaption> must be an immediate child of <figure>'
-			: 'A11y: <figcaption> must be first or last child of <figure>',
-	/**
-	 * @param {string} event
-	 * @param {string} accompanied_by
-	 */
-	'a11y-mouse-events-have-key-events': (event, accompanied_by) =>
-		`A11y: '${event}' event must be accompanied by '${accompanied_by}' event`,
-	/** @param {string} name */
-	'a11y-missing-content': (name) => `A11y: <${name}> element should have child content`
-};
-
-/** @satisfies {Warnings} */
-const state = {
-	'static-state-reference': () =>
-		`State referenced in its own scope will never update. Did you mean to reference it inside a closure?`,
-	/** @param {string} name */
-	'invalid-rest-eachblock-binding': (name) =>
-		`The rest operator (...) will create a new object and binding '${name}' with the original object will not work`
-};
-
-/** @satisfies {Warnings} */
-const performance = {
-	'avoid-inline-class': () =>
-		`Avoid 'new class' — instead, declare the class at the top level scope`,
-	'avoid-nested-class': () => `Avoid declaring classes below the top level scope`
-};
-
-/** @satisfies {Warnings} */
-const components = {
-	/** @param {string} name */
-	'component-name-lowercase': (name) =>
-		`<${name}> will be treated as an HTML element unless it begins with a capital letter`
-};
-
-const legacy = {
-	'no-reactive-declaration': () =>
-		`Reactive declarations only exist at the top level of the instance script`,
-	'module-script-reactive-declaration': () =>
-		'All dependencies of the reactive declaration are declared in a module script and will not be reactive',
-	/** @param {string} name */
-	'unused-export-let': (name) =>
-		`Component has unused export property '${name}'. If it is for external reference only, please consider using \`export const ${name}\``,
-	'deprecated-slot-element': () =>
-		`Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.`,
-	/** @param {string} name */
-	'deprecated-event-handler': (name) =>
-		`Using on:${name} to listen to the ${name} event is is deprecated. Use the event attribute on${name} instead.`
-};
-
-const block = {
-	'empty-block': () => 'Empty block'
-};
-
-const options = {
-	'missing-custom-element-compile-option': () =>
-		"The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?"
-};
-
-const misc = {
-	/** @param {string} name */
-	'invalid-self-closing-tag': (name) =>
-		`Self-closing HTML tags for non-void elements are ambiguous — use <${name} ...></${name}> rather than <${name} ... />`
-};
-
-/** @satisfies {Warnings} */
-const warnings = {
-	...css,
-	...attributes,
-	...runes,
-	...a11y,
-	...performance,
-	...state,
-	...components,
-	...legacy,
-	...block,
-	...options,
-	...misc
-};
-
-/** @typedef {typeof warnings} AllWarnings */
-
-/**
- * @template {keyof AllWarnings} T
- * @param {import('./phases/types').RawWarning[]} array the array to push the warning to, if not ignored
- * @param {{ start?: number, end?: number, type?: string, parent?: import('#compiler').SvelteNode | null, leadingComments?: import('estree').Comment[] } | null} node the node related to the warning
- * @param {T} code the warning code
- * @param  {Parameters<AllWarnings[T]>} args the arguments to pass to the warning function
- * @returns {void}
- */
-export function warn(array, node, code, ...args) {
-	// @ts-expect-error
-	if (node.ignores?.has(code)) return;
+/* This file is generated by scripts/process-messages.js. Do not edit! */
+
+import { getLocator } from 'locate-character';
 
-	const fn = warnings[code];
+/** @typedef {{ start?: number, end?: number }} NodeLike */
+/** @type {import('#compiler').Warning[]} */
+let warnings = [];
+/** @type {string | undefined} */
+let filename;
+let locator = getLocator('', { offsetLine: 1 });
 
-	const start = node?.start;
-	const end = node?.end;
+/**
+ * @param {{
+ *   source: string;
+ *   filename: string | undefined;
+ * }} options
+ * @returns {import('#compiler').Warning[]}
+ */
+export function reset_warnings(options) {
+	filename = options.filename;
+	locator = getLocator(options.source, { offsetLine: 1 });
+	return warnings = [];
+}
+
+/**
+ * @param {null | NodeLike} node
+ * @param {string} code
+ * @param {string} message
+ */
+function w(node, code, message) {
+	// @ts-expect-error
+	if (node.ignores?.has(code)) return;
 
-	array.push({
+	warnings.push({
 		code,
-		// @ts-expect-error
-		message: fn(...args),
-		position: start !== undefined && end !== undefined ? [start, end] : undefined
+		message,
+		filename,
+		start: node?.start !== undefined ? locator(node.start) : undefined,
+		end: node?.end !== undefined ? locator(node.end) : undefined
 	});
 }
+
+/**
+ * <%name%> should not have aria-* attributes
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function a11y_aria_attributes(node, name) {
+	w(node, "a11y_aria_attributes", `<${name}> should not have aria-* attributes`);
+}
+
+/**
+ * Unknown aria attribute 'aria-%attribute%'
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ */
+export function a11y_unknown_aria_attribute(node, attribute) {
+	w(node, "a11y_unknown_aria_attribute", `Unknown aria attribute 'aria-${attribute}'`);
+}
+
+/**
+ * Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} suggestion
+ */
+export function a11y_unknown_aria_attribute_suggestion(node, attribute, suggestion) {
+	w(node, "a11y_unknown_aria_attribute_suggestion", `Unknown aria attribute 'aria-${attribute}'. Did you mean '${suggestion}'?`);
+}
+
+/**
+ * <%name%> element should not be hidden
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function a11y_hidden(node, name) {
+	w(node, "a11y_hidden", `<${name}> element should not be hidden`);
+}
+
+/**
+ * The value of '%attribute%' must be either 'true' or 'false'
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ */
+export function a11y_incorrect_aria_attribute_type_boolean(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_boolean", `The value of '${attribute}' must be either 'true' or 'false'`);
+}
+
+/**
+ * The value of '%attribute%' must be an integer
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ */
+export function a11y_incorrect_aria_attribute_type_integer(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_integer", `The value of '${attribute}' must be an integer`);
+}
+
+/**
+ * The value of '%attribute%' must be a string that represents a DOM element ID
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ */
+export function a11y_incorrect_aria_attribute_type_id(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_id", `The value of '${attribute}' must be a string that represents a DOM element ID`);
+}
+
+/**
+ * The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ */
+export function a11y_incorrect_aria_attribute_type_idlist(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_idlist", `The value of '${attribute}' must be a space-separated list of strings that represent DOM element IDs`);
+}
+
+/**
+ * The value of '%attribute%' must be exactly one of true, false, or mixed
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ */
+export function a11y_incorrect_aria_attribute_type_tristate(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_tristate", `The value of '${attribute}' must be exactly one of true, false, or mixed`);
+}
+
+/**
+ * The value of '%attribute%' must be exactly one of %values%
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} values
+ */
+export function a11y_incorrect_aria_attribute_type_token(node, attribute, values) {
+	w(node, "a11y_incorrect_aria_attribute_type_token", `The value of '${attribute}' must be exactly one of ${values}`);
+}
+
+/**
+ * The value of '%attribute%' must be a space-separated list of one or more of %values%
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} values
+ */
+export function a11y_incorrect_aria_attribute_type_tokenlist(node, attribute, values) {
+	w(node, "a11y_incorrect_aria_attribute_type_tokenlist", `The value of '${attribute}' must be a space-separated list of one or more of ${values}`);
+}
+
+/**
+ * The value of '%attribute%' must be of type %type%
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} type
+ */
+export function a11y_incorrect_aria_attribute_type(node, attribute, type) {
+	w(node, "a11y_incorrect_aria_attribute_type", `The value of '${attribute}' must be of type ${type}`);
+}
+
+/**
+ * Elements with attribute aria-activedescendant should have tabindex value
+ * @param {null | NodeLike} node
+ */
+export function a11y_aria_activedescendant_has_tabindex(node) {
+	w(node, "a11y_aria_activedescendant_has_tabindex", "Elements with attribute aria-activedescendant should have tabindex value");
+}
+
+/**
+ * <%name%> should not have role attribute
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function a11y_misplaced_role(node, name) {
+	w(node, "a11y_misplaced_role", `<${name}> should not have role attribute`);
+}
+
+/**
+ * Abstract role '%role%' is forbidden
+ * @param {null | NodeLike} node
+ * @param {string} role
+ */
+export function a11y_no_abstract_role(node, role) {
+	w(node, "a11y_no_abstract_role", `Abstract role '${role}' is forbidden`);
+}
+
+/**
+ * Unknown role '%role%'
+ * @param {null | NodeLike} node
+ * @param {string} role
+ */
+export function a11y_unknown_role(node, role) {
+	w(node, "a11y_unknown_role", `Unknown role '${role}'`);
+}
+
+/**
+ * Unknown role '%role%'. Did you mean '%suggestion%'?
+ * @param {null | NodeLike} node
+ * @param {string} role
+ * @param {string} suggestion
+ */
+export function a11y_unknown_role_suggestion(node, role, suggestion) {
+	w(node, "a11y_unknown_role_suggestion", `Unknown role '${role}'. Did you mean '${suggestion}'?`);
+}
+
+/**
+ * Redundant role '%role%'
+ * @param {null | NodeLike} node
+ * @param {string} role
+ */
+export function a11y_no_redundant_roles(node, role) {
+	w(node, "a11y_no_redundant_roles", `Redundant role '${role}'`);
+}
+
+/**
+ * Elements with the ARIA role "%role%" must have the following attributes defined: %props%
+ * @param {null | NodeLike} node
+ * @param {string} role
+ * @param {string} props
+ */
+export function a11y_role_has_required_aria_props(node, role, props) {
+	w(node, "a11y_role_has_required_aria_props", `Elements with the ARIA role "${role}" must have the following attributes defined: ${props}`);
+}
+
+/**
+ * Elements with the '%role%' interactive role must have a tabindex value.
+ * @param {null | NodeLike} node
+ * @param {string} role
+ */
+export function a11y_interactive_supports_focus(node, role) {
+	w(node, "a11y_interactive_supports_focus", `Elements with the '${role}' interactive role must have a tabindex value.`);
+}
+
+/**
+ * <%element%> cannot have role '%role%'
+ * @param {null | NodeLike} node
+ * @param {string} element
+ * @param {string} role
+ */
+export function a11y_no_interactive_element_to_noninteractive_role(node, element, role) {
+	w(node, "a11y_no_interactive_element_to_noninteractive_role", `<${element}> cannot have role '${role}'`);
+}
+
+/**
+ * Non-interactive element <%element%> cannot have interactive role '%role%'
+ * @param {null | NodeLike} node
+ * @param {string} element
+ * @param {string} role
+ */
+export function a11y_no_noninteractive_element_to_interactive_role(node, element, role) {
+	w(node, "a11y_no_noninteractive_element_to_interactive_role", `Non-interactive element <${element}> cannot have interactive role '${role}'`);
+}
+
+/**
+ * Avoid using accesskey
+ * @param {null | NodeLike} node
+ */
+export function a11y_accesskey(node) {
+	w(node, "a11y_accesskey", "Avoid using accesskey");
+}
+
+/**
+ * Avoid using autofocus
+ * @param {null | NodeLike} node
+ */
+export function a11y_autofocus(node) {
+	w(node, "a11y_autofocus", "Avoid using autofocus");
+}
+
+/**
+ * The scope attribute should only be used with <th> elements
+ * @param {null | NodeLike} node
+ */
+export function a11y_misplaced_scope(node) {
+	w(node, "a11y_misplaced_scope", "The scope attribute should only be used with <th> elements");
+}
+
+/**
+ * Avoid tabindex values above zero
+ * @param {null | NodeLike} node
+ */
+export function a11y_positive_tabindex(node) {
+	w(node, "a11y_positive_tabindex", "Avoid tabindex values above zero");
+}
+
+/**
+ * Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type="button"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
+ * @param {null | NodeLike} node
+ */
+export function a11y_click_events_have_key_events(node) {
+	w(node, "a11y_click_events_have_key_events", "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.");
+}
+
+/**
+ * noninteractive element cannot have nonnegative tabIndex value
+ * @param {null | NodeLike} node
+ */
+export function a11y_no_noninteractive_tabindex(node) {
+	w(node, "a11y_no_noninteractive_tabindex", "noninteractive element cannot have nonnegative tabIndex value");
+}
+
+/**
+ * The attribute '%attribute%' is not supported by the role '%role%'
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} role
+ */
+export function a11y_role_supports_aria_props(node, attribute, role) {
+	w(node, "a11y_role_supports_aria_props", `The attribute '${attribute}' is not supported by the role '${role}'`);
+}
+
+/**
+ * The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element <%name%>
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} role
+ * @param {string} name
+ */
+export function a11y_role_supports_aria_props_implicit(node, attribute, role, name) {
+	w(node, "a11y_role_supports_aria_props_implicit", `The attribute '${attribute}' is not supported by the role '${role}'. This role is implicit on the element <${name}>`);
+}
+
+/**
+ * Non-interactive element <%element%> should not be assigned mouse or keyboard event listeners.
+ * @param {null | NodeLike} node
+ * @param {string} element
+ */
+export function a11y_no_noninteractive_element_interactions(node, element) {
+	w(node, "a11y_no_noninteractive_element_interactions", `Non-interactive element <${element}> should not be assigned mouse or keyboard event listeners.`);
+}
+
+/**
+ * <%element%> with a %handler% handler must have an ARIA role
+ * @param {null | NodeLike} node
+ * @param {string} element
+ * @param {string} handler
+ */
+export function a11y_no_static_element_interactions(node, element, handler) {
+	w(node, "a11y_no_static_element_interactions", `<${element}> with a ${handler} handler must have an ARIA role`);
+}
+
+/**
+ * '%href_value%' is not a valid %href_attribute% attribute
+ * @param {null | NodeLike} node
+ * @param {string} href_value
+ * @param {string} href_attribute
+ */
+export function a11y_invalid_attribute(node, href_value, href_attribute) {
+	w(node, "a11y_invalid_attribute", `'${href_value}' is not a valid ${href_attribute} attribute`);
+}
+
+/**
+ * <%name%> element should have %article% %sequence% attribute
+ * @param {null | NodeLike} node
+ * @param {string} name
+ * @param {string} article
+ * @param {string} sequence
+ */
+export function a11y_missing_attribute(node, name, article, sequence) {
+	w(node, "a11y_missing_attribute", `<${name}> element should have ${article} ${sequence} attribute`);
+}
+
+/**
+ * The value '%value%' is not supported by the attribute 'autocomplete' on element <input type="%type%">
+ * @param {null | NodeLike} node
+ * @param {string} value
+ * @param {string} type
+ */
+export function a11y_autocomplete_valid(node, value, type) {
+	w(node, "a11y_autocomplete_valid", `The value '${value}' is not supported by the attribute 'autocomplete' on element <input type="${type}">`);
+}
+
+/**
+ * Screenreaders already announce <img> elements as an image.
+ * @param {null | NodeLike} node
+ */
+export function a11y_img_redundant_alt(node) {
+	w(node, "a11y_img_redundant_alt", "Screenreaders already announce <img> elements as an image.");
+}
+
+/**
+ * A form label must be associated with a control.
+ * @param {null | NodeLike} node
+ */
+export function a11y_label_has_associated_control(node) {
+	w(node, "a11y_label_has_associated_control", "A form label must be associated with a control.");
+}
+
+/**
+ * <video> elements must have a <track kind="captions">
+ * @param {null | NodeLike} node
+ */
+export function a11y_media_has_caption(node) {
+	w(node, "a11y_media_has_caption", "<video> elements must have a <track kind=\"captions\">");
+}
+
+/**
+ * Avoid <%name%> elements
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function a11y_distracting_elements(node, name) {
+	w(node, "a11y_distracting_elements", `Avoid <${name}> elements`);
+}
+
+/**
+ * `<figcaption>` must be an immediate child of `<figure>`
+ * @param {null | NodeLike} node
+ */
+export function a11y_figcaption_parent(node) {
+	w(node, "a11y_figcaption_parent", "`<figcaption>` must be an immediate child of `<figure>`");
+}
+
+/**
+ * `<figcaption>` must be first or last child of `<figure>`
+ * @param {null | NodeLike} node
+ */
+export function a11y_figcaption_index(node) {
+	w(node, "a11y_figcaption_index", "`<figcaption>` must be first or last child of `<figure>`");
+}
+
+/**
+ * '%event%' event must be accompanied by '%accompanied_by%' event
+ * @param {null | NodeLike} node
+ * @param {string} event
+ * @param {string} accompanied_by
+ */
+export function a11y_mouse_events_have_key_events(node, event, accompanied_by) {
+	w(node, "a11y_mouse_events_have_key_events", `'${event}' event must be accompanied by '${accompanied_by}' event`);
+}
+
+/**
+ * <%name%> element should have child content
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function a11y_missing_content(node, name) {
+	w(node, "a11y_missing_content", `<${name}> element should have child content`);
+}
+
+/**
+ * The "is" attribute is not supported cross-browser and should be avoided
+ * @param {null | NodeLike} node
+ */
+export function avoid_is(node) {
+	w(node, "avoid_is", "The \"is\" attribute is not supported cross-browser and should be avoided");
+}
+
+/**
+ * You are referencing globalThis.%name%. Did you forget to declare a variable with that name?
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function global_event_reference(node, name) {
+	w(node, "global_event_reference", `You are referencing globalThis.${name}. Did you forget to declare a variable with that name?`);
+}
+
+/**
+ * Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
+ * @param {null | NodeLike} node
+ */
+export function illegal_attribute_character(node) {
+	w(node, "illegal_attribute_character", "Attributes should not contain ':' characters to prevent ambiguity with Svelte directives");
+}
+
+/**
+ * '%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
+ * @param {null | NodeLike} node
+ * @param {string} wrong
+ * @param {string} right
+ */
+export function invalid_html_attribute(node, wrong, right) {
+	w(node, "invalid_html_attribute", `'${wrong}' is not a valid HTML attribute. Did you mean '${right}'?`);
+}
+
+/**
+ * Empty block
+ * @param {null | NodeLike} node
+ */
+export function empty_block(node) {
+	w(node, "empty_block", "Empty block");
+}
+
+/**
+ * <%name%> will be treated as an HTML element unless it begins with a capital letter
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function component_name_lowercase(node, name) {
+	w(node, "component_name_lowercase", `<${name}> will be treated as an HTML element unless it begins with a capital letter`);
+}
+
+/**
+ * Unused CSS selector "%name%"
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function css_unused_selector(node, name) {
+	w(node, "css_unused_selector", `Unused CSS selector "${name}"`);
+}
+
+/**
+ * Reactive declarations only exist at the top level of the instance script
+ * @param {null | NodeLike} node
+ */
+export function no_reactive_declaration(node) {
+	w(node, "no_reactive_declaration", "Reactive declarations only exist at the top level of the instance script");
+}
+
+/**
+ * All dependencies of the reactive declaration are declared in a module script and will not be reactive
+ * @param {null | NodeLike} node
+ */
+export function module_script_reactive_declaration(node) {
+	w(node, "module_script_reactive_declaration", "All dependencies of the reactive declaration are declared in a module script and will not be reactive");
+}
+
+/**
+ * Component has unused export property '%name%'. If it is for external reference only, please consider using `export const %name%`
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function unused_export_let(node, name) {
+	w(node, "unused_export_let", `Component has unused export property '${name}'. If it is for external reference only, please consider using \`export const ${name}\``);
+}
+
+/**
+ * Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.
+ * @param {null | NodeLike} node
+ */
+export function deprecated_slot_element(node) {
+	w(node, "deprecated_slot_element", "Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.");
+}
+
+/**
+ * Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function deprecated_event_handler(node, name) {
+	w(node, "deprecated_event_handler", `Using on:${name} to listen to the ${name} event is is deprecated. Use the event attribute on${name} instead.`);
+}
+
+/**
+ * Self-closing HTML tags for non-void elements are ambiguous — use <%name% ...></%name%> rather than <%name% ... />
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function invalid_self_closing_tag(node, name) {
+	w(node, "invalid_self_closing_tag", `Self-closing HTML tags for non-void elements are ambiguous — use <${name} ...></${name}> rather than <${name} ... />`);
+}
+
+/**
+ * The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?
+ * @param {null | NodeLike} node
+ */
+export function missing_custom_element_compile_option(node) {
+	w(node, "missing_custom_element_compile_option", "The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?");
+}
+
+/**
+ * Avoid 'new class' — instead, declare the class at the top level scope
+ * @param {null | NodeLike} node
+ */
+export function avoid_inline_class(node) {
+	w(node, "avoid_inline_class", "Avoid 'new class' — instead, declare the class at the top level scope");
+}
+
+/**
+ * Avoid declaring classes below the top level scope
+ * @param {null | NodeLike} node
+ */
+export function avoid_nested_class(node) {
+	w(node, "avoid_nested_class", "Avoid declaring classes below the top level scope");
+}
+
+/**
+ * It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function store_with_rune_name(node, name) {
+	w(node, "store_with_rune_name", `It looks like you're using the \`$${name}\` rune, but there is a local binding called \`${name}\`. Referencing a local variable with a \`$\` prefix will create a store subscription. Please rename \`${name}\` to avoid the ambiguity`);
+}
+
+/**
+ * `%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function non_state_reference(node, name) {
+	w(node, "non_state_reference", `\`${name}\` is updated, but is not declared with \`$state(...)\`. Changing its value will not correctly trigger updates`);
+}
+
+/**
+ * Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
+ * @param {null | NodeLike} node
+ */
+export function derived_iife(node) {
+	w(node, "derived_iife", "Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`");
+}
+
+/**
+ * Component properties are declared using `$props()` in runes mode. Did you forget to call the function?
+ * @param {null | NodeLike} node
+ */
+export function invalid_props_declaration(node) {
+	w(node, "invalid_props_declaration", "Component properties are declared using `$props()` in runes mode. Did you forget to call the function?");
+}
+
+/**
+ * Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?
+ * @param {null | NodeLike} node
+ */
+export function invalid_bindable_declaration(node) {
+	w(node, "invalid_bindable_declaration", "Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?");
+}
+
+/**
+ * State referenced in its own scope will never update. Did you mean to reference it inside a closure?
+ * @param {null | NodeLike} node
+ */
+export function static_state_reference(node) {
+	w(node, "static_state_reference", "State referenced in its own scope will never update. Did you mean to reference it inside a closure?");
+}
+
+/**
+ * The rest operator (...) will create a new object and binding '%name%' with the original object will not work
+ * @param {null | NodeLike} node
+ * @param {string} name
+ */
+export function invalid_rest_eachblock_binding(node, name) {
+	w(node, "invalid_rest_eachblock_binding", `The rest operator (...) will create a new object and binding '${name}' with the original object will not work`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/css/samples/attribute-selector-case-sensitive/_config.js b/packages/svelte/tests/css/samples/attribute-selector-case-sensitive/_config.js
index 4be32cf365..ec37410442 100644
--- a/packages/svelte/tests/css/samples/attribute-selector-case-sensitive/_config.js
+++ b/packages/svelte/tests/css/samples/attribute-selector-case-sensitive/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 44,
 				column: 14,
diff --git a/packages/svelte/tests/css/samples/descendant-selector-unmatched/_config.js b/packages/svelte/tests/css/samples/descendant-selector-unmatched/_config.js
index 509e5faec9..35258ef2b2 100644
--- a/packages/svelte/tests/css/samples/descendant-selector-unmatched/_config.js
+++ b/packages/svelte/tests/css/samples/descendant-selector-unmatched/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 33,
 				column: 6,
diff --git a/packages/svelte/tests/css/samples/dynamic-element/_config.js b/packages/svelte/tests/css/samples/dynamic-element/_config.js
index 3b6a14f232..48e47c1de4 100644
--- a/packages/svelte/tests/css/samples/dynamic-element/_config.js
+++ b/packages/svelte/tests/css/samples/dynamic-element/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".unused"',
 			start: {
 				character: 79,
diff --git a/packages/svelte/tests/css/samples/empty-class/_config.js b/packages/svelte/tests/css/samples/empty-class/_config.js
index 5f66a10535..d9e56228fb 100644
--- a/packages/svelte/tests/css/samples/empty-class/_config.js
+++ b/packages/svelte/tests/css/samples/empty-class/_config.js
@@ -4,7 +4,7 @@ export default test({
 	warnings: [
 		{
 			filename: 'SvelteComponent.svelte',
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".x"',
 			start: {
 				line: 4,
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-await/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-await/_config.js
index 8fdea81aaf..fbc374017b 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-await/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-await/_config.js
@@ -3,19 +3,19 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .c"',
 			start: { character: 269, column: 1, line: 15 },
 			end: { character: 276, column: 8, line: 15 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c ~ .d"',
 			start: { character: 296, column: 1, line: 16 },
 			end: { character: 303, column: 8, line: 16 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .d"',
 			start: { character: 323, column: 1, line: 17 },
 			end: { character: 330, column: 8, line: 17 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-each-else-nested/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-each-else-nested/_config.js
index ad86c2d045..82ff5d5e45 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-each-else-nested/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-each-else-nested/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".e ~ .f"',
 			start: { character: 812, column: 1, line: 35 },
 			end: { character: 819, column: 8, line: 35 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-each-else/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-each-else/_config.js
index e0059c8eb5..36182939d0 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-each-else/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-each-else/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .c"',
 			start: { character: 198, column: 1, line: 13 },
 			end: { character: 205, column: 8, line: 13 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/_config.js
index 36970ad4cd..a5d586d758 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .c"',
 			start: { character: 319, column: 1, line: 18 },
 			end: { character: 326, column: 8, line: 18 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive/_config.js
index b6eba63bed..eb2f1a026a 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-if-not-exhaustive/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .c"',
 			start: { character: 215, column: 1, line: 14 },
 			end: { character: 222, column: 8, line: 14 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-if/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-if/_config.js
index 896b289fd1..38b4ad344b 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-if/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-if/_config.js
@@ -3,19 +3,19 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .c"',
 			start: { character: 269, column: 1, line: 16 },
 			end: { character: 276, column: 8, line: 16 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .d"',
 			start: { character: 296, column: 1, line: 17 },
 			end: { character: 303, column: 8, line: 17 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c ~ .d"',
 			start: { character: 323, column: 1, line: 18 },
 			end: { character: 330, column: 8, line: 18 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-rendertag-global/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-rendertag-global/_config.js
index 2038788f67..e59a88cb3f 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-rendertag-global/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-rendertag-global/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 479,
 				column: 19,
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-slot-global/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-slot-global/_config.js
index b595370622..9675b0be9f 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-slot-global/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-slot-global/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 472,
 				column: 19,
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-slot/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-slot/_config.js
index 1de4e6d06d..6fe2e4ac59 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-slot/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-slot/_config.js
@@ -3,37 +3,37 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a ~ .b"',
 			start: { character: 110, column: 1, line: 10 },
 			end: { character: 117, column: 8, line: 10 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .c"',
 			start: { character: 137, column: 1, line: 11 },
 			end: { character: 144, column: 8, line: 11 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c ~ .f"',
 			start: { character: 164, column: 1, line: 12 },
 			end: { character: 171, column: 8, line: 12 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".f ~ .g"',
 			start: { character: 191, column: 1, line: 13 },
 			end: { character: 198, column: 8, line: 13 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .f"',
 			start: { character: 218, column: 1, line: 14 },
 			end: { character: 225, column: 8, line: 14 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b ~ .g"',
 			start: { character: 245, column: 1, line: 15 },
 			end: { character: 252, column: 8, line: 15 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-star/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-star/_config.js
index 5828733842..665c914362 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-star/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-star/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".not-match > * ~ *"',
 			start: { character: 50, column: 1, line: 5 },
 			end: { character: 68, column: 19, line: 5 }
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator-svelteelement/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator-svelteelement/_config.js
index d9b40d6462..7c50a76bbb 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator-svelteelement/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator-svelteelement/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 496,
 				column: 10,
diff --git a/packages/svelte/tests/css/samples/general-siblings-combinator/_config.js b/packages/svelte/tests/css/samples/general-siblings-combinator/_config.js
index 47f2f5fb5c..2d93119179 100644
--- a/packages/svelte/tests/css/samples/general-siblings-combinator/_config.js
+++ b/packages/svelte/tests/css/samples/general-siblings-combinator/_config.js
@@ -3,25 +3,25 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "article ~ div"',
 			start: { character: 275, column: 1, line: 12 },
 			end: { character: 288, column: 14, line: 12 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "span ~ article"',
 			start: { character: 308, column: 1, line: 13 },
 			end: { character: 322, column: 15, line: 13 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "b ~ article"',
 			start: { character: 342, column: 1, line: 14 },
 			end: { character: 353, column: 12, line: 14 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "span ~ div"',
 			start: { character: 373, column: 1, line: 15 },
 			end: { character: 383, column: 11, line: 15 }
diff --git a/packages/svelte/tests/css/samples/global-block/_config.js b/packages/svelte/tests/css/samples/global-block/_config.js
index 53b9ee318f..430b45fe37 100644
--- a/packages/svelte/tests/css/samples/global-block/_config.js
+++ b/packages/svelte/tests/css/samples/global-block/_config.js
@@ -4,7 +4,7 @@ export default test({
 	warnings: [
 		{
 			filename: 'SvelteComponent.svelte',
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".unused :global"',
 			start: {
 				line: 16,
diff --git a/packages/svelte/tests/css/samples/global-with-unused-descendant/_config.js b/packages/svelte/tests/css/samples/global-with-unused-descendant/_config.js
index d30184a4b2..eb31e60fdc 100644
--- a/packages/svelte/tests/css/samples/global-with-unused-descendant/_config.js
+++ b/packages/svelte/tests/css/samples/global-with-unused-descendant/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ":global(.foo) .bar"',
 			start: { character: 9, column: 1, line: 2 },
 			end: { character: 27, column: 19, line: 2 }
diff --git a/packages/svelte/tests/css/samples/host/_config.js b/packages/svelte/tests/css/samples/host/_config.js
index e5c8c0fe0e..740593396b 100644
--- a/packages/svelte/tests/css/samples/host/_config.js
+++ b/packages/svelte/tests/css/samples/host/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ":host > span"',
 			start: {
 				character: 145,
diff --git a/packages/svelte/tests/css/samples/is/_config.js b/packages/svelte/tests/css/samples/is/_config.js
index 4a3961aaef..cb3a31ce20 100644
--- a/packages/svelte/tests/css/samples/is/_config.js
+++ b/packages/svelte/tests/css/samples/is/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 38,
 				column: 11,
diff --git a/packages/svelte/tests/css/samples/nested-css/_config.js b/packages/svelte/tests/css/samples/nested-css/_config.js
index e51fbe576c..128da8b3c7 100644
--- a/packages/svelte/tests/css/samples/nested-css/_config.js
+++ b/packages/svelte/tests/css/samples/nested-css/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 239,
 				column: 13,
@@ -17,7 +17,7 @@ export default test({
 			}
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 302,
 				column: 10,
@@ -31,7 +31,7 @@ export default test({
 			}
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 328,
 				column: 6,
@@ -45,7 +45,7 @@ export default test({
 			}
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 381,
 				column: 10,
@@ -59,7 +59,7 @@ export default test({
 			}
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 471,
 				column: 7,
@@ -73,7 +73,7 @@ export default test({
 			}
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 634,
 				column: 5,
@@ -87,7 +87,7 @@ export default test({
 			}
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 666,
 				column: 9,
diff --git a/packages/svelte/tests/css/samples/omit-scoping-attribute-descendant/_config.js b/packages/svelte/tests/css/samples/omit-scoping-attribute-descendant/_config.js
index 5385f5d600..8ec63cb987 100644
--- a/packages/svelte/tests/css/samples/omit-scoping-attribute-descendant/_config.js
+++ b/packages/svelte/tests/css/samples/omit-scoping-attribute-descendant/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "div > p"',
 			start: {
 				line: 8,
diff --git a/packages/svelte/tests/css/samples/preserve-specificity/input.svelte b/packages/svelte/tests/css/samples/preserve-specificity/input.svelte
index 1c0a594145..0314795199 100644
--- a/packages/svelte/tests/css/samples/preserve-specificity/input.svelte
+++ b/packages/svelte/tests/css/samples/preserve-specificity/input.svelte
@@ -1,4 +1,4 @@
-<!-- svelte-ignore a11y-missing-attribute -->
+<!-- svelte-ignore a11y_missing_attribute -->
 <a>
   <b>
     <c>
@@ -21,4 +21,4 @@
   .foo {
     color: green;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-await/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-await/_config.js
index 69049c7e83..46e3b331b8 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-await/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-await/_config.js
@@ -3,25 +3,25 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .e"',
 			start: { character: 242, column: 1, line: 14 },
 			end: { character: 249, column: 8, line: 14 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .c"',
 			start: { character: 269, column: 1, line: 15 },
 			end: { character: 276, column: 8, line: 15 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c + .d"',
 			start: { character: 296, column: 1, line: 16 },
 			end: { character: 303, column: 8, line: 16 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .d"',
 			start: { character: 323, column: 1, line: 17 },
 			end: { character: 330, column: 8, line: 17 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-each-2/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-each-2/_config.js
index ce7e3793c7..cbc6316442 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-each-2/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-each-2/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .c"',
 			start: { character: 320, column: 1, line: 26 },
 			end: { character: 327, column: 8, line: 26 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-each-else-nested/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-each-else-nested/_config.js
index b7f24a8881..6ea62ad0c5 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-each-else-nested/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-each-else-nested/_config.js
@@ -3,61 +3,61 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .c"',
 			start: { character: 478, column: 1, line: 23 },
 			end: { character: 485, column: 8, line: 23 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .g"',
 			start: { character: 505, column: 1, line: 24 },
 			end: { character: 512, column: 8, line: 24 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .e"',
 			start: { character: 532, column: 1, line: 25 },
 			end: { character: 539, column: 8, line: 25 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c + .g"',
 			start: { character: 559, column: 1, line: 26 },
 			end: { character: 566, column: 8, line: 26 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c + .k"',
 			start: { character: 586, column: 1, line: 27 },
 			end: { character: 593, column: 8, line: 27 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".d + .d"',
 			start: { character: 613, column: 1, line: 28 },
 			end: { character: 620, column: 8, line: 28 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".e + .f"',
 			start: { character: 640, column: 1, line: 29 },
 			end: { character: 647, column: 8, line: 29 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".f + .f"',
 			start: { character: 667, column: 1, line: 30 },
 			end: { character: 674, column: 8, line: 30 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".g + .j"',
 			start: { character: 694, column: 1, line: 31 },
 			end: { character: 701, column: 8, line: 31 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".g + .h + .i + .j"',
 			start: { character: 721, column: 1, line: 32 },
 			end: { character: 738, column: 18, line: 32 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-each-else/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-each-else/_config.js
index 0014358f74..3d1c4659f4 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-each-else/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-each-else/_config.js
@@ -3,13 +3,13 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .d"',
 			start: { character: 171, column: 1, line: 12 },
 			end: { character: 178, column: 8, line: 12 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .c"',
 			start: { character: 198, column: 1, line: 13 },
 			end: { character: 205, column: 8, line: 13 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-each-nested/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-each-nested/_config.js
index c21cbb7df4..847a6184de 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-each-nested/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-each-nested/_config.js
@@ -3,49 +3,49 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .h"',
 			start: { character: 1229, column: 1, line: 58 },
 			end: { character: 1236, column: 8, line: 58 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .i"',
 			start: { character: 1256, column: 1, line: 59 },
 			end: { character: 1263, column: 8, line: 59 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c + .h"',
 			start: { character: 1283, column: 1, line: 60 },
 			end: { character: 1290, column: 8, line: 60 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c + .i"',
 			start: { character: 1310, column: 1, line: 61 },
 			end: { character: 1317, column: 8, line: 61 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".d + .f"',
 			start: { character: 1337, column: 1, line: 62 },
 			end: { character: 1344, column: 8, line: 62 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".d + .g"',
 			start: { character: 1364, column: 1, line: 63 },
 			end: { character: 1371, column: 8, line: 63 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".e + .g"',
 			start: { character: 1391, column: 1, line: 64 },
 			end: { character: 1398, column: 8, line: 64 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".g + .i"',
 			start: { character: 1418, column: 1, line: 65 },
 			end: { character: 1425, column: 8, line: 65 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-global/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-global/_config.js
index 8600db6013..539ea5e2b6 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-global/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-global/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ":global(input) + span"',
 			start: {
 				character: 239,
@@ -17,7 +17,7 @@ export default test({
 			}
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ":global(input) ~ span"',
 			start: {
 				character: 279,
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive-with-each/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive-with-each/_config.js
index 61117e1086..da7e9cb522 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive-with-each/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive-with-each/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .c"',
 			start: { character: 319, column: 1, line: 18 },
 			end: { character: 326, column: 8, line: 18 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive/_config.js
index b823529970..39738d3fb9 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-if-not-exhaustive/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .c"',
 			start: { character: 215, column: 1, line: 14 },
 			end: { character: 222, column: 8, line: 14 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-if/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-if/_config.js
index 5903e9645b..16883232a2 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-if/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-if/_config.js
@@ -3,25 +3,25 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .e"',
 			start: { character: 242, column: 1, line: 15 },
 			end: { character: 249, column: 8, line: 15 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .c"',
 			start: { character: 269, column: 1, line: 16 },
 			end: { character: 276, column: 8, line: 16 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .d"',
 			start: { character: 296, column: 1, line: 17 },
 			end: { character: 303, column: 8, line: 17 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c + .d"',
 			start: { character: 323, column: 1, line: 18 },
 			end: { character: 330, column: 8, line: 18 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-slot/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-slot/_config.js
index b1c2369ab7..d13a8d726b 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-slot/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-slot/_config.js
@@ -3,19 +3,19 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".a + .b"',
 			start: { character: 83, column: 1, line: 9 },
 			end: { character: 90, column: 8, line: 9 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".b + .c"',
 			start: { character: 110, column: 1, line: 10 },
 			end: { character: 117, column: 8, line: 10 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".c + .f"',
 			start: { character: 137, column: 1, line: 11 },
 			end: { character: 144, column: 8, line: 11 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator-star/_config.js b/packages/svelte/tests/css/samples/siblings-combinator-star/_config.js
index 99ed8d1efa..f9ad4bca0c 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator-star/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator-star/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".not-match > * + *"',
 			start: { character: 50, column: 1, line: 5 },
 			end: { character: 68, column: 19, line: 5 }
diff --git a/packages/svelte/tests/css/samples/siblings-combinator/_config.js b/packages/svelte/tests/css/samples/siblings-combinator/_config.js
index 438bbc574b..8ef8aac908 100644
--- a/packages/svelte/tests/css/samples/siblings-combinator/_config.js
+++ b/packages/svelte/tests/css/samples/siblings-combinator/_config.js
@@ -3,25 +3,25 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "article + div"',
 			start: { character: 45, column: 1, line: 5 },
 			end: { character: 58, column: 14, line: 5 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "span + article"',
 			start: { character: 81, column: 1, line: 8 },
 			end: { character: 95, column: 15, line: 8 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "b + article"',
 			start: { character: 118, column: 1, line: 11 },
 			end: { character: 129, column: 12, line: 11 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "span + div"',
 			start: { character: 152, column: 1, line: 14 },
 			end: { character: 162, column: 11, line: 14 }
diff --git a/packages/svelte/tests/css/samples/unused-selector-child-combinator/_config.js b/packages/svelte/tests/css/samples/unused-selector-child-combinator/_config.js
index cc9927ae0f..6dc7f0411e 100644
--- a/packages/svelte/tests/css/samples/unused-selector-child-combinator/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-child-combinator/_config.js
@@ -3,19 +3,19 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "article > *"',
 			start: { character: 9, column: 1, line: 2 },
 			end: { character: 20, column: 12, line: 2 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "article *"',
 			start: { character: 47, column: 1, line: 6 },
 			end: { character: 56, column: 10, line: 6 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".article > *"',
 			start: { character: 83, column: 1, line: 10 },
 			end: { character: 95, column: 13, line: 10 }
diff --git a/packages/svelte/tests/css/samples/unused-selector-empty-attribute/_config.js b/packages/svelte/tests/css/samples/unused-selector-empty-attribute/_config.js
index 3628524f69..004ba8954b 100644
--- a/packages/svelte/tests/css/samples/unused-selector-empty-attribute/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-empty-attribute/_config.js
@@ -4,7 +4,7 @@ export default test({
 	warnings: [
 		{
 			filename: 'SvelteComponent.svelte',
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector "img[alt=""]"',
 			start: {
 				character: 87,
diff --git a/packages/svelte/tests/css/samples/unused-selector-leading/_config.js b/packages/svelte/tests/css/samples/unused-selector-leading/_config.js
index a428fa803f..fcf70cb7b9 100644
--- a/packages/svelte/tests/css/samples/unused-selector-leading/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-leading/_config.js
@@ -4,7 +4,7 @@ export default test({
 	warnings: [
 		{
 			filename: 'SvelteComponent.svelte',
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".foo"',
 			start: {
 				line: 4,
@@ -20,7 +20,7 @@ export default test({
 
 		{
 			filename: 'SvelteComponent.svelte',
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".baz"',
 			start: {
 				line: 4,
diff --git a/packages/svelte/tests/css/samples/unused-selector-string-concat/_config.js b/packages/svelte/tests/css/samples/unused-selector-string-concat/_config.js
index 8318e58856..a779778516 100644
--- a/packages/svelte/tests/css/samples/unused-selector-string-concat/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-string-concat/_config.js
@@ -3,61 +3,61 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".fooaa"',
 			start: { line: 11, column: 2, character: 206 },
 			end: { line: 11, column: 8, character: 212 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".foobb"',
 			start: { line: 12, column: 2, character: 229 },
 			end: { line: 12, column: 8, character: 235 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".foodd"',
 			start: { line: 14, column: 2, character: 275 },
 			end: { line: 14, column: 8, character: 281 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".bbbar"',
 			start: { line: 20, column: 2, character: 401 },
 			end: { line: 20, column: 8, character: 407 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".ccbar"',
 			start: { line: 21, column: 2, character: 424 },
 			end: { line: 21, column: 8, character: 430 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".ddbar"',
 			start: { line: 22, column: 2, character: 447 },
 			end: { line: 22, column: 8, character: 453 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".fooaabar"',
 			start: { line: 23, column: 2, character: 470 },
 			end: { line: 23, column: 11, character: 479 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".foobbbar"',
 			start: { line: 24, column: 2, character: 496 },
 			end: { line: 24, column: 11, character: 505 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".fooccbar"',
 			start: { line: 25, column: 2, character: 522 },
 			end: { line: 25, column: 11, character: 531 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".unused"',
 			start: { line: 28, column: 2, character: 595 },
 			end: { line: 28, column: 9, character: 602 }
diff --git a/packages/svelte/tests/css/samples/unused-selector-ternary-concat/_config.js b/packages/svelte/tests/css/samples/unused-selector-ternary-concat/_config.js
index 52caa7e457..96fad08e3f 100644
--- a/packages/svelte/tests/css/samples/unused-selector-ternary-concat/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-ternary-concat/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".unused"',
 			start: {
 				character: 198,
diff --git a/packages/svelte/tests/css/samples/unused-selector-ternary-nested/_config.js b/packages/svelte/tests/css/samples/unused-selector-ternary-nested/_config.js
index 43f6e628b8..b74ccce347 100644
--- a/packages/svelte/tests/css/samples/unused-selector-ternary-nested/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-ternary-nested/_config.js
@@ -3,13 +3,13 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".hover.unused"',
 			start: { line: 15, column: 2, character: 261 },
 			end: { line: 15, column: 15, character: 274 }
 		},
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".unused"',
 			start: { line: 17, column: 2, character: 295 },
 			end: { line: 17, column: 9, character: 302 }
diff --git a/packages/svelte/tests/css/samples/unused-selector-ternary/_config.js b/packages/svelte/tests/css/samples/unused-selector-ternary/_config.js
index 05ac58e36c..b8acc30e2d 100644
--- a/packages/svelte/tests/css/samples/unused-selector-ternary/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-ternary/_config.js
@@ -7,7 +7,7 @@ export default test({
 	warnings: [
 		{
 			filename: 'SvelteComponent.svelte',
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".maybeactive"',
 			start: {
 				line: 16,
diff --git a/packages/svelte/tests/css/samples/unused-selector-trailing/_config.js b/packages/svelte/tests/css/samples/unused-selector-trailing/_config.js
index 1504399317..2f30d40d27 100644
--- a/packages/svelte/tests/css/samples/unused-selector-trailing/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector-trailing/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	warnings: [
 		{
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			end: {
 				character: 32,
 				column: 3,
diff --git a/packages/svelte/tests/css/samples/unused-selector/_config.js b/packages/svelte/tests/css/samples/unused-selector/_config.js
index 2a9d738386..a95a24d738 100644
--- a/packages/svelte/tests/css/samples/unused-selector/_config.js
+++ b/packages/svelte/tests/css/samples/unused-selector/_config.js
@@ -4,7 +4,7 @@ export default test({
 	warnings: [
 		{
 			filename: 'SvelteComponent.svelte',
-			code: 'css-unused-selector',
+			code: 'css_unused_selector',
 			message: 'Unused CSS selector ".bar"',
 			start: {
 				line: 8,
diff --git a/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js b/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js
index 28c6bdae4c..dfb291476d 100644
--- a/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js
+++ b/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js
@@ -4,7 +4,7 @@ const tick = () => Promise.resolve();
 export default test({
 	warnings: [
 		{
-			code: 'avoid-is',
+			code: 'avoid_is',
 			message: 'The "is" attribute is not supported cross-browser and should be avoided',
 			start: {
 				character: 109,
diff --git a/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json b/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json
index 904288c45c..8a21f3cfe3 100644
--- a/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <img> element should have an alt attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<img> element should have an alt attribute",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <area> element should have an alt, aria-label or aria-labelledby attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<area> element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 4,
 			"column": 1
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <object> element should have a title, aria-label or aria-labelledby attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<object> element should have a title, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 7,
 			"column": 0
@@ -36,8 +36,8 @@
 		}
 	},
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 9,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json b/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
index d9076ddba1..0227195c21 100644
--- a/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-missing-content",
-		"message": "A11y: <a> element should have child content",
+		"code": "a11y_missing_content",
+		"message": "<a> element should have child content",
 		"start": {
 			"line": 1,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json b/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
index 0ca16767d7..ba46443d65 100644
--- a/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <a> element should have an href attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<a> element should have an href attribute",
 		"start": {
 			"line": 1,
 			"column": 11
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-invalid-attribute",
-		"message": "A11y: '' is not a valid xlink:href attribute",
+		"code": "a11y_invalid_attribute",
+		"message": "'' is not a valid xlink:href attribute",
 		"start": {
 			"line": 2,
 			"column": 14
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-invalid-attribute",
-		"message": "A11y: '#' is not a valid xlink:href attribute",
+		"code": "a11y_invalid_attribute",
+		"message": "'#' is not a valid xlink:href attribute",
 		"start": {
 			"line": 3,
 			"column": 14
diff --git a/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json b/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json
index 50d19ae630..8ecb5cff24 100644
--- a/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <a> element should have an href attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<a> element should have an href attribute",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-invalid-attribute",
-		"message": "A11y: '' is not a valid href attribute",
+		"code": "a11y_invalid_attribute",
+		"message": "'' is not a valid href attribute",
 		"start": {
 			"line": 2,
 			"column": 3
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-invalid-attribute",
-		"message": "A11y: '#' is not a valid href attribute",
+		"code": "a11y_invalid_attribute",
+		"message": "'#' is not a valid href attribute",
 		"start": {
 			"line": 3,
 			"column": 3
@@ -36,8 +36,8 @@
 		}
 	},
 	{
-		"code": "a11y-invalid-attribute",
-		"message": "A11y: 'javascript:void(0)' is not a valid href attribute",
+		"code": "a11y_invalid_attribute",
+		"message": "'javascript:void(0)' is not a valid href attribute",
 		"start": {
 			"line": 4,
 			"column": 3
@@ -48,8 +48,8 @@
 		}
 	},
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <a> element should have an href attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<a> element should have an href attribute",
 		"start": {
 			"line": 5,
 			"column": 0
@@ -60,8 +60,8 @@
 		}
 	},
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <a> element should have an href attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<a> element should have an href attribute",
 		"start": {
 			"line": 6,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json
index 186a18666f..79532f4723 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json
@@ -1,11 +1,11 @@
 [
 	{
-		"code": "a11y-aria-activedescendant-has-tabindex",
+		"code": "a11y_aria_activedescendant_has_tabindex",
 		"end": {
 			"column": 36,
 			"line": 16
 		},
-		"message": "A11y: Elements with attribute aria-activedescendant should have tabindex value",
+		"message": "Elements with attribute aria-activedescendant should have tabindex value",
 		"start": {
 			"column": 5,
 			"line": 16
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
index f357429f62..cd36ffd42d 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-unknown-aria-attribute",
-		"message": "A11y: Unknown aria attribute 'aria-labeledby' (did you mean 'labelledby'?)",
+		"code": "a11y_unknown_aria_attribute_suggestion",
+		"message": "Unknown aria attribute 'aria-labeledby'. Did you mean 'labelledby'?",
 		"start": {
 			"line": 1,
 			"column": 20
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"column": 0,
 			"line": 1
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json
index 61cd1aabba..10320c4308 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-disabled' must be exactly one of true or false",
+		"code": "a11y_incorrect_aria_attribute_type_boolean",
+		"message": "The value of 'aria-disabled' must be either 'true' or 'false'",
 		"start": {
 			"line": 5,
 			"column": 8
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-disabled' must be exactly one of true or false",
+		"code": "a11y_incorrect_aria_attribute_type_boolean",
+		"message": "The value of 'aria-disabled' must be either 'true' or 'false'",
 		"start": {
 			"line": 6,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json
index 51b31e70ef..d8be2ef8cd 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-level' must be of type integer",
+		"code": "a11y_incorrect_aria_attribute_type_integer",
+		"message": "The value of 'aria-level' must be an integer",
 		"start": {
 			"line": 1,
 			"column": 5
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-level' must be of type integer",
+		"code": "a11y_incorrect_aria_attribute_type_integer",
+		"message": "The value of 'aria-level' must be an integer",
 		"start": {
 			"line": 2,
 			"column": 5
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-level' must be of type integer",
+		"code": "a11y_incorrect_aria_attribute_type_integer",
+		"message": "The value of 'aria-level' must be an integer",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json
index e28a43df37..ed5283f797 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-valuemax' must be of type number",
+		"code": "a11y_incorrect_aria_attribute_type",
+		"message": "The value of 'aria-valuemax' must be of type number",
 		"start": {
 			"line": 1,
 			"column": 5
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-valuemax' must be of type number",
+		"code": "a11y_incorrect_aria_attribute_type",
+		"message": "The value of 'aria-valuemax' must be of type number",
 		"start": {
 			"line": 2,
 			"column": 5
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-valuemax' must be of type number",
+		"code": "a11y_incorrect_aria_attribute_type",
+		"message": "The value of 'aria-valuemax' must be of type number",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json
index 2dd8f2509f..3a93dbcee6 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-label' must be of type string",
+		"code": "a11y_incorrect_aria_attribute_type",
+		"message": "The value of 'aria-label' must be of type string",
 		"start": {
 			"line": 1,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json
index 555f956d95..fea249be0a 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
+		"code": "a11y_incorrect_aria_attribute_type_token",
+		"message": "The value of 'aria-sort' must be exactly one of \"ascending\", \"descending\", \"none\" or \"other\"",
 		"start": {
 			"line": 1,
 			"column": 5
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
+		"code": "a11y_incorrect_aria_attribute_type_token",
+		"message": "The value of 'aria-sort' must be exactly one of \"ascending\", \"descending\", \"none\" or \"other\"",
 		"start": {
 			"line": 2,
 			"column": 5
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
+		"code": "a11y_incorrect_aria_attribute_type_token",
+		"message": "The value of 'aria-sort' must be exactly one of \"ascending\", \"descending\", \"none\" or \"other\"",
 		"start": {
 			"line": 3,
 			"column": 5
@@ -36,8 +36,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
+		"code": "a11y_incorrect_aria_attribute_type_token",
+		"message": "The value of 'aria-sort' must be exactly one of \"ascending\", \"descending\", \"none\" or \"other\"",
 		"start": {
 			"line": 6,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
index 408a0db916..10a92d1790 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
+		"code": "a11y_incorrect_aria_attribute_type_tokenlist",
+		"message": "The value of 'aria-relevant' must be a space-separated list of one or more of \"additions\", \"all\", \"removals\" or \"text\"",
 		"start": {
 			"line": 1,
 			"column": 5
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
+		"code": "a11y_incorrect_aria_attribute_type_tokenlist",
+		"message": "The value of 'aria-relevant' must be a space-separated list of one or more of \"additions\", \"all\", \"removals\" or \"text\"",
 		"start": {
 			"line": 2,
 			"column": 5
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
+		"code": "a11y_incorrect_aria_attribute_type_tokenlist",
+		"message": "The value of 'aria-relevant' must be a space-separated list of one or more of \"additions\", \"all\", \"removals\" or \"text\"",
 		"start": {
 			"line": 3,
 			"column": 5
@@ -36,8 +36,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
+		"code": "a11y_incorrect_aria_attribute_type_tokenlist",
+		"message": "The value of 'aria-relevant' must be a space-separated list of one or more of \"additions\", \"all\", \"removals\" or \"text\"",
 		"start": {
 			"line": 6,
 			"column": 5
@@ -48,8 +48,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
+		"code": "a11y_incorrect_aria_attribute_type_tokenlist",
+		"message": "The value of 'aria-relevant' must be a space-separated list of one or more of \"additions\", \"all\", \"removals\" or \"text\"",
 		"start": {
 			"line": 7,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tristate/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tristate/warnings.json
index 2733b2ad18..d623a38d88 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tristate/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tristate/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-checked' must be exactly one of true, false, or mixed",
+		"code": "a11y_incorrect_aria_attribute_type_tristate",
+		"message": "The value of 'aria-checked' must be exactly one of true, false, or mixed",
 		"start": {
 			"line": 5,
 			"column": 5
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-incorrect-aria-attribute-type",
-		"message": "A11y: The value of 'aria-checked' must be exactly one of true, false, or mixed",
+		"code": "a11y_incorrect_aria_attribute_type_tristate",
+		"message": "The value of 'aria-checked' must be exactly one of true, false, or mixed",
 		"start": {
 			"line": 6,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json
index 49581ac003..3b250958b0 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-unknown-role",
-		"message": "A11y: Unknown role 'toooltip' (did you mean 'tooltip'?)",
+		"code": "a11y_unknown_role_suggestion",
+		"message": "Unknown role 'toooltip'. Did you mean 'tooltip'?",
 		"start": {
 			"line": 6,
 			"column": 5
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-unknown-role",
-		"message": "A11y: Unknown role 'toooltip' (did you mean 'tooltip'?)",
+		"code": "a11y_unknown_role_suggestion",
+		"message": "Unknown role 'toooltip'. Did you mean 'tooltip'?",
 		"start": {
 			"line": 7,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json
index 04891378b0..3a56930a12 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-aria-attributes",
-		"message": "A11y: <meta> should not have aria-* attributes",
+		"code": "a11y_aria_attributes",
+		"message": "<meta> should not have aria-* attributes",
 		"start": {
 			"line": 1,
 			"column": 6
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-misplaced-role",
-		"message": "A11y: <meta> should not have role attribute",
+		"code": "a11y_misplaced_role",
+		"message": "<meta> should not have role attribute",
 		"start": {
 			"line": 2,
 			"column": 6
diff --git a/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json b/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json
index 470cfff1fb..a09a819de1 100644
--- a/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json
@@ -1,35 +1,35 @@
 [
 	{
-		"code": "a11y-autocomplete-valid",
+		"code": "a11y_autocomplete_valid",
 		"end": {
 			"column": 31,
 			"line": 25
 		},
-		"message": "A11y: The value 'true' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
+		"message": "The value 'true' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
 		"start": {
 			"column": 19,
 			"line": 25
 		}
 	},
 	{
-		"code": "a11y-autocomplete-valid",
+		"code": "a11y_autocomplete_valid",
 		"end": {
 			"column": 43,
 			"line": 26
 		},
-		"message": "A11y: The value 'incorrect' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
+		"message": "The value 'incorrect' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
 		"start": {
 			"column": 19,
 			"line": 26
 		}
 	},
 	{
-		"code": "a11y-autocomplete-valid",
+		"code": "a11y_autocomplete_valid",
 		"end": {
 			"column": 42,
 			"line": 27
 		},
-		"message": "A11y: The value 'webauthn' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
+		"message": "The value 'webauthn' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
 		"start": {
 			"column": 19,
 			"line": 27
diff --git a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
index c8c5d608f0..4ca8d30c4d 100644
--- a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
@@ -9,22 +9,22 @@
 </script>
 
 <!-- should warn -->
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} aria-hidden="false"></div>
 
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <section on:click={noop}></section>
-<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
+<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
 <main on:click={noop}></main>
-<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
+<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
 <article on:click={noop}></article>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <header on:click={noop}></header>
-<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
+<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
 <footer on:click={noop}></footer>
-<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
+<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
 <footer onclick={noop}></footer>
 
 <!-- should not warn -->
@@ -37,32 +37,32 @@
 <input type="button" on:click={noop} />
 <input type={dynamicTypeValue} on:click={noop} />
 
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} {...props}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} on:keydown={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} on:keyup={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} on:keypress={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} on:keydown={noop} on:keyup={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} on:keyup={noop} on:keypress={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} on:keypress={noop} on:keydown={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} on:keydown={noop} on:keyup={noop} on:keypress={noop}></div>
 
 <input on:click={noop} type="hidden" />
 
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} aria-hidden></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} aria-hidden="true"></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} aria-hidden="false" on:keydown={noop}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} aria-hidden={dynamicAriaHiddenValue}></div>
 
 <div on:click={noop} role="presentation"></div>
@@ -70,5 +70,5 @@
 <div on:click={noop} role={dynamicRole}></div>
 <div onclick={noop} role={dynamicRole}></div>
 
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <svelte:element this={Math.random() ? 'button' : 'div'} on:click={noop} />
diff --git a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
index 87ec876987..49cfc849f1 100644
--- a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 13,
 			"column": 0
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 15,
 			"column": 0
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 18,
 			"column": 0
@@ -36,8 +36,8 @@
 		}
 	},
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 20,
 			"column": 0
@@ -48,8 +48,8 @@
 		}
 	},
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 22,
 			"column": 0
@@ -60,8 +60,8 @@
 		}
 	},
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 24,
 			"column": 0
@@ -72,8 +72,8 @@
 		}
 	},
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 26,
 			"column": 0
@@ -84,8 +84,8 @@
 		}
 	},
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 28,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-figcaption-wrong-place/warnings.json b/packages/svelte/tests/validator/samples/a11y-figcaption-wrong-place/warnings.json
index c9cac1daf9..54b8f51f0e 100644
--- a/packages/svelte/tests/validator/samples/a11y-figcaption-wrong-place/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-figcaption-wrong-place/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-structure",
-		"message": "A11y: <figcaption> must be first or last child of <figure>",
+		"code": "a11y_figcaption_index",
+		"message": "`<figcaption>` must be first or last child of `<figure>`",
 		"start": {
 			"line": 4,
 			"column": 1
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-structure",
-		"message": "A11y: <figcaption> must be an immediate child of <figure>",
+		"code": "a11y_figcaption_parent",
+		"message": "`<figcaption>` must be an immediate child of `<figure>`",
 		"start": {
 			"line": 15,
 			"column": 2
diff --git a/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json b/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
index ad5f5d4033..64604d61a3 100644
--- a/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-missing-content",
-		"message": "A11y: <h1> element should have child content",
+		"code": "a11y_missing_content",
+		"message": "<h1> element should have child content",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-hidden",
-		"message": "A11y: <h2> element should not be hidden",
+		"code": "a11y_hidden",
+		"message": "<h2> element should not be hidden",
 		"start": {
 			"line": 2,
 			"column": 4
diff --git a/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json b/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json
index 097e8e88bd..85eca6e407 100644
--- a/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <html> element should have a lang attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<html> element should have a lang attribute",
 		"start": {
 			"column": 0,
 			"line": 9
diff --git a/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json b/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json
index e78523931e..2d80b9b502 100644
--- a/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-missing-attribute",
-		"message": "A11y: <iframe> element should have a title attribute",
+		"code": "a11y_missing_attribute",
+		"message": "<iframe> element should have a title attribute",
 		"start": {
 			"line": 5,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json b/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json
index 9ba5a1c96e..b2b0e4f33a 100644
--- a/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-img-redundant-alt",
-		"message": "A11y: Screenreaders already announce <img> elements as an image.",
+		"code": "a11y_img_redundant_alt",
+		"message": "Screenreaders already announce <img> elements as an image.",
 		"end": {
 			"column": 49,
 			"line": 3
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-img-redundant-alt",
-		"message": "A11y: Screenreaders already announce <img> elements as an image.",
+		"code": "a11y_img_redundant_alt",
+		"message": "Screenreaders already announce <img> elements as an image.",
 		"end": {
 			"column": 45,
 			"line": 4
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-img-redundant-alt",
-		"message": "A11y: Screenreaders already announce <img> elements as an image.",
+		"code": "a11y_img_redundant_alt",
+		"message": "Screenreaders already announce <img> elements as an image.",
 		"end": {
 			"column": 52,
 			"line": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/warnings.json b/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/warnings.json
index 2034bc2bd5..7b4eaa049a 100644
--- a/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/warnings.json
@@ -1,275 +1,275 @@
 [
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 48,
 			"line": 11
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 11
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 51,
 			"line": 12
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 12
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 45,
 			"line": 13
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 13
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 72,
 			"line": 14
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 14
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 51,
 			"line": 15
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 15
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 52,
 			"line": 16
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 16
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 44,
 			"line": 17
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 17
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 51,
 			"line": 18
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 18
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 49,
 			"line": 19
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 19
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 52,
 			"line": 20
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 20
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 49,
 			"line": 21
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 21
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 52,
 			"line": 22
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 22
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 49,
 			"line": 23
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 23
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 48,
 			"line": 24
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 24
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 49,
 			"line": 25
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 25
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 54,
 			"line": 26
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 26
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 50,
 			"line": 27
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 27
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 53,
 			"line": 28
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 28
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 48,
 			"line": 29
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 29
 		}
 	},
 	{
-		"code": "a11y-mouse-events-have-key-events",
+		"code": "a11y_mouse_events_have_key_events",
 		"end": {
 			"column": 48,
 			"line": 29
 		},
-		"message": "A11y: 'mouseout' event must be accompanied by 'blur' event",
+		"message": "'mouseout' event must be accompanied by 'blur' event",
 		"start": {
 			"column": 0,
 			"line": 29
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 53,
 			"line": 30
 		},
-		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"message": "Elements with the 'menuitem' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 30
 		}
 	},
 	{
-		"code": "a11y-mouse-events-have-key-events",
+		"code": "a11y_mouse_events_have_key_events",
 		"end": {
 			"column": 53,
 			"line": 30
 		},
-		"message": "A11y: 'mouseover' event must be accompanied by 'focus' event",
+		"message": "'mouseover' event must be accompanied by 'focus' event",
 		"start": {
 			"column": 0,
 			"line": 30
 		}
 	},
 	{
-		"code": "a11y-interactive-supports-focus",
+		"code": "a11y_interactive_supports_focus",
 		"end": {
 			"column": 47,
 			"line": 31
 		},
-		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"message": "Elements with the 'button' interactive role must have a tabindex value.",
 		"start": {
 			"column": 0,
 			"line": 31
diff --git a/packages/svelte/tests/validator/samples/a11y-label-has-associated-control/warnings.json b/packages/svelte/tests/validator/samples/a11y-label-has-associated-control/warnings.json
index 4bbaf6c6c2..2ac34c4bee 100644
--- a/packages/svelte/tests/validator/samples/a11y-label-has-associated-control/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-label-has-associated-control/warnings.json
@@ -1,23 +1,23 @@
 [
 	{
-		"code": "a11y-label-has-associated-control",
+		"code": "a11y_label_has_associated_control",
 		"end": {
 			"column": 16,
 			"line": 5
 		},
-		"message": "A11y: A form label must be associated with a control.",
+		"message": "A form label must be associated with a control.",
 		"start": {
 			"column": 0,
 			"line": 5
 		}
 	},
 	{
-		"code": "a11y-label-has-associated-control",
+		"code": "a11y_label_has_associated_control",
 		"end": {
 			"column": 30,
 			"line": 10
 		},
-		"message": "A11y: A form label must be associated with a control.",
+		"message": "A form label must be associated with a control.",
 		"start": {
 			"column": 0,
 			"line": 10
diff --git a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
index a438bbdc0f..cfefede261 100644
--- a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
@@ -1,47 +1,47 @@
 [
 	{
-		"code": "a11y-media-has-caption",
+		"code": "a11y_media_has_caption",
 		"end": {
 			"column": 15,
 			"line": 2
 		},
-		"message": "A11y: <video> elements must have a <track kind=\"captions\">",
+		"message": "<video> elements must have a <track kind=\"captions\">",
 		"start": {
 			"column": 0,
 			"line": 2
 		}
 	},
 	{
-		"code": "a11y-media-has-caption",
+		"code": "a11y_media_has_caption",
 		"end": {
 			"column": 24,
 			"line": 3
 		},
-		"message": "A11y: <video> elements must have a <track kind=\"captions\">",
+		"message": "<video> elements must have a <track kind=\"captions\">",
 		"start": {
 			"column": 0,
 			"line": 3
 		}
 	},
 	{
-		"code": "a11y-media-has-caption",
+		"code": "a11y_media_has_caption",
 		"end": {
 			"column": 27,
 			"line": 5
 		},
-		"message": "A11y: <video> elements must have a <track kind=\"captions\">",
+		"message": "<video> elements must have a <track kind=\"captions\">",
 		"start": {
 			"column": 0,
 			"line": 5
 		}
 	},
 	{
-		"code": "a11y-media-has-caption",
+		"code": "a11y_media_has_caption",
 		"end": {
 			"column": 35,
 			"line": 6
 		},
-		"message": "A11y: <video> elements must have a <track kind=\"captions\">",
+		"message": "<video> elements must have a <track kind=\"captions\">",
 		"start": {
 			"column": 0,
 			"line": 6
diff --git a/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/input.svelte b/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/input.svelte
index 3c7d6aeb12..613b80e6d9 100644
--- a/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/input.svelte
@@ -7,15 +7,15 @@
 	};
 </script>
 
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:mouseover={() => void 0}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:mouseover={() => void 0} on:focus={() => void 0}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:mouseover={() => void 0} {...otherProps}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:mouseout={() => void 0}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:mouseout={() => void 0} on:blur={() => void 0}></div>
-<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:mouseout={() => void 0} {...otherProps}></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/warnings.json b/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/warnings.json
index 42aeab3fde..574b019e0f 100644
--- a/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-mouse-events-have-key-events/warnings.json
@@ -1,47 +1,47 @@
 [
 	{
-		"code": "a11y-mouse-events-have-key-events",
+		"code": "a11y_mouse_events_have_key_events",
 		"end": {
 			"column": 39,
 			"line": 11
 		},
-		"message": "A11y: 'mouseover' event must be accompanied by 'focus' event",
+		"message": "'mouseover' event must be accompanied by 'focus' event",
 		"start": {
 			"column": 0,
 			"line": 11
 		}
 	},
 	{
-		"code": "a11y-mouse-events-have-key-events",
+		"code": "a11y_mouse_events_have_key_events",
 		"end": {
 			"column": 55,
 			"line": 15
 		},
-		"message": "A11y: 'mouseover' event must be accompanied by 'focus' event",
+		"message": "'mouseover' event must be accompanied by 'focus' event",
 		"start": {
 			"column": 0,
 			"line": 15
 		}
 	},
 	{
-		"code": "a11y-mouse-events-have-key-events",
+		"code": "a11y_mouse_events_have_key_events",
 		"end": {
 			"column": 38,
 			"line": 17
 		},
-		"message": "A11y: 'mouseout' event must be accompanied by 'blur' event",
+		"message": "'mouseout' event must be accompanied by 'blur' event",
 		"start": {
 			"column": 0,
 			"line": 17
 		}
 	},
 	{
-		"code": "a11y-mouse-events-have-key-events",
+		"code": "a11y_mouse_events_have_key_events",
 		"end": {
 			"column": 54,
 			"line": 21
 		},
-		"message": "A11y: 'mouseout' event must be accompanied by 'blur' event",
+		"message": "'mouseout' event must be accompanied by 'blur' event",
 		"start": {
 			"column": 0,
 			"line": 21
diff --git a/packages/svelte/tests/validator/samples/a11y-no-abstract-roles/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-abstract-roles/warnings.json
index c17ae461f9..a7345a2834 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-abstract-roles/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-abstract-roles/warnings.json
@@ -1,143 +1,143 @@
 [
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 19,
 			"line": 1
 		},
-		"message": "A11y: Abstract role 'command' is forbidden",
+		"message": "Abstract role 'command' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 1
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 21,
 			"line": 2
 		},
-		"message": "A11y: Abstract role 'composite' is forbidden",
+		"message": "Abstract role 'composite' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 2
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 17,
 			"line": 3
 		},
-		"message": "A11y: Abstract role 'input' is forbidden",
+		"message": "Abstract role 'input' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 3
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 20,
 			"line": 4
 		},
-		"message": "A11y: Abstract role 'landmark' is forbidden",
+		"message": "Abstract role 'landmark' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 4
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 17,
 			"line": 5
 		},
-		"message": "A11y: Abstract role 'range' is forbidden",
+		"message": "Abstract role 'range' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 5
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 20,
 			"line": 6
 		},
-		"message": "A11y: Abstract role 'roletype' is forbidden",
+		"message": "Abstract role 'roletype' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 6
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 19,
 			"line": 7
 		},
-		"message": "A11y: Abstract role 'section' is forbidden",
+		"message": "Abstract role 'section' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 7
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 23,
 			"line": 8
 		},
-		"message": "A11y: Abstract role 'sectionhead' is forbidden",
+		"message": "Abstract role 'sectionhead' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 8
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 18,
 			"line": 9
 		},
-		"message": "A11y: Abstract role 'select' is forbidden",
+		"message": "Abstract role 'select' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 9
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 21,
 			"line": 10
 		},
-		"message": "A11y: Abstract role 'structure' is forbidden",
+		"message": "Abstract role 'structure' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 10
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 18,
 			"line": 11
 		},
-		"message": "A11y: Abstract role 'widget' is forbidden",
+		"message": "Abstract role 'widget' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 11
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 18,
 			"line": 12
 		},
-		"message": "A11y: Abstract role 'window' is forbidden",
+		"message": "Abstract role 'window' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 12
diff --git a/packages/svelte/tests/validator/samples/a11y-no-access-key/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-access-key/warnings.json
index 9e1226933b..fcbe3e9d26 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-access-key/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-access-key/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-accesskey",
-		"message": "A11y: Avoid using accesskey",
+		"code": "a11y_accesskey",
+		"message": "Avoid using accesskey",
 		"start": {
 			"line": 1,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-no-autofocus/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-autofocus/warnings.json
index 0b002be48e..4ed8462a70 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-autofocus/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-autofocus/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-autofocus",
-		"message": "A11y: Avoid using autofocus",
+		"code": "a11y_autofocus",
+		"message": "Avoid using autofocus",
 		"start": {
 			"line": 1,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json
index f2ba85fac0..1c4e362ec1 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-distracting-elements",
-		"message": "A11y: Avoid <marquee> elements",
+		"code": "a11y_distracting_elements",
+		"message": "Avoid <marquee> elements",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-distracting-elements",
-		"message": "A11y: Avoid <blink> elements",
+		"code": "a11y_distracting_elements",
+		"message": "Avoid <blink> elements",
 		"start": {
 			"line": 2,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
index 1f2f8eb991..2cdbde0b9a 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
@@ -1,707 +1,707 @@
 [
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 38,
 			"line": 2
 		},
-		"message": "A11y: <a> cannot have role 'article'",
+		"message": "<a> cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 2
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 37,
 			"line": 3
 		},
-		"message": "A11y: <a> cannot have role 'banner'",
+		"message": "<a> cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 3
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 44,
 			"line": 4
 		},
-		"message": "A11y: <a> cannot have role 'complementary'",
+		"message": "<a> cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 4
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 34,
 			"line": 5
 		},
-		"message": "A11y: <a> cannot have role 'img'",
+		"message": "<a> cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 5
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 39,
 			"line": 6
 		},
-		"message": "A11y: <a> cannot have role 'listitem'",
+		"message": "<a> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 6
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 35,
 			"line": 7
 		},
-		"message": "A11y: <a> cannot have role 'main'",
+		"message": "<a> cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 7
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 37,
 			"line": 8
 		},
-		"message": "A11y: <a> cannot have role 'region'",
+		"message": "<a> cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 8
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 38,
 			"line": 9
 		},
-		"message": "A11y: <a> cannot have role 'tooltip'",
+		"message": "<a> cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 9
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 38,
 			"line": 13
 		},
-		"message": "A11y: <button> cannot have role 'article'",
+		"message": "<button> cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 13
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 37,
 			"line": 14
 		},
-		"message": "A11y: <button> cannot have role 'banner'",
+		"message": "<button> cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 14
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 44,
 			"line": 15
 		},
-		"message": "A11y: <button> cannot have role 'complementary'",
+		"message": "<button> cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 15
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 34,
 			"line": 16
 		},
-		"message": "A11y: <button> cannot have role 'img'",
+		"message": "<button> cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 16
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 39,
 			"line": 17
 		},
-		"message": "A11y: <button> cannot have role 'listitem'",
+		"message": "<button> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 17
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 35,
 			"line": 18
 		},
-		"message": "A11y: <button> cannot have role 'main'",
+		"message": "<button> cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 18
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 37,
 			"line": 19
 		},
-		"message": "A11y: <button> cannot have role 'region'",
+		"message": "<button> cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 19
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 38,
 			"line": 20
 		},
-		"message": "A11y: <button> cannot have role 'tooltip'",
+		"message": "<button> cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 20
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 21
 		},
-		"message": "A11y: Redundant role 'button'",
+		"message": "Redundant role 'button'",
 		"start": {
 			"column": 8,
 			"line": 21
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 24,
 			"line": 24
 		},
-		"message": "A11y: <input> cannot have role 'article'",
+		"message": "<input> cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 24
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 23,
 			"line": 25
 		},
-		"message": "A11y: <input> cannot have role 'banner'",
+		"message": "<input> cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 25
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 30,
 			"line": 26
 		},
-		"message": "A11y: <input> cannot have role 'complementary'",
+		"message": "<input> cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 26
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 20,
 			"line": 27
 		},
-		"message": "A11y: <input> cannot have role 'img'",
+		"message": "<input> cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 27
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 25,
 			"line": 28
 		},
-		"message": "A11y: <input> cannot have role 'listitem'",
+		"message": "<input> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 28
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 21,
 			"line": 29
 		},
-		"message": "A11y: <input> cannot have role 'main'",
+		"message": "<input> cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 29
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 23,
 			"line": 30
 		},
-		"message": "A11y: <input> cannot have role 'region'",
+		"message": "<input> cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 30
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 24,
 			"line": 31
 		},
-		"message": "A11y: <input> cannot have role 'tooltip'",
+		"message": "<input> cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 31
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 32,
 			"line": 35
 		},
-		"message": "A11y: <select> cannot have role 'article'",
+		"message": "<select> cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 35
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 31,
 			"line": 36
 		},
-		"message": "A11y: <select> cannot have role 'banner'",
+		"message": "<select> cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 36
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 38,
 			"line": 37
 		},
-		"message": "A11y: <select> cannot have role 'complementary'",
+		"message": "<select> cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 37
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 28,
 			"line": 38
 		},
-		"message": "A11y: <select> cannot have role 'img'",
+		"message": "<select> cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 38
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 33,
 			"line": 39
 		},
-		"message": "A11y: <select> cannot have role 'listitem'",
+		"message": "<select> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 39
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 29,
 			"line": 40
 		},
-		"message": "A11y: <select> cannot have role 'main'",
+		"message": "<select> cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 40
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 31,
 			"line": 41
 		},
-		"message": "A11y: <select> cannot have role 'region'",
+		"message": "<select> cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 41
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 32,
 			"line": 42
 		},
-		"message": "A11y: <select> cannot have role 'tooltip'",
+		"message": "<select> cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 42
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 36,
 			"line": 46
 		},
-		"message": "A11y: <textarea> cannot have role 'article'",
+		"message": "<textarea> cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 46
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 35,
 			"line": 47
 		},
-		"message": "A11y: <textarea> cannot have role 'banner'",
+		"message": "<textarea> cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 47
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 42,
 			"line": 48
 		},
-		"message": "A11y: <textarea> cannot have role 'complementary'",
+		"message": "<textarea> cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 48
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 32,
 			"line": 49
 		},
-		"message": "A11y: <textarea> cannot have role 'img'",
+		"message": "<textarea> cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 49
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 37,
 			"line": 50
 		},
-		"message": "A11y: <textarea> cannot have role 'listitem'",
+		"message": "<textarea> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 50
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 33,
 			"line": 51
 		},
-		"message": "A11y: <textarea> cannot have role 'main'",
+		"message": "<textarea> cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 51
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 35,
 			"line": 52
 		},
-		"message": "A11y: <textarea> cannot have role 'region'",
+		"message": "<textarea> cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 52
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 36,
 			"line": 53
 		},
-		"message": "A11y: <textarea> cannot have role 'tooltip'",
+		"message": "<textarea> cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 53
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 19,
 			"line": 57
 		},
-		"message": "A11y: Abstract role 'command' is forbidden",
+		"message": "Abstract role 'command' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 57
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 21,
 			"line": 58
 		},
-		"message": "A11y: Abstract role 'composite' is forbidden",
+		"message": "Abstract role 'composite' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 58
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 17,
 			"line": 59
 		},
-		"message": "A11y: Abstract role 'input' is forbidden",
+		"message": "Abstract role 'input' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 59
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 20,
 			"line": 60
 		},
-		"message": "A11y: Abstract role 'landmark' is forbidden",
+		"message": "Abstract role 'landmark' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 60
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 17,
 			"line": 61
 		},
-		"message": "A11y: Abstract role 'range' is forbidden",
+		"message": "Abstract role 'range' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 61
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 20,
 			"line": 62
 		},
-		"message": "A11y: Abstract role 'roletype' is forbidden",
+		"message": "Abstract role 'roletype' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 62
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 19,
 			"line": 63
 		},
-		"message": "A11y: Abstract role 'section' is forbidden",
+		"message": "Abstract role 'section' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 63
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 23,
 			"line": 64
 		},
-		"message": "A11y: Abstract role 'sectionhead' is forbidden",
+		"message": "Abstract role 'sectionhead' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 64
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 18,
 			"line": 65
 		},
-		"message": "A11y: Abstract role 'select' is forbidden",
+		"message": "Abstract role 'select' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 65
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 21,
 			"line": 66
 		},
-		"message": "A11y: Abstract role 'structure' is forbidden",
+		"message": "Abstract role 'structure' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 66
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 18,
 			"line": 71
 		},
-		"message": "A11y: Abstract role 'widget' is forbidden",
+		"message": "Abstract role 'widget' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 71
 		}
 	},
 	{
-		"code": "a11y-no-abstract-role",
+		"code": "a11y_no_abstract_role",
 		"end": {
 			"column": 18,
 			"line": 72
 		},
-		"message": "A11y: Abstract role 'window' is forbidden",
+		"message": "Abstract role 'window' is forbidden",
 		"start": {
 			"column": 5,
 			"line": 72
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 37,
 			"line": 143
 		},
-		"message": "A11y: <menuitem> cannot have role 'listitem'",
+		"message": "<menuitem> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 143
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 45,
 			"line": 144
 		},
-		"message": "A11y: <option> cannot have role 'listitem'",
+		"message": "<option> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 144
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 45,
 			"line": 145
 		},
-		"message": "A11y: <select> cannot have role 'listitem'",
+		"message": "<select> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 145
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 49,
 			"line": 146
 		},
-		"message": "A11y: <textarea> cannot have role 'listitem'",
+		"message": "<textarea> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 146
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 25,
 			"line": 147
 		},
-		"message": "A11y: <tr> cannot have role 'listitem'",
+		"message": "<tr> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 147
 		}
 	},
 	{
-		"code": "a11y-no-interactive-element-to-noninteractive-role",
+		"code": "a11y_no_interactive_element_to_noninteractive_role",
 		"end": {
 			"column": 35,
 			"line": 148
 		},
-		"message": "A11y: <summary> cannot have role 'listitem'",
+		"message": "<summary> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 148
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
index ae1f6ebb09..df22c49b9f 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
@@ -1,59 +1,59 @@
 [
 	{
-		"code": "a11y-no-noninteractive-element-interactions",
+		"code": "a11y_no_noninteractive_element_interactions",
 		"end": {
 			"column": 51,
 			"line": 10
 		},
-		"message": "A11y: Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 10
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-interactions",
+		"code": "a11y_no_noninteractive_element_interactions",
 		"end": {
 			"column": 58,
 			"line": 11
 		},
-		"message": "A11y: Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 11
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-interactions",
+		"code": "a11y_no_noninteractive_element_interactions",
 		"end": {
 			"column": 50,
 			"line": 12
 		},
-		"message": "A11y: Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 12
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-interactions",
+		"code": "a11y_no_noninteractive_element_interactions",
 		"end": {
 			"column": 30,
 			"line": 13
 		},
-		"message": "A11y: Non-interactive element <p> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element <p> should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 13
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-interactions",
+		"code": "a11y_no_noninteractive_element_interactions",
 		"end": {
 			"column": 50,
 			"line": 14
 		},
-		"message": "A11y: Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 14
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
index 4dea7346b0..57eb3d9028 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <article> cannot have interactive role 'button'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <article> cannot have interactive role 'button'",
 		"start": {
 			"line": 2,
 			"column": 0
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <aside> cannot have interactive role 'checkbox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <aside> cannot have interactive role 'checkbox'",
 		"start": {
 			"line": 3,
 			"column": 0
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <blockquote> cannot have interactive role 'columnheader'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <blockquote> cannot have interactive role 'columnheader'",
 		"start": {
 			"line": 4,
 			"column": 0
@@ -36,8 +36,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <br> cannot have interactive role 'grid'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <br> cannot have interactive role 'grid'",
 		"start": {
 			"line": 5,
 			"column": 0
@@ -48,8 +48,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <caption> cannot have interactive role 'gridcell'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <caption> cannot have interactive role 'gridcell'",
 		"start": {
 			"line": 6,
 			"column": 0
@@ -60,8 +60,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <dd> cannot have interactive role 'link'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <dd> cannot have interactive role 'link'",
 		"start": {
 			"line": 7,
 			"column": 0
@@ -72,8 +72,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <details> cannot have interactive role 'listbox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <details> cannot have interactive role 'listbox'",
 		"start": {
 			"line": 8,
 			"column": 0
@@ -84,8 +84,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <dir> cannot have interactive role 'menu'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <dir> cannot have interactive role 'menu'",
 		"start": {
 			"line": 9,
 			"column": 0
@@ -96,8 +96,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <dl> cannot have interactive role 'menubar'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <dl> cannot have interactive role 'menubar'",
 		"start": {
 			"line": 10,
 			"column": 0
@@ -108,8 +108,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <dfn> cannot have interactive role 'menuitem'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <dfn> cannot have interactive role 'menuitem'",
 		"start": {
 			"line": 11,
 			"column": 0
@@ -120,8 +120,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <dt> cannot have interactive role 'menuitemcheckbox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <dt> cannot have interactive role 'menuitemcheckbox'",
 		"start": {
 			"line": 12,
 			"column": 0
@@ -132,8 +132,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <fieldset> cannot have interactive role 'menuitemradio'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <fieldset> cannot have interactive role 'menuitemradio'",
 		"start": {
 			"line": 13,
 			"column": 0
@@ -144,8 +144,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <figcaption> cannot have interactive role 'menuitemradio'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <figcaption> cannot have interactive role 'menuitemradio'",
 		"start": {
 			"line": 15,
 			"column": 1
@@ -156,8 +156,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <figure> cannot have interactive role 'option'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <figure> cannot have interactive role 'option'",
 		"start": {
 			"line": 17,
 			"column": 0
@@ -168,8 +168,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <footer> cannot have interactive role 'radio'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <footer> cannot have interactive role 'radio'",
 		"start": {
 			"line": 18,
 			"column": 0
@@ -180,8 +180,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <form> cannot have interactive role 'radiogroup'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <form> cannot have interactive role 'radiogroup'",
 		"start": {
 			"line": 19,
 			"column": 0
@@ -192,8 +192,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <h1> cannot have interactive role 'rowheader'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <h1> cannot have interactive role 'rowheader'",
 		"start": {
 			"line": 20,
 			"column": 0
@@ -204,8 +204,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <h2> cannot have interactive role 'scrollbar'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <h2> cannot have interactive role 'scrollbar'",
 		"start": {
 			"line": 21,
 			"column": 0
@@ -216,8 +216,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <h3> cannot have interactive role 'searchbox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <h3> cannot have interactive role 'searchbox'",
 		"start": {
 			"line": 22,
 			"column": 0
@@ -228,8 +228,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <h4> cannot have interactive role 'slider'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <h4> cannot have interactive role 'slider'",
 		"start": {
 			"line": 23,
 			"column": 0
@@ -240,8 +240,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <h5> cannot have interactive role 'spinbutton'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <h5> cannot have interactive role 'spinbutton'",
 		"start": {
 			"line": 24,
 			"column": 0
@@ -252,8 +252,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <h6> cannot have interactive role 'switch'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <h6> cannot have interactive role 'switch'",
 		"start": {
 			"line": 25,
 			"column": 0
@@ -264,8 +264,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <hr> cannot have interactive role 'tab'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <hr> cannot have interactive role 'tab'",
 		"start": {
 			"line": 26,
 			"column": 0
@@ -276,8 +276,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <img> cannot have interactive role 'tabpanel'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <img> cannot have interactive role 'tabpanel'",
 		"start": {
 			"line": 27,
 			"column": 0
@@ -288,8 +288,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <label> cannot have interactive role 'textbox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <label> cannot have interactive role 'textbox'",
 		"start": {
 			"line": 28,
 			"column": 0
@@ -300,8 +300,8 @@
 		}
 	},
 	{
-		"code": "a11y-label-has-associated-control",
-		"message": "A11y: A form label must be associated with a control.",
+		"code": "a11y_label_has_associated_control",
+		"message": "A form label must be associated with a control.",
 		"start": {
 			"line": 28,
 			"column": 0
@@ -312,8 +312,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <legend> cannot have interactive role 'toolbar'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <legend> cannot have interactive role 'toolbar'",
 		"start": {
 			"line": 29,
 			"column": 0
@@ -324,8 +324,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <li> cannot have interactive role 'tree'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <li> cannot have interactive role 'tree'",
 		"start": {
 			"line": 30,
 			"column": 0
@@ -336,8 +336,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <main> cannot have interactive role 'treegrid'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <main> cannot have interactive role 'treegrid'",
 		"start": {
 			"line": 31,
 			"column": 0
@@ -348,8 +348,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <mark> cannot have interactive role 'treeitem'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <mark> cannot have interactive role 'treeitem'",
 		"start": {
 			"line": 32,
 			"column": 0
@@ -360,8 +360,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <marquee> cannot have interactive role 'doc-backlink'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <marquee> cannot have interactive role 'doc-backlink'",
 		"start": {
 			"line": 33,
 			"column": 0
@@ -372,8 +372,8 @@
 		}
 	},
 	{
-		"code": "a11y-distracting-elements",
-		"message": "A11y: Avoid <marquee> elements",
+		"code": "a11y_distracting_elements",
+		"message": "Avoid <marquee> elements",
 		"start": {
 			"line": 33,
 			"column": 0
@@ -384,8 +384,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <menu> cannot have interactive role 'doc-biblioref'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <menu> cannot have interactive role 'doc-biblioref'",
 		"start": {
 			"line": 34,
 			"column": 0
@@ -396,8 +396,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <meter> cannot have interactive role 'doc-glossref'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <meter> cannot have interactive role 'doc-glossref'",
 		"start": {
 			"line": 35,
 			"column": 0
@@ -408,8 +408,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <nav> cannot have interactive role 'doc-noteref'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <nav> cannot have interactive role 'doc-noteref'",
 		"start": {
 			"line": 36,
 			"column": 0
@@ -420,8 +420,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <ol> cannot have interactive role 'button'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <ol> cannot have interactive role 'button'",
 		"start": {
 			"line": 37,
 			"column": 0
@@ -432,8 +432,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <optgroup> cannot have interactive role 'treeitem'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <optgroup> cannot have interactive role 'treeitem'",
 		"start": {
 			"line": 38,
 			"column": 0
@@ -444,8 +444,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <output> cannot have interactive role 'treegrid'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <output> cannot have interactive role 'treegrid'",
 		"start": {
 			"line": 39,
 			"column": 0
@@ -456,8 +456,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <p> cannot have interactive role 'columnheader'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <p> cannot have interactive role 'columnheader'",
 		"start": {
 			"line": 40,
 			"column": 0
@@ -468,8 +468,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <pre> cannot have interactive role 'tree'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <pre> cannot have interactive role 'tree'",
 		"start": {
 			"line": 41,
 			"column": 0
@@ -480,8 +480,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <progress> cannot have interactive role 'combobox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <progress> cannot have interactive role 'combobox'",
 		"start": {
 			"line": 42,
 			"column": 0
@@ -492,8 +492,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <ruby> cannot have interactive role 'toolbar'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <ruby> cannot have interactive role 'toolbar'",
 		"start": {
 			"line": 43,
 			"column": 0
@@ -504,8 +504,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <section> cannot have interactive role 'radio'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <section> cannot have interactive role 'radio'",
 		"start": {
 			"line": 44,
 			"column": 0
@@ -516,8 +516,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <table> cannot have interactive role 'menu'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <table> cannot have interactive role 'menu'",
 		"start": {
 			"line": 45,
 			"column": 0
@@ -528,8 +528,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <tbody> cannot have interactive role 'searchbox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <tbody> cannot have interactive role 'searchbox'",
 		"start": {
 			"line": 46,
 			"column": 0
@@ -540,8 +540,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <tfoot> cannot have interactive role 'listbox'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <tfoot> cannot have interactive role 'listbox'",
 		"start": {
 			"line": 47,
 			"column": 0
@@ -552,8 +552,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <thead> cannot have interactive role 'slider'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <thead> cannot have interactive role 'slider'",
 		"start": {
 			"line": 48,
 			"column": 0
@@ -564,8 +564,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <time> cannot have interactive role 'doc-backlink'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <time> cannot have interactive role 'doc-backlink'",
 		"start": {
 			"line": 49,
 			"column": 0
@@ -576,8 +576,8 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-to-interactive-role",
-		"message": "A11y: Non-interactive element <ul> cannot have interactive role 'spinbutton'",
+		"code": "a11y_no_noninteractive_element_to_interactive_role",
+		"message": "Non-interactive element <ul> cannot have interactive role 'spinbutton'",
 		"start": {
 			"line": 50,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-tabindex/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
index 14c48b00b2..1852376a76 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
@@ -1,47 +1,47 @@
 [
 	{
-		"code": "a11y-no-noninteractive-tabindex",
+		"code": "a11y_no_noninteractive_tabindex",
 		"end": {
 			"column": 24,
 			"line": 13
 		},
-		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
+		"message": "noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
 			"line": 13
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-tabindex",
+		"code": "a11y_no_noninteractive_tabindex",
 		"end": {
 			"column": 39,
 			"line": 14
 		},
-		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
+		"message": "noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
 			"line": 14
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-tabindex",
+		"code": "a11y_no_noninteractive_tabindex",
 		"end": {
 			"column": 32,
 			"line": 15
 		},
-		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
+		"message": "noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
 			"line": 15
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-tabindex",
+		"code": "a11y_no_noninteractive_tabindex",
 		"end": {
 			"column": 34,
 			"line": 16
 		},
-		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
+		"message": "noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
 			"line": 16
diff --git a/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/input.svelte b/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/input.svelte
index d43f7322c0..8b6da3b8c8 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/input.svelte
@@ -44,5 +44,5 @@
 <footer role="contentinfo"></footer>
 
 <!-- Allowed -->
-<!-- svelte-ignore a11y-no-noninteractive-element-to-interactive-role -->
+<!-- svelte-ignore a11y_no_noninteractive_element_to_interactive_role -->
 <menu role="menu"></menu>
diff --git a/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/warnings.json
index 12cdc6f8d5..861f000aef 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-redundant-roles/warnings.json
@@ -1,467 +1,467 @@
 [
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 23,
 			"line": 1
 		},
-		"message": "A11y: Redundant role 'link'",
+		"message": "Redundant role 'link'",
 		"start": {
 			"column": 12,
 			"line": 1
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 23,
 			"line": 2
 		},
-		"message": "A11y: Redundant role 'article'",
+		"message": "Redundant role 'article'",
 		"start": {
 			"column": 9,
 			"line": 2
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 27,
 			"line": 3
 		},
-		"message": "A11y: Redundant role 'complementary'",
+		"message": "Redundant role 'complementary'",
 		"start": {
 			"column": 7,
 			"line": 3
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 4
 		},
-		"message": "A11y: Redundant role 'document'",
+		"message": "Redundant role 'document'",
 		"start": {
 			"column": 6,
 			"line": 4
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 5
 		},
-		"message": "A11y: Redundant role 'button'",
+		"message": "Redundant role 'button'",
 		"start": {
 			"column": 8,
 			"line": 5
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 24,
 			"line": 6
 		},
-		"message": "A11y: Redundant role 'listbox'",
+		"message": "Redundant role 'listbox'",
 		"start": {
 			"column": 10,
 			"line": 6
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 7
 		},
-		"message": "A11y: Redundant role 'definition'",
+		"message": "Redundant role 'definition'",
 		"start": {
 			"column": 4,
 			"line": 7
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 16,
 			"line": 8
 		},
-		"message": "A11y: Redundant role 'term'",
+		"message": "Redundant role 'term'",
 		"start": {
 			"column": 5,
 			"line": 8
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 9
 		},
-		"message": "A11y: Redundant role 'group'",
+		"message": "Redundant role 'group'",
 		"start": {
 			"column": 9,
 			"line": 9
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 10
 		},
-		"message": "A11y: Redundant role 'dialog'",
+		"message": "Redundant role 'dialog'",
 		"start": {
 			"column": 8,
 			"line": 10
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 15,
 			"line": 11
 		},
-		"message": "A11y: Redundant role 'term'",
+		"message": "Redundant role 'term'",
 		"start": {
 			"column": 4,
 			"line": 11
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 12
 		},
-		"message": "A11y: Redundant role 'group'",
+		"message": "Redundant role 'group'",
 		"start": {
 			"column": 10,
 			"line": 12
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 13
 		},
-		"message": "A11y: Redundant role 'figure'",
+		"message": "Redundant role 'figure'",
 		"start": {
 			"column": 8,
 			"line": 13
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 17,
 			"line": 14
 		},
-		"message": "A11y: Redundant role 'form'",
+		"message": "Redundant role 'form'",
 		"start": {
 			"column": 6,
 			"line": 14
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 18,
 			"line": 15
 		},
-		"message": "A11y: Redundant role 'heading'",
+		"message": "Redundant role 'heading'",
 		"start": {
 			"column": 4,
 			"line": 15
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 18,
 			"line": 16
 		},
-		"message": "A11y: Redundant role 'heading'",
+		"message": "Redundant role 'heading'",
 		"start": {
 			"column": 4,
 			"line": 16
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 18,
 			"line": 17
 		},
-		"message": "A11y: Redundant role 'heading'",
+		"message": "Redundant role 'heading'",
 		"start": {
 			"column": 4,
 			"line": 17
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 18,
 			"line": 18
 		},
-		"message": "A11y: Redundant role 'heading'",
+		"message": "Redundant role 'heading'",
 		"start": {
 			"column": 4,
 			"line": 18
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 18,
 			"line": 19
 		},
-		"message": "A11y: Redundant role 'heading'",
+		"message": "Redundant role 'heading'",
 		"start": {
 			"column": 4,
 			"line": 19
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 18,
 			"line": 20
 		},
-		"message": "A11y: Redundant role 'heading'",
+		"message": "Redundant role 'heading'",
 		"start": {
 			"column": 4,
 			"line": 20
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 20,
 			"line": 21
 		},
-		"message": "A11y: Redundant role 'separator'",
+		"message": "Redundant role 'separator'",
 		"start": {
 			"column": 4,
 			"line": 21
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 17,
 			"line": 23
 		},
-		"message": "A11y: Redundant role 'link'",
+		"message": "Redundant role 'link'",
 		"start": {
 			"column": 6,
 			"line": 23
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 17,
 			"line": 24
 		},
-		"message": "A11y: Redundant role 'main'",
+		"message": "Redundant role 'main'",
 		"start": {
 			"column": 6,
 			"line": 24
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 17,
 			"line": 25
 		},
-		"message": "A11y: Redundant role 'list'",
+		"message": "Redundant role 'list'",
 		"start": {
 			"column": 6,
 			"line": 25
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 26
 		},
-		"message": "A11y: Redundant role 'navigation'",
+		"message": "Redundant role 'navigation'",
 		"start": {
 			"column": 5,
 			"line": 26
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 28
 		},
-		"message": "A11y: Redundant role 'group'",
+		"message": "Redundant role 'group'",
 		"start": {
 			"column": 10,
 			"line": 28
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 29
 		},
-		"message": "A11y: Redundant role 'option'",
+		"message": "Redundant role 'option'",
 		"start": {
 			"column": 8,
 			"line": 29
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 30
 		},
-		"message": "A11y: Redundant role 'status'",
+		"message": "Redundant role 'status'",
 		"start": {
 			"column": 8,
 			"line": 30
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 28,
 			"line": 31
 		},
-		"message": "A11y: Redundant role 'progressbar'",
+		"message": "Redundant role 'progressbar'",
 		"start": {
 			"column": 10,
 			"line": 31
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 32
 		},
-		"message": "A11y: Redundant role 'region'",
+		"message": "Redundant role 'region'",
 		"start": {
 			"column": 9,
 			"line": 32
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 33
 		},
-		"message": "A11y: Redundant role 'button'",
+		"message": "Redundant role 'button'",
 		"start": {
 			"column": 9,
 			"line": 33
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 19,
 			"line": 34
 		},
-		"message": "A11y: Redundant role 'table'",
+		"message": "Redundant role 'table'",
 		"start": {
 			"column": 7,
 			"line": 34
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 35
 		},
-		"message": "A11y: Redundant role 'rowgroup'",
+		"message": "Redundant role 'rowgroup'",
 		"start": {
 			"column": 7,
 			"line": 35
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 24,
 			"line": 36
 		},
-		"message": "A11y: Redundant role 'textbox'",
+		"message": "Redundant role 'textbox'",
 		"start": {
 			"column": 10,
 			"line": 36
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 37
 		},
-		"message": "A11y: Redundant role 'rowgroup'",
+		"message": "Redundant role 'rowgroup'",
 		"start": {
 			"column": 7,
 			"line": 37
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 22,
 			"line": 38
 		},
-		"message": "A11y: Redundant role 'rowgroup'",
+		"message": "Redundant role 'rowgroup'",
 		"start": {
 			"column": 7,
 			"line": 38
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 14,
 			"line": 39
 		},
-		"message": "A11y: Redundant role 'row'",
+		"message": "Redundant role 'row'",
 		"start": {
 			"column": 4,
 			"line": 39
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 21,
 			"line": 43
 		},
-		"message": "A11y: Redundant role 'banner'",
+		"message": "Redundant role 'banner'",
 		"start": {
 			"column": 8,
 			"line": 43
 		}
 	},
 	{
-		"code": "a11y-no-redundant-roles",
+		"code": "a11y_no_redundant_roles",
 		"end": {
 			"column": 26,
 			"line": 44
 		},
-		"message": "A11y: Redundant role 'contentinfo'",
+		"message": "Redundant role 'contentinfo'",
 		"start": {
 			"column": 8,
 			"line": 44
diff --git a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte
index f232f6b0fe..44d8b8beb1 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte
@@ -4,16 +4,16 @@
 
 <!-- valid -->
 <button on:click={() => {}}></button>
-<!-- svelte-ignore a11y-interactive-supports-focus -->
+<!-- svelte-ignore a11y_interactive_supports_focus -->
 <div on:keydown={() => {}} role="button"></div>
 <input type="text" on:click={() => {}} />
 <div on:copy={() => {}}></div>
 <a href="/foo" on:click={() => {}}>link</a>
 <div role={dynamicRole} on:click={() => {}}></div>
-<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
+<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
 <footer on:keydown={() => {}}></footer>
 
 <!-- invalid -->
 <div on:keydown={() => {}}></div>
-<!-- svelte-ignore a11y-missing-attribute -->
+<!-- svelte-ignore a11y_missing_attribute -->
 <a on:mousedown={() => {}} on:mouseup={() => {}} on:copy={() => {}}>link</a>
diff --git a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
index f8b982a177..93602ff618 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
@@ -1,23 +1,23 @@
 [
 	{
-		"code": "a11y-no-static-element-interactions",
+		"code": "a11y_no_static_element_interactions",
 		"end": {
 			"column": 33,
 			"line": 17
 		},
-		"message": "A11y: <div> with keydown handler must have an ARIA role",
+		"message": "<div> with a keydown handler must have an ARIA role",
 		"start": {
 			"column": 0,
 			"line": 17
 		}
 	},
 	{
-		"code": "a11y-no-static-element-interactions",
+		"code": "a11y_no_static_element_interactions",
 		"end": {
 			"column": 76,
 			"line": 19
 		},
-		"message": "A11y: <a> with mousedown, mouseup handlers must have an ARIA role",
+		"message": "<a> with a mousedown or mouseup handler must have an ARIA role",
 		"start": {
 			"column": 0,
 			"line": 19
diff --git a/packages/svelte/tests/validator/samples/a11y-not-on-components/warnings.json b/packages/svelte/tests/validator/samples/a11y-not-on-components/warnings.json
index d79141b22f..07ebb73776 100644
--- a/packages/svelte/tests/validator/samples/a11y-not-on-components/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-not-on-components/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-autofocus",
-		"message": "A11y: Avoid using autofocus",
+		"code": "a11y_autofocus",
+		"message": "Avoid using autofocus",
 		"start": {
 			"column": 8,
 			"line": 6
diff --git a/packages/svelte/tests/validator/samples/a11y-role-has-required-aria-props/warnings.json b/packages/svelte/tests/validator/samples/a11y-role-has-required-aria-props/warnings.json
index 17ecda6c1c..732187a6e2 100644
--- a/packages/svelte/tests/validator/samples/a11y-role-has-required-aria-props/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-role-has-required-aria-props/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-role-has-required-aria-props",
-		"message": "A11y: Elements with the ARIA role \"heading\" must have the following attributes defined: \"aria-level\"",
+		"code": "a11y_role_has_required_aria_props",
+		"message": "Elements with the ARIA role \"heading\" must have the following attributes defined: \"aria-level\"",
 		"start": {
 			"line": 1,
 			"column": 5
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "a11y-role-has-required-aria-props",
-		"message": "A11y: Elements with the ARIA role \"checkbox\" must have the following attributes defined: \"aria-checked\"",
+		"code": "a11y_role_has_required_aria_props",
+		"message": "Elements with the ARIA role \"checkbox\" must have the following attributes defined: \"aria-checked\"",
 		"start": {
 			"line": 2,
 			"column": 6
@@ -24,8 +24,8 @@
 		}
 	},
 	{
-		"code": "a11y-role-has-required-aria-props",
-		"message": "A11y: Elements with the ARIA role \"meter\" must have the following attributes defined: \"aria-valuenow\"",
+		"code": "a11y_role_has_required_aria_props",
+		"message": "Elements with the ARIA role \"meter\" must have the following attributes defined: \"aria-valuenow\"",
 		"start": {
 			"line": 3,
 			"column": 5
@@ -36,8 +36,8 @@
 		}
 	},
 	{
-		"code": "a11y-role-has-required-aria-props",
-		"message": "A11y: Elements with the ARIA role \"scrollbar\" must have the following attributes defined: \"aria-controls\", \"aria-valuenow\"",
+		"code": "a11y_role_has_required_aria_props",
+		"message": "Elements with the ARIA role \"scrollbar\" must have the following attributes defined: \"aria-controls\" and \"aria-valuenow\"",
 		"start": {
 			"column": 5,
 			"line": 4
diff --git a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
index 4e26ae572a..176f15711b 100644
--- a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
@@ -1,2147 +1,2147 @@
 [
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 19,
 			"line": 2
 		},
-		"message": "A11y: The attribute 'aria-setsize' is not supported by the role 'link'. This role is implicit on the element <a>.",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'link'. This role is implicit on the element <a>",
 		"start": {
 			"column": 3,
 			"line": 2
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 18,
 			"line": 3
 		},
-		"message": "A11y: The attribute 'aria-pressed' is not supported by the role 'link'. This role is implicit on the element <area>.",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'link'. This role is implicit on the element <area>",
 		"start": {
 			"column": 6,
 			"line": 3
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 35,
 			"line": 4
 		},
-		"message": "A11y: The attribute 'aria-autocomplete' is not supported by the role 'article'. This role is implicit on the element <article>.",
+		"message": "The attribute 'aria-autocomplete' is not supported by the role 'article'. This role is implicit on the element <article>",
 		"start": {
 			"column": 9,
 			"line": 4
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 17,
 			"line": 5
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'complementary'. This role is implicit on the element <aside>.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'complementary'. This role is implicit on the element <aside>",
 		"start": {
 			"column": 7,
 			"line": 5
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 18,
 			"line": 6
 		},
-		"message": "A11y: The attribute 'aria-invalid' is not supported by the role 'document'. This role is implicit on the element <body>.",
+		"message": "The attribute 'aria-invalid' is not supported by the role 'document'. This role is implicit on the element <body>",
 		"start": {
 			"column": 6,
 			"line": 6
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 25,
 			"line": 7
 		},
-		"message": "A11y: The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <button>.",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <button>",
 		"start": {
 			"column": 8,
 			"line": 7
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 27,
 			"line": 8
 		},
-		"message": "A11y: The attribute 'aria-valuenow' is not supported by the role 'listbox'. This role is implicit on the element <datalist>.",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'listbox'. This role is implicit on the element <datalist>",
 		"start": {
 			"column": 10,
 			"line": 8
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 21,
 			"line": 9
 		},
-		"message": "A11y: The attribute 'aria-rowindex' is not supported by the role 'definition'. This role is implicit on the element <dd>.",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'definition'. This role is implicit on the element <dd>",
 		"start": {
 			"column": 4,
 			"line": 9
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 22,
 			"line": 10
 		},
-		"message": "A11y: The attribute 'aria-colcount' is not supported by the role 'term'. This role is implicit on the element <dfn>.",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'term'. This role is implicit on the element <dfn>",
 		"start": {
 			"column": 5,
 			"line": 10
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 25,
 			"line": 11
 		},
-		"message": "A11y: The attribute 'aria-posinset' is not supported by the role 'dialog'. This role is implicit on the element <dialog>.",
+		"message": "The attribute 'aria-posinset' is not supported by the role 'dialog'. This role is implicit on the element <dialog>",
 		"start": {
 			"column": 8,
 			"line": 11
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 37,
 			"line": 12
 		},
-		"message": "A11y: The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <details>.",
+		"message": "The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <details>",
 		"start": {
 			"column": 9,
 			"line": 12
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 21,
 			"line": 13
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'term'. This role is implicit on the element <dt>.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'term'. This role is implicit on the element <dt>",
 		"start": {
 			"column": 4,
 			"line": 13
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 38,
 			"line": 14
 		},
-		"message": "A11y: The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <fieldset>.",
+		"message": "The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <fieldset>",
 		"start": {
 			"column": 10,
 			"line": 14
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 19,
 			"line": 15
 		},
-		"message": "A11y: The attribute 'aria-disabled' is not supported by the role 'form'. This role is implicit on the element <form>.",
+		"message": "The attribute 'aria-disabled' is not supported by the role 'form'. This role is implicit on the element <form>",
 		"start": {
 			"column": 6,
 			"line": 15
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 17,
 			"line": 16
 		},
-		"message": "A11y: The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h1>.",
+		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h1>",
 		"start": {
 			"column": 4,
 			"line": 16
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 17,
 			"line": 17
 		},
-		"message": "A11y: The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h2>.",
+		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h2>",
 		"start": {
 			"column": 4,
 			"line": 17
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 17,
 			"line": 18
 		},
-		"message": "A11y: The attribute 'aria-expanded' is not supported by the role 'heading'. This role is implicit on the element <h3>.",
+		"message": "The attribute 'aria-expanded' is not supported by the role 'heading'. This role is implicit on the element <h3>",
 		"start": {
 			"column": 4,
 			"line": 18
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 21,
 			"line": 19
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h4>.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h4>",
 		"start": {
 			"column": 4,
 			"line": 19
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 17,
 			"line": 20
 		},
-		"message": "A11y: The attribute 'aria-readonly' is not supported by the role 'heading'. This role is implicit on the element <h5>.",
+		"message": "The attribute 'aria-readonly' is not supported by the role 'heading'. This role is implicit on the element <h5>",
 		"start": {
 			"column": 4,
 			"line": 20
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 21,
 			"line": 21
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h6>.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h6>",
 		"start": {
 			"column": 4,
 			"line": 21
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 17,
 			"line": 22
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'separator'. This role is implicit on the element <hr>.",
+		"message": "The attribute 'aria-required' is not supported by the role 'separator'. This role is implicit on the element <hr>",
 		"start": {
 			"column": 4,
 			"line": 22
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 19,
 			"line": 23
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'img'. This role is implicit on the element <img>.",
+		"message": "The attribute 'aria-level' is not supported by the role 'img'. This role is implicit on the element <img>",
 		"start": {
 			"column": 5,
 			"line": 23
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 17,
 			"line": 24
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'listitem'. This role is implicit on the element <li>.",
+		"message": "The attribute 'aria-required' is not supported by the role 'listitem'. This role is implicit on the element <li>",
 		"start": {
 			"column": 4,
 			"line": 24
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 23,
 			"line": 25
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'link'. This role is implicit on the element <link>.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'link'. This role is implicit on the element <link>",
 		"start": {
 			"column": 6,
 			"line": 25
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 23,
 			"line": 26
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'list'. This role is implicit on the element <menu>.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'list'. This role is implicit on the element <menu>",
 		"start": {
 			"column": 6,
 			"line": 26
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 23,
 			"line": 27
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'progressbar'. This role is implicit on the element <meter>.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'progressbar'. This role is implicit on the element <meter>",
 		"start": {
 			"column": 7,
 			"line": 27
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 22,
 			"line": 28
 		},
-		"message": "A11y: The attribute 'aria-valuetext' is not supported by the role 'navigation'. This role is implicit on the element <nav>.",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'navigation'. This role is implicit on the element <nav>",
 		"start": {
 			"column": 5,
 			"line": 28
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 20,
 			"line": 29
 		},
-		"message": "A11y: The attribute 'aria-sort' is not supported by the role 'list'. This role is implicit on the element <ol>.",
+		"message": "The attribute 'aria-sort' is not supported by the role 'list'. This role is implicit on the element <ol>",
 		"start": {
 			"column": 4,
 			"line": 29
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 20,
 			"line": 30
 		},
-		"message": "A11y: The attribute 'aria-invalid' is not supported by the role 'option'. This role is implicit on the element <option>.",
+		"message": "The attribute 'aria-invalid' is not supported by the role 'option'. This role is implicit on the element <option>",
 		"start": {
 			"column": 8,
 			"line": 30
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 26,
 			"line": 31
 		},
-		"message": "A11y: The attribute 'aria-sort' is not supported by the role 'group'. This role is implicit on the element <optgroup>.",
+		"message": "The attribute 'aria-sort' is not supported by the role 'group'. This role is implicit on the element <optgroup>",
 		"start": {
 			"column": 10,
 			"line": 31
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 22,
 			"line": 32
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'status'. This role is implicit on the element <output>.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'status'. This role is implicit on the element <output>",
 		"start": {
 			"column": 8,
 			"line": 32
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 27,
 			"line": 33
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'progressbar'. This role is implicit on the element <progress>.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'progressbar'. This role is implicit on the element <progress>",
 		"start": {
 			"column": 10,
 			"line": 33
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 21,
 			"line": 34
 		},
-		"message": "A11y: The attribute 'aria-invalid' is not supported by the role 'region'. This role is implicit on the element <section>.",
+		"message": "The attribute 'aria-invalid' is not supported by the role 'region'. This role is implicit on the element <section>",
 		"start": {
 			"column": 9,
 			"line": 34
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 26,
 			"line": 35
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'button'. This role is implicit on the element <summary>.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'button'. This role is implicit on the element <summary>",
 		"start": {
 			"column": 9,
 			"line": 35
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 23,
 			"line": 36
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'rowgroup'. This role is implicit on the element <tbody>.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'rowgroup'. This role is implicit on the element <tbody>",
 		"start": {
 			"column": 7,
 			"line": 36
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 27,
 			"line": 37
 		},
-		"message": "A11y: The attribute 'aria-valuenow' is not supported by the role 'textbox'. This role is implicit on the element <textarea>.",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'textbox'. This role is implicit on the element <textarea>",
 		"start": {
 			"column": 10,
 			"line": 37
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 20,
 			"line": 38
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'rowgroup'. This role is implicit on the element <tfoot>.",
+		"message": "The attribute 'aria-required' is not supported by the role 'rowgroup'. This role is implicit on the element <tfoot>",
 		"start": {
 			"column": 7,
 			"line": 38
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 24,
 			"line": 39
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'rowgroup'. This role is implicit on the element <thead>.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'rowgroup'. This role is implicit on the element <thead>",
 		"start": {
 			"column": 7,
 			"line": 39
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 16,
 			"line": 40
 		},
-		"message": "A11y: The attribute 'aria-pressed' is not supported by the role 'row'. This role is implicit on the element <tr>.",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'row'. This role is implicit on the element <tr>",
 		"start": {
 			"column": 4,
 			"line": 40
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 24,
 			"line": 41
 		},
-		"message": "A11y: The attribute 'aria-multiselectable' is not supported by the role 'list'. This role is implicit on the element <ul>.",
+		"message": "The attribute 'aria-multiselectable' is not supported by the role 'list'. This role is implicit on the element <ul>",
 		"start": {
 			"column": 4,
 			"line": 41
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 43
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'alert'.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'alert'",
 		"start": {
 			"column": 18,
 			"line": 43
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 50,
 			"line": 44
 		},
-		"message": "A11y: The attribute 'aria-autocomplete' is not supported by the role 'alertdialog'.",
+		"message": "The attribute 'aria-autocomplete' is not supported by the role 'alertdialog'",
 		"start": {
 			"column": 24,
 			"line": 44
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 45
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'application'.",
+		"message": "The attribute 'aria-required' is not supported by the role 'application'",
 		"start": {
 			"column": 24,
 			"line": 45
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 46
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'article'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'article'",
 		"start": {
 			"column": 20,
 			"line": 46
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 45,
 			"line": 47
 		},
-		"message": "A11y: The attribute 'aria-autocomplete' is not supported by the role 'banner'.",
+		"message": "The attribute 'aria-autocomplete' is not supported by the role 'banner'",
 		"start": {
 			"column": 19,
 			"line": 47
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 40,
 			"line": 48
 		},
-		"message": "A11y: The attribute 'aria-valuetext' is not supported by the role 'blockquote'.",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'blockquote'",
 		"start": {
 			"column": 23,
 			"line": 48
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 35,
 			"line": 49
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'button'.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'button'",
 		"start": {
 			"column": 19,
 			"line": 49
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 50
 		},
-		"message": "A11y: The attribute 'aria-setsize' is not supported by the role 'caption'.",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'caption'",
 		"start": {
 			"column": 20,
 			"line": 50
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 31,
 			"line": 51
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'cell'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'cell'",
 		"start": {
 			"column": 17,
 			"line": 51
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 35,
 			"line": 52
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'checkbox'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'checkbox'",
 		"start": {
 			"column": 21,
 			"line": 52
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 29,
 			"line": 53
 		},
-		"message": "A11y: The attribute 'aria-invalid' is not supported by the role 'code'.",
+		"message": "The attribute 'aria-invalid' is not supported by the role 'code'",
 		"start": {
 			"column": 17,
 			"line": 53
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 54
 		},
-		"message": "A11y: The attribute 'aria-colcount' is not supported by the role 'columnheader'.",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'columnheader'",
 		"start": {
 			"column": 25,
 			"line": 54
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 55
 		},
-		"message": "A11y: The attribute 'aria-multiselectable' is not supported by the role 'combobox'.",
+		"message": "The attribute 'aria-multiselectable' is not supported by the role 'combobox'",
 		"start": {
 			"column": 21,
 			"line": 55
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 39,
 			"line": 56
 		},
-		"message": "A11y: The attribute 'aria-readonly' is not supported by the role 'complementary'.",
+		"message": "The attribute 'aria-readonly' is not supported by the role 'complementary'",
 		"start": {
 			"column": 26,
 			"line": 56
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 57
 		},
-		"message": "A11y: The attribute 'aria-valuetext' is not supported by the role 'contentinfo'.",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'contentinfo'",
 		"start": {
 			"column": 24,
 			"line": 57
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 58
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'definition'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'definition'",
 		"start": {
 			"column": 23,
 			"line": 58
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 59
 		},
-		"message": "A11y: The attribute 'aria-expanded' is not supported by the role 'deletion'.",
+		"message": "The attribute 'aria-expanded' is not supported by the role 'deletion'",
 		"start": {
 			"column": 21,
 			"line": 59
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 33,
 			"line": 60
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'dialog'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'dialog'",
 		"start": {
 			"column": 19,
 			"line": 60
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 39,
 			"line": 61
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'directory'.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'directory'",
 		"start": {
 			"column": 22,
 			"line": 61
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 38,
 			"line": 62
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'document'.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'document'",
 		"start": {
 			"column": 21,
 			"line": 62
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 38,
 			"line": 63
 		},
-		"message": "A11y: The attribute 'aria-rowindex' is not supported by the role 'emphasis'.",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'emphasis'",
 		"start": {
 			"column": 21,
 			"line": 63
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 64
 		},
-		"message": "A11y: The attribute 'aria-colindex' is not supported by the role 'feed'.",
+		"message": "The attribute 'aria-colindex' is not supported by the role 'feed'",
 		"start": {
 			"column": 17,
 			"line": 64
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 65
 		},
-		"message": "A11y: The attribute 'aria-valuemax' is not supported by the role 'figure'.",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'figure'",
 		"start": {
 			"column": 19,
 			"line": 65
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 30,
 			"line": 66
 		},
-		"message": "A11y: The attribute 'aria-readonly' is not supported by the role 'form'.",
+		"message": "The attribute 'aria-readonly' is not supported by the role 'form'",
 		"start": {
 			"column": 17,
 			"line": 66
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 67
 		},
-		"message": "A11y: The attribute 'aria-valuemax' is not supported by the role 'generic'.",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'generic'",
 		"start": {
 			"column": 20,
 			"line": 67
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 29,
 			"line": 68
 		},
-		"message": "A11y: The attribute 'aria-checked' is not supported by the role 'grid'.",
+		"message": "The attribute 'aria-checked' is not supported by the role 'grid'",
 		"start": {
 			"column": 17,
 			"line": 68
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 35,
 			"line": 69
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'gridcell'.",
+		"message": "The attribute 'aria-level' is not supported by the role 'gridcell'",
 		"start": {
 			"column": 21,
 			"line": 69
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 70
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'group'.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'group'",
 		"start": {
 			"column": 18,
 			"line": 70
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 46,
 			"line": 71
 		},
-		"message": "A11y: The attribute 'aria-activedescendant' is not supported by the role 'heading'.",
+		"message": "The attribute 'aria-activedescendant' is not supported by the role 'heading'",
 		"start": {
 			"column": 20,
 			"line": 71
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 47,
 			"line": 72
 		},
-		"message": "A11y: The attribute 'aria-errormessage' is not supported by the role 'insertion'.",
+		"message": "The attribute 'aria-errormessage' is not supported by the role 'insertion'",
 		"start": {
 			"column": 22,
 			"line": 72
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 31,
 			"line": 73
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'link'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'link'",
 		"start": {
 			"column": 17,
 			"line": 73
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 30,
 			"line": 74
 		},
-		"message": "A11y: The attribute 'aria-selected' is not supported by the role 'list'.",
+		"message": "The attribute 'aria-selected' is not supported by the role 'list'",
 		"start": {
 			"column": 17,
 			"line": 74
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 33,
 			"line": 75
 		},
-		"message": "A11y: The attribute 'aria-haspopup' is not supported by the role 'listbox'.",
+		"message": "The attribute 'aria-haspopup' is not supported by the role 'listbox'",
 		"start": {
 			"column": 20,
 			"line": 75
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 47,
 			"line": 76
 		},
-		"message": "A11y: The attribute 'aria-activedescendant' is not supported by the role 'listitem'.",
+		"message": "The attribute 'aria-activedescendant' is not supported by the role 'listitem'",
 		"start": {
 			"column": 21,
 			"line": 76
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 29,
 			"line": 77
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'log'.",
+		"message": "The attribute 'aria-required' is not supported by the role 'log'",
 		"start": {
 			"column": 16,
 			"line": 77
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 33,
 			"line": 78
 		},
-		"message": "A11y: The attribute 'aria-sort' is not supported by the role 'main'.",
+		"message": "The attribute 'aria-sort' is not supported by the role 'main'",
 		"start": {
 			"column": 17,
 			"line": 78
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 46,
 			"line": 79
 		},
-		"message": "A11y: The attribute 'aria-autocomplete' is not supported by the role 'marquee'.",
+		"message": "The attribute 'aria-autocomplete' is not supported by the role 'marquee'",
 		"start": {
 			"column": 20,
 			"line": 79
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 31,
 			"line": 80
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'math'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'math'",
 		"start": {
 			"column": 17,
 			"line": 80
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 29,
 			"line": 81
 		},
-		"message": "A11y: The attribute 'aria-checked' is not supported by the role 'menu'.",
+		"message": "The attribute 'aria-checked' is not supported by the role 'menu'",
 		"start": {
 			"column": 17,
 			"line": 81
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 45,
 			"line": 82
 		},
-		"message": "A11y: The attribute 'aria-errormessage' is not supported by the role 'menubar'.",
+		"message": "The attribute 'aria-errormessage' is not supported by the role 'menubar'",
 		"start": {
 			"column": 20,
 			"line": 82
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 33,
 			"line": 83
 		},
-		"message": "A11y: The attribute 'aria-checked' is not supported by the role 'menuitem'.",
+		"message": "The attribute 'aria-checked' is not supported by the role 'menuitem'",
 		"start": {
 			"column": 21,
 			"line": 83
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 84
 		},
-		"message": "A11y: The attribute 'aria-pressed' is not supported by the role 'menuitemcheckbox'.",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'menuitemcheckbox'",
 		"start": {
 			"column": 29,
 			"line": 84
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 85
 		},
-		"message": "A11y: The attribute 'aria-rowspan' is not supported by the role 'menuitemradio'.",
+		"message": "The attribute 'aria-rowspan' is not supported by the role 'menuitemradio'",
 		"start": {
 			"column": 26,
 			"line": 85
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 49,
 			"line": 86
 		},
-		"message": "A11y: The attribute 'aria-haspopup' is not supported by the role 'meter'.",
+		"message": "The attribute 'aria-haspopup' is not supported by the role 'meter'",
 		"start": {
 			"column": 36,
 			"line": 86
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 87
 		},
-		"message": "A11y: The attribute 'aria-expanded' is not supported by the role 'navigation'.",
+		"message": "The attribute 'aria-expanded' is not supported by the role 'navigation'",
 		"start": {
 			"column": 23,
 			"line": 87
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 88
 		},
-		"message": "A11y: The attribute 'aria-placeholder' is not supported by the role 'none'.",
+		"message": "The attribute 'aria-placeholder' is not supported by the role 'none'",
 		"start": {
 			"column": 17,
 			"line": 88
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 27,
 			"line": 89
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'note'.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'note'",
 		"start": {
 			"column": 17,
 			"line": 89
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 50,
 			"line": 90
 		},
-		"message": "A11y: The attribute 'aria-valuemax' is not supported by the role 'option'.",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'option'",
 		"start": {
 			"column": 33,
 			"line": 90
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 91
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'paragraph'.",
+		"message": "The attribute 'aria-level' is not supported by the role 'paragraph'",
 		"start": {
 			"column": 22,
 			"line": 91
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 38,
 			"line": 92
 		},
-		"message": "A11y: The attribute 'aria-disabled' is not supported by the role 'presentation'.",
+		"message": "The attribute 'aria-disabled' is not supported by the role 'presentation'",
 		"start": {
 			"column": 25,
 			"line": 92
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 93
 		},
-		"message": "A11y: The attribute 'aria-expanded' is not supported by the role 'progressbar'.",
+		"message": "The attribute 'aria-expanded' is not supported by the role 'progressbar'",
 		"start": {
 			"column": 24,
 			"line": 93
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 48,
 			"line": 94
 		},
-		"message": "A11y: The attribute 'aria-rowindex' is not supported by the role 'radio'.",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'radio'",
 		"start": {
 			"column": 31,
 			"line": 94
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 40,
 			"line": 95
 		},
-		"message": "A11y: The attribute 'aria-valuenow' is not supported by the role 'radiogroup'.",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'radiogroup'",
 		"start": {
 			"column": 23,
 			"line": 95
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 35,
 			"line": 96
 		},
-		"message": "A11y: The attribute 'aria-rowspan' is not supported by the role 'region'.",
+		"message": "The attribute 'aria-rowspan' is not supported by the role 'region'",
 		"start": {
 			"column": 19,
 			"line": 96
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 29,
 			"line": 97
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'row'.",
+		"message": "The attribute 'aria-required' is not supported by the role 'row'",
 		"start": {
 			"column": 16,
 			"line": 97
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 98
 		},
-		"message": "A11y: The attribute 'aria-expanded' is not supported by the role 'rowgroup'.",
+		"message": "The attribute 'aria-expanded' is not supported by the role 'rowgroup'",
 		"start": {
 			"column": 21,
 			"line": 98
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 48,
 			"line": 99
 		},
-		"message": "A11y: The attribute 'aria-activedescendant' is not supported by the role 'rowheader'.",
+		"message": "The attribute 'aria-activedescendant' is not supported by the role 'rowheader'",
 		"start": {
 			"column": 22,
 			"line": 99
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 75,
 			"line": 100
 		},
-		"message": "A11y: The attribute 'aria-rowspan' is not supported by the role 'scrollbar'.",
+		"message": "The attribute 'aria-rowspan' is not supported by the role 'scrollbar'",
 		"start": {
 			"column": 59,
 			"line": 100
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 45,
 			"line": 101
 		},
-		"message": "A11y: The attribute 'aria-autocomplete' is not supported by the role 'search'.",
+		"message": "The attribute 'aria-autocomplete' is not supported by the role 'search'",
 		"start": {
 			"column": 19,
 			"line": 101
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 39,
 			"line": 102
 		},
-		"message": "A11y: The attribute 'aria-colindex' is not supported by the role 'searchbox'.",
+		"message": "The attribute 'aria-colindex' is not supported by the role 'searchbox'",
 		"start": {
 			"column": 22,
 			"line": 102
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 38,
 			"line": 103
 		},
-		"message": "A11y: The attribute 'aria-sort' is not supported by the role 'separator'.",
+		"message": "The attribute 'aria-sort' is not supported by the role 'separator'",
 		"start": {
 			"column": 22,
 			"line": 103
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 56,
 			"line": 104
 		},
-		"message": "A11y: The attribute 'aria-placeholder' is not supported by the role 'slider'.",
+		"message": "The attribute 'aria-placeholder' is not supported by the role 'slider'",
 		"start": {
 			"column": 37,
 			"line": 104
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 40,
 			"line": 105
 		},
-		"message": "A11y: The attribute 'aria-posinset' is not supported by the role 'spinbutton'.",
+		"message": "The attribute 'aria-posinset' is not supported by the role 'spinbutton'",
 		"start": {
 			"column": 23,
 			"line": 105
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 106
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'status'.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'status'",
 		"start": {
 			"column": 19,
 			"line": 106
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 107
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'strong'.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'strong'",
 		"start": {
 			"column": 19,
 			"line": 107
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 39,
 			"line": 108
 		},
-		"message": "A11y: The attribute 'aria-colcount' is not supported by the role 'subscript'.",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'subscript'",
 		"start": {
 			"column": 22,
 			"line": 108
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 38,
 			"line": 109
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'superscript'.",
+		"message": "The attribute 'aria-level' is not supported by the role 'superscript'",
 		"start": {
 			"column": 24,
 			"line": 109
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 49,
 			"line": 110
 		},
-		"message": "A11y: The attribute 'aria-valuenow' is not supported by the role 'switch'.",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'switch'",
 		"start": {
 			"column": 32,
 			"line": 110
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 29,
 			"line": 111
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'tab'.",
+		"message": "The attribute 'aria-required' is not supported by the role 'tab'",
 		"start": {
 			"column": 16,
 			"line": 111
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 28,
 			"line": 112
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'table'.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'table'",
 		"start": {
 			"column": 18,
 			"line": 112
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 113
 		},
-		"message": "A11y: The attribute 'aria-setsize' is not supported by the role 'tablist'.",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'tablist'",
 		"start": {
 			"column": 20,
 			"line": 113
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 114
 		},
-		"message": "A11y: The attribute 'aria-multiselectable' is not supported by the role 'tabpanel'.",
+		"message": "The attribute 'aria-multiselectable' is not supported by the role 'tabpanel'",
 		"start": {
 			"column": 21,
 			"line": 114
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 115
 		},
-		"message": "A11y: The attribute 'aria-posinset' is not supported by the role 'term'.",
+		"message": "The attribute 'aria-posinset' is not supported by the role 'term'",
 		"start": {
 			"column": 17,
 			"line": 115
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 116
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'textbox'.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'textbox'",
 		"start": {
 			"column": 20,
 			"line": 116
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 30,
 			"line": 117
 		},
-		"message": "A11y: The attribute 'aria-selected' is not supported by the role 'time'.",
+		"message": "The attribute 'aria-selected' is not supported by the role 'time'",
 		"start": {
 			"column": 17,
 			"line": 117
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 118
 		},
-		"message": "A11y: The attribute 'aria-sort' is not supported by the role 'timer'.",
+		"message": "The attribute 'aria-sort' is not supported by the role 'timer'",
 		"start": {
 			"column": 18,
 			"line": 118
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 119
 		},
-		"message": "A11y: The attribute 'aria-valuetext' is not supported by the role 'toolbar'.",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'toolbar'",
 		"start": {
 			"column": 20,
 			"line": 119
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 34,
 			"line": 120
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'tooltip'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'tooltip'",
 		"start": {
 			"column": 20,
 			"line": 120
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 30,
 			"line": 121
 		},
-		"message": "A11y: The attribute 'aria-expanded' is not supported by the role 'tree'.",
+		"message": "The attribute 'aria-expanded' is not supported by the role 'tree'",
 		"start": {
 			"column": 17,
 			"line": 121
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 35,
 			"line": 122
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'treegrid'.",
+		"message": "The attribute 'aria-level' is not supported by the role 'treegrid'",
 		"start": {
 			"column": 21,
 			"line": 122
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 61,
 			"line": 123
 		},
-		"message": "A11y: The attribute 'aria-activedescendant' is not supported by the role 'treeitem'.",
+		"message": "The attribute 'aria-activedescendant' is not supported by the role 'treeitem'",
 		"start": {
 			"column": 35,
 			"line": 123
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 124
 		},
-		"message": "A11y: The attribute 'aria-colindex' is not supported by the role 'doc-abstract'.",
+		"message": "The attribute 'aria-colindex' is not supported by the role 'doc-abstract'",
 		"start": {
 			"column": 25,
 			"line": 124
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 48,
 			"line": 125
 		},
-		"message": "A11y: The attribute 'aria-setsize' is not supported by the role 'doc-acknowledgments'.",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'doc-acknowledgments'",
 		"start": {
 			"column": 32,
 			"line": 125
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 126
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'doc-afterword'.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'doc-afterword'",
 		"start": {
 			"column": 26,
 			"line": 126
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 51,
 			"line": 127
 		},
-		"message": "A11y: The attribute 'aria-activedescendant' is not supported by the role 'doc-appendix'.",
+		"message": "The attribute 'aria-activedescendant' is not supported by the role 'doc-appendix'",
 		"start": {
 			"column": 25,
 			"line": 127
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 128
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'doc-backlink'.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'doc-backlink'",
 		"start": {
 			"column": 25,
 			"line": 128
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 45,
 			"line": 129
 		},
-		"message": "A11y: The attribute 'aria-valuemax' is not supported by the role 'doc-biblioentry'.",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'doc-biblioentry'",
 		"start": {
 			"column": 28,
 			"line": 129
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 43,
 			"line": 130
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'doc-bibliography'.",
+		"message": "The attribute 'aria-level' is not supported by the role 'doc-bibliography'",
 		"start": {
 			"column": 29,
 			"line": 130
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 38,
 			"line": 131
 		},
-		"message": "A11y: The attribute 'aria-checked' is not supported by the role 'doc-biblioref'.",
+		"message": "The attribute 'aria-checked' is not supported by the role 'doc-biblioref'",
 		"start": {
 			"column": 26,
 			"line": 131
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 132
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'doc-chapter'.",
+		"message": "The attribute 'aria-required' is not supported by the role 'doc-chapter'",
 		"start": {
 			"column": 24,
 			"line": 132
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 133
 		},
-		"message": "A11y: The attribute 'aria-setsize' is not supported by the role 'doc-colophon'.",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'doc-colophon'",
 		"start": {
 			"column": 25,
 			"line": 133
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 44,
 			"line": 134
 		},
-		"message": "A11y: The attribute 'aria-colindex' is not supported by the role 'doc-conclusion'.",
+		"message": "The attribute 'aria-colindex' is not supported by the role 'doc-conclusion'",
 		"start": {
 			"column": 27,
 			"line": 134
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 32,
 			"line": 135
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'doc-cover'.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'doc-cover'",
 		"start": {
 			"column": 22,
 			"line": 135
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 136
 		},
-		"message": "A11y: The attribute 'aria-selected' is not supported by the role 'doc-credit'.",
+		"message": "The attribute 'aria-selected' is not supported by the role 'doc-credit'",
 		"start": {
 			"column": 23,
 			"line": 136
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 52,
 			"line": 137
 		},
-		"message": "A11y: The attribute 'aria-orientation' is not supported by the role 'doc-credits'.",
+		"message": "The attribute 'aria-orientation' is not supported by the role 'doc-credits'",
 		"start": {
 			"column": 24,
 			"line": 137
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 138
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'doc-dedication'.",
+		"message": "The attribute 'aria-level' is not supported by the role 'doc-dedication'",
 		"start": {
 			"column": 27,
 			"line": 138
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 139
 		},
-		"message": "A11y: The attribute 'aria-checked' is not supported by the role 'doc-endnote'.",
+		"message": "The attribute 'aria-checked' is not supported by the role 'doc-endnote'",
 		"start": {
 			"column": 24,
 			"line": 139
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 140
 		},
-		"message": "A11y: The attribute 'aria-colcount' is not supported by the role 'doc-endnotes'.",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'doc-endnotes'",
 		"start": {
 			"column": 25,
 			"line": 140
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 39,
 			"line": 141
 		},
-		"message": "A11y: The attribute 'aria-multiline' is not supported by the role 'doc-epigraph'.",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'doc-epigraph'",
 		"start": {
 			"column": 25,
 			"line": 141
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 142
 		},
-		"message": "A11y: The attribute 'aria-colcount' is not supported by the role 'doc-epilogue'.",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'doc-epilogue'",
 		"start": {
 			"column": 25,
 			"line": 142
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 39,
 			"line": 143
 		},
-		"message": "A11y: The attribute 'aria-sort' is not supported by the role 'doc-errata'.",
+		"message": "The attribute 'aria-sort' is not supported by the role 'doc-errata'",
 		"start": {
 			"column": 23,
 			"line": 143
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 44,
 			"line": 144
 		},
-		"message": "A11y: The attribute 'aria-multiselectable' is not supported by the role 'doc-example'.",
+		"message": "The attribute 'aria-multiselectable' is not supported by the role 'doc-example'",
 		"start": {
 			"column": 24,
 			"line": 144
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 145
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-footnote'.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'doc-footnote'",
 		"start": {
 			"column": 25,
 			"line": 145
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 146
 		},
-		"message": "A11y: The attribute 'aria-valuenow' is not supported by the role 'doc-foreword'.",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'doc-foreword'",
 		"start": {
 			"column": 25,
 			"line": 146
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 147
 		},
-		"message": "A11y: The attribute 'aria-valuetext' is not supported by the role 'doc-glossary'.",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'doc-glossary'",
 		"start": {
 			"column": 25,
 			"line": 147
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 44,
 			"line": 148
 		},
-		"message": "A11y: The attribute 'aria-placeholder' is not supported by the role 'doc-glossref'.",
+		"message": "The attribute 'aria-placeholder' is not supported by the role 'doc-glossref'",
 		"start": {
 			"column": 25,
 			"line": 148
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 39,
 			"line": 149
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-index'.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'doc-index'",
 		"start": {
 			"column": 22,
 			"line": 149
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 150
 		},
-		"message": "A11y: The attribute 'aria-pressed' is not supported by the role 'doc-introduction'.",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'doc-introduction'",
 		"start": {
 			"column": 29,
 			"line": 150
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 41,
 			"line": 151
 		},
-		"message": "A11y: The attribute 'aria-valuenow' is not supported by the role 'doc-noteref'.",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'doc-noteref'",
 		"start": {
 			"column": 24,
 			"line": 151
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 152
 		},
-		"message": "A11y: The attribute 'aria-selected' is not supported by the role 'doc-notice'.",
+		"message": "The attribute 'aria-selected' is not supported by the role 'doc-notice'",
 		"start": {
 			"column": 23,
 			"line": 152
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 43,
 			"line": 153
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-pagebreak'.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'doc-pagebreak'",
 		"start": {
 			"column": 26,
 			"line": 153
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 35,
 			"line": 154
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'doc-pagelist'.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'doc-pagelist'",
 		"start": {
 			"column": 25,
 			"line": 154
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 155
 		},
-		"message": "A11y: The attribute 'aria-setsize' is not supported by the role 'doc-part'.",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'doc-part'",
 		"start": {
 			"column": 21,
 			"line": 155
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 52,
 			"line": 156
 		},
-		"message": "A11y: The attribute 'aria-orientation' is not supported by the role 'doc-preface'.",
+		"message": "The attribute 'aria-orientation' is not supported by the role 'doc-preface'",
 		"start": {
 			"column": 24,
 			"line": 156
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 38,
 			"line": 157
 		},
-		"message": "A11y: The attribute 'aria-required' is not supported by the role 'doc-prologue'.",
+		"message": "The attribute 'aria-required' is not supported by the role 'doc-prologue'",
 		"start": {
 			"column": 25,
 			"line": 157
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 43,
 			"line": 158
 		},
-		"message": "A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-pullquote'.",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'doc-pullquote'",
 		"start": {
 			"column": 26,
 			"line": 158
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 36,
 			"line": 159
 		},
-		"message": "A11y: The attribute 'aria-setsize' is not supported by the role 'doc-qna'.",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'doc-qna'",
 		"start": {
 			"column": 20,
 			"line": 159
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 42,
 			"line": 160
 		},
-		"message": "A11y: The attribute 'aria-rowindex' is not supported by the role 'doc-subtitle'.",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'doc-subtitle'",
 		"start": {
 			"column": 25,
 			"line": 160
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 161
 		},
-		"message": "A11y: The attribute 'aria-valuenow' is not supported by the role 'doc-tip'.",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'doc-tip'",
 		"start": {
 			"column": 20,
 			"line": 161
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props",
 		"end": {
 			"column": 37,
 			"line": 162
 		},
-		"message": "A11y: The attribute 'aria-posinset' is not supported by the role 'doc-toc'.",
+		"message": "The attribute 'aria-posinset' is not supported by the role 'doc-toc'",
 		"start": {
 			"column": 20,
 			"line": 162
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 35,
 			"line": 166
 		},
-		"message": "A11y: The attribute 'aria-rowspan' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-rowspan' is not supported by the role 'textbox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 19,
 			"line": 166
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 30,
 			"line": 167
 		},
-		"message": "A11y: The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 18,
 			"line": 167
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 32,
 			"line": 168
 		},
-		"message": "A11y: The attribute 'aria-level' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-level' is not supported by the role 'textbox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 18,
 			"line": 168
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 32,
 			"line": 169
 		},
-		"message": "A11y: The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 20,
 			"line": 169
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 42,
 			"line": 170
 		},
-		"message": "A11y: The attribute 'aria-valuetext' is not supported by the role 'searchbox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'searchbox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 21,
 			"line": 170
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 50,
 			"line": 171
 		},
-		"message": "A11y: The attribute 'aria-valuemin' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'combobox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 33,
 			"line": 171
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 48,
 			"line": 172
 		},
-		"message": "A11y: The attribute 'aria-colspan' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'combobox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 32,
 			"line": 172
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 49,
 			"line": 173
 		},
-		"message": "A11y: The attribute 'aria-posinset' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-posinset' is not supported by the role 'combobox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 32,
 			"line": 173
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 44,
 			"line": 174
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'combobox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 34,
 			"line": 174
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 52,
 			"line": 175
 		},
-		"message": "A11y: The attribute 'aria-rowindex' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'combobox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 35,
 			"line": 175
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 53,
 			"line": 176
 		},
-		"message": "A11y: The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <input>",
 		"start": {
 			"column": 36,
 			"line": 176
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 30,
 			"line": 177
 		},
-		"message": "A11y: The attribute 'aria-modal' is not supported by the role 'button'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-modal' is not supported by the role 'button'. This role is implicit on the element <input>",
 		"start": {
 			"column": 20,
 			"line": 177
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 51,
 			"line": 178
 		},
-		"message": "A11y: The attribute 'aria-placeholder' is not supported by the role 'button'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-placeholder' is not supported by the role 'button'. This role is implicit on the element <input>",
 		"start": {
 			"column": 21,
 			"line": 178
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 40,
 			"line": 179
 		},
-		"message": "A11y: The attribute 'aria-rowindex' is not supported by the role 'checkbox'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'checkbox'. This role is implicit on the element <input>",
 		"start": {
 			"column": 23,
 			"line": 179
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 41,
 			"line": 180
 		},
-		"message": "A11y: The attribute 'aria-valuetext' is not supported by the role 'radio'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'radio'. This role is implicit on the element <input>",
 		"start": {
 			"column": 20,
 			"line": 180
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 32,
 			"line": 181
 		},
-		"message": "A11y: The attribute 'aria-checked' is not supported by the role 'slider'. This role is implicit on the element <input>.",
+		"message": "The attribute 'aria-checked' is not supported by the role 'slider'. This role is implicit on the element <input>",
 		"start": {
 			"column": 20,
 			"line": 181
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 42,
 			"line": 182
 		},
-		"message": "A11y: The attribute 'aria-colindex' is not supported by the role 'menuitem'. This role is implicit on the element <menuitem>.",
+		"message": "The attribute 'aria-colindex' is not supported by the role 'menuitem'. This role is implicit on the element <menuitem>",
 		"start": {
 			"column": 25,
 			"line": 182
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 43,
 			"line": 183
 		},
-		"message": "A11y: The attribute 'aria-colcount' is not supported by the role 'menuitemcheckbox'. This role is implicit on the element <menuitem>.",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'menuitemcheckbox'. This role is implicit on the element <menuitem>",
 		"start": {
 			"column": 26,
 			"line": 183
 		}
 	},
 	{
-		"code": "a11y-role-supports-aria-props",
+		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
 			"column": 53,
 			"line": 184
 		},
-		"message": "A11y: The attribute 'aria-placeholder' is not supported by the role 'menuitemradio'. This role is implicit on the element <menuitem>.",
+		"message": "The attribute 'aria-placeholder' is not supported by the role 'menuitemradio'. This role is implicit on the element <menuitem>",
 		"start": {
 			"column": 23,
 			"line": 184
diff --git a/packages/svelte/tests/validator/samples/a11y-scope/warnings.json b/packages/svelte/tests/validator/samples/a11y-scope/warnings.json
index b8e36cef5d..79ea2416fd 100644
--- a/packages/svelte/tests/validator/samples/a11y-scope/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-scope/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-misplaced-scope",
-		"message": "A11y: The scope attribute should only be used with <th> elements",
+		"code": "a11y_misplaced_scope",
+		"message": "The scope attribute should only be used with <th> elements",
 		"start": {
 			"line": 6,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-tabindex-no-positive/warnings.json b/packages/svelte/tests/validator/samples/a11y-tabindex-no-positive/warnings.json
index 455c4998e4..d98b26dfd3 100644
--- a/packages/svelte/tests/validator/samples/a11y-tabindex-no-positive/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-tabindex-no-positive/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-positive-tabindex",
-		"message": "A11y: avoid tabindex values above zero",
+		"code": "a11y_positive_tabindex",
+		"message": "Avoid tabindex values above zero",
 		"start": {
 			"line": 7,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/component-dynamic/input.svelte b/packages/svelte/tests/validator/samples/component-dynamic/input.svelte
index 241a33c5ea..7f52353e36 100644
--- a/packages/svelte/tests/validator/samples/component-dynamic/input.svelte
+++ b/packages/svelte/tests/validator/samples/component-dynamic/input.svelte
@@ -18,13 +18,13 @@
 <svelte:component this={Let} />
 
 <!-- Here, we test to see if svelte-ignore works with reactive-component -->
-<!-- svelte-ignore reactive-component -->
+<!-- svelte-ignore reactive_component -->
 <Let />
 <div>
-  <!-- svelte-ignore reactive-component -->
+  <!-- svelte-ignore reactive_component -->
   <ExportLet />
   <div>
-    <!-- svelte-ignore reactive-component -->
+    <!-- svelte-ignore reactive_component -->
     <Reactive />
   </div>
 </div>
diff --git a/packages/svelte/tests/validator/samples/component-dynamic/warnings.json b/packages/svelte/tests/validator/samples/component-dynamic/warnings.json
index 58d07677b8..49fb9e4334 100644
--- a/packages/svelte/tests/validator/samples/component-dynamic/warnings.json
+++ b/packages/svelte/tests/validator/samples/component-dynamic/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "reactive-component",
+		"code": "reactive_component",
 		"message": "<Let/> will not be reactive if Let changes. Use <svelte:component this={Let}/> if you want this reactivity.",
 		"end": {
 			"column": 7,
@@ -13,7 +13,7 @@
 	},
 	{
 		"message": "<ExportLet/> will not be reactive if ExportLet changes. Use <svelte:component this={ExportLet}/> if you want this reactivity.",
-		"code": "reactive-component",
+		"code": "reactive_component",
 		"end": {
 			"column": 13,
 			"line": 16
@@ -25,7 +25,7 @@
 	},
 	{
 		"message": "<Reactive/> will not be reactive if Reactive changes. Use <svelte:component this={Reactive}/> if you want this reactivity.",
-		"code": "reactive-component",
+		"code": "reactive_component",
 		"end": {
 			"column": 12,
 			"line": 17
diff --git a/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json b/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json
index d5ddbf1cc5..e330d53f17 100644
--- a/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json
+++ b/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "component-name-lowercase",
+		"code": "component_name_lowercase",
 		"message": "<thisShouldWarnMe> will be treated as an HTML element unless it begins with a capital letter",
 		"start": {
 			"column": 0,
diff --git a/packages/svelte/tests/validator/samples/empty-block/warnings.json b/packages/svelte/tests/validator/samples/empty-block/warnings.json
index b86dab6f72..461a4aecc9 100644
--- a/packages/svelte/tests/validator/samples/empty-block/warnings.json
+++ b/packages/svelte/tests/validator/samples/empty-block/warnings.json
@@ -1,26 +1,50 @@
 [
 	{
-		"code": "empty-block",
+		"code": "empty_block",
 		"message": "Empty block",
-		"start": { "line": 13, "column": 23 },
-		"end": { "line": 15, "column": 0 }
+		"start": {
+			"line": 13,
+			"column": 23
+		},
+		"end": {
+			"line": 15,
+			"column": 0
+		}
 	},
 	{
-		"code": "empty-block",
+		"code": "empty_block",
 		"message": "Empty block",
-		"start": { "line": 16, "column": 10 },
-		"end": { "line": 16, "column": 11 }
+		"start": {
+			"line": 16,
+			"column": 10
+		},
+		"end": {
+			"line": 16,
+			"column": 11
+		}
 	},
 	{
-		"code": "empty-block",
+		"code": "empty_block",
 		"message": "Empty block",
-		"start": { "line": 17, "column": 13 },
-		"end": { "line": 17, "column": 14 }
+		"start": {
+			"line": 17,
+			"column": 13
+		},
+		"end": {
+			"line": 17,
+			"column": 14
+		}
 	},
 	{
-		"code": "empty-block",
+		"code": "empty_block",
 		"message": "Empty block",
-		"start": { "line": 18, "column": 16 },
-		"end": { "line": 18, "column": 17 }
+		"start": {
+			"line": 18,
+			"column": 16
+		},
+		"end": {
+			"line": 18,
+			"column": 17
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json b/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json
index 0262068c81..84c1eeca61 100644
--- a/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json
+++ b/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-const-assignment",
+		"code": "invalid_const_assignment",
 		"message": "Invalid assignment to const",
 		"start": {
 			"line": 5,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "invalid-binding-value",
+		"code": "invalid_binding_value",
 		"message": "Can only bind to state or props",
 		"end": {
 			"column": 29,
diff --git a/packages/svelte/tests/validator/samples/general-siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json b/packages/svelte/tests/validator/samples/general-siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json
index 8783cb30ab..e29a0818c3 100644
--- a/packages/svelte/tests/validator/samples/general-siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json
+++ b/packages/svelte/tests/validator/samples/general-siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "css-unused-selector",
+		"code": "css_unused_selector",
 		"message": "Unused CSS selector \"h1 ~ slot > p\"",
 		"start": {
 			"column": 1,
diff --git a/packages/svelte/tests/validator/samples/global-event-reference/warnings.json b/packages/svelte/tests/validator/samples/global-event-reference/warnings.json
index ccc1e482b5..f6f6f1dc18 100644
--- a/packages/svelte/tests/validator/samples/global-event-reference/warnings.json
+++ b/packages/svelte/tests/validator/samples/global-event-reference/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "global-event-reference",
+		"code": "global_event_reference",
 		"message": "You are referencing globalThis.onkeydown. Did you forget to declare a variable with that name?",
 		"start": {
 			"column": 8,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "global-event-reference",
+		"code": "global_event_reference",
 		"message": "You are referencing globalThis.onkeydown. Did you forget to declare a variable with that name?",
 		"start": {
 			"column": 8,
diff --git a/packages/svelte/tests/validator/samples/ignore-warning/input.svelte b/packages/svelte/tests/validator/samples/ignore-warning/input.svelte
index c4e7556d74..cfbe0e538d 100644
--- a/packages/svelte/tests/validator/samples/ignore-warning/input.svelte
+++ b/packages/svelte/tests/validator/samples/ignore-warning/input.svelte
@@ -1,7 +1,7 @@
-<!-- svelte-ignore a11y-missing-attribute -->
+<!-- svelte-ignore a11y_missing_attribute -->
 <div>
 	<img src="this-is-fine.jpg">
 	<marquee>but this is still discouraged</marquee>
 </div>
 
-<img src="potato.jpg">
\ No newline at end of file
+<img src="potato.jpg">
diff --git a/packages/svelte/tests/validator/samples/ignore-warning/warnings.json b/packages/svelte/tests/validator/samples/ignore-warning/warnings.json
index 51c940b807..6d1eaf74ad 100644
--- a/packages/svelte/tests/validator/samples/ignore-warning/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warning/warnings.json
@@ -1,23 +1,23 @@
 [
 	{
-		"code": "a11y-distracting-elements",
+		"code": "a11y_distracting_elements",
 		"end": {
 			"column": 49,
 			"line": 4
 		},
-		"message": "A11y: Avoid <marquee> elements",
+		"message": "Avoid <marquee> elements",
 		"start": {
 			"column": 1,
 			"line": 4
 		}
 	},
 	{
-		"code": "a11y-missing-attribute",
+		"code": "a11y_missing_attribute",
 		"end": {
 			"column": 22,
 			"line": 7
 		},
-		"message": "A11y: <img> element should have an alt attribute",
+		"message": "<img> element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 7
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/input.svelte b/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/input.svelte
index 2843a890ce..371d06b6e7 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/input.svelte
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/input.svelte
@@ -1,4 +1,4 @@
-<!-- svelte-ignore a11y-structure a11y-missing-attribute -->
+<!-- svelte-ignore a11y_figcaption_parent a11y_missing_attribute -->
 <div>
 	<figure>
 		<img src="potato.jpg">
@@ -7,11 +7,11 @@
 		</marquee>
 	</figure>
 
-	<!-- svelte-ignore a11y-distracting-elements -->
+	<!-- svelte-ignore a11y_distracting_elements -->
 	<figure>
 		<img src="potato.jpg">
 		<marquee>
 			<figcaption>potato</figcaption>
 		</marquee>
 	</figure>
-</div>
\ No newline at end of file
+</div>
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json
index 26add431e0..1644aeb831 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json
@@ -1,11 +1,11 @@
 [
 	{
-		"code": "a11y-distracting-elements",
+		"code": "a11y_distracting_elements",
 		"end": {
 			"column": 12,
 			"line": 7
 		},
-		"message": "A11y: Avoid <marquee> elements",
+		"message": "Avoid <marquee> elements",
 		"start": {
 			"column": 2,
 			"line": 5
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-newline/input.svelte b/packages/svelte/tests/validator/samples/ignore-warnings-newline/input.svelte
index c75a91c630..8471d1d539 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-newline/input.svelte
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-newline/input.svelte
@@ -1,8 +1,8 @@
-<!-- svelte-ignore a11y-missing-attribute
-                   a11y-distracting-elements -->
+<!-- svelte-ignore a11y_missing_attribute
+                   a11y_distracting_elements -->
 <div>
 	<img src="this-is-fine.jpg">
 	<marquee>but this is still discouraged</marquee>
 </div>
 
-<img src="potato.jpg">
\ No newline at end of file
+<img src="potato.jpg">
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json
index 03fade839a..eb75343b4e 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json
@@ -1,11 +1,11 @@
 [
 	{
-		"code": "a11y-missing-attribute",
+		"code": "a11y_missing_attribute",
 		"end": {
 			"column": 22,
 			"line": 8
 		},
-		"message": "A11y: <img> element should have an alt attribute",
+		"message": "<img> element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 8
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-stacked/input.svelte b/packages/svelte/tests/validator/samples/ignore-warnings-stacked/input.svelte
index c6edb7240a..5a7f8477ab 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-stacked/input.svelte
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-stacked/input.svelte
@@ -1,8 +1,8 @@
-<!-- svelte-ignore a11y-missing-attribute -->
-<!-- svelte-ignore a11y-distracting-elements -->
+<!-- svelte-ignore a11y_missing_attribute -->
+<!-- svelte-ignore a11y_distracting_elements -->
 <div>
 	<img src="this-is-fine.jpg">
 	<marquee>but this is still discouraged</marquee>
 </div>
 
-<img src="potato.jpg">
\ No newline at end of file
+<img src="potato.jpg">
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json
index 03fade839a..eb75343b4e 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json
@@ -1,11 +1,11 @@
 [
 	{
-		"code": "a11y-missing-attribute",
+		"code": "a11y_missing_attribute",
 		"end": {
 			"column": 22,
 			"line": 8
 		},
-		"message": "A11y: <img> element should have an alt attribute",
+		"message": "<img> element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 8
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings/input.svelte b/packages/svelte/tests/validator/samples/ignore-warnings/input.svelte
index 5fd7229f9a..a3999ad901 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings/input.svelte
+++ b/packages/svelte/tests/validator/samples/ignore-warnings/input.svelte
@@ -1,7 +1,7 @@
-<!-- svelte-ignore a11y-missing-attribute a11y-distracting-elements -->
+<!-- svelte-ignore a11y_missing_attribute a11y_distracting_elements -->
 <div>
 	<img src="this-is-fine.jpg">
 	<marquee>but this is still discouraged</marquee>
 </div>
 
-<img src="potato.jpg">
\ No newline at end of file
+<img src="potato.jpg">
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json
index 9a5be15ae7..3cc9ba0a39 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json
@@ -1,11 +1,11 @@
 [
 	{
-		"code": "a11y-missing-attribute",
+		"code": "a11y_missing_attribute",
 		"end": {
 			"column": 22,
 			"line": 7
 		},
-		"message": "A11y: <img> element should have an alt attribute",
+		"message": "<img> element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 7
diff --git a/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json b/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json
index 391bb187ea..18b5b6f202 100644
--- a/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json
+++ b/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal-attribute-character",
+		"code": "illegal_attribute_character",
 		"end": {
 			"column": 15,
 			"line": 14
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "illegal-attribute-character",
+		"code": "illegal_attribute_character",
 		"end": {
 			"column": 10,
 			"line": 15
diff --git a/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json b/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json
index 6956314377..8d1918f8c6 100644
--- a/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json
+++ b/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "avoid-nested-class",
+		"code": "avoid_nested_class",
 		"message": "Avoid declaring classes below the top level scope",
 		"start": {
 			"column": 2,
diff --git a/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json b/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json
index 71beba537f..73f1293158 100644
--- a/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json
+++ b/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "avoid-inline-class",
+		"code": "avoid_inline_class",
 		"message": "Avoid 'new class' — instead, declare the class at the top level scope",
 		"start": {
 			"column": 12,
diff --git a/packages/svelte/tests/validator/samples/inline-new-class/warnings.json b/packages/svelte/tests/validator/samples/inline-new-class/warnings.json
index 6995428bee..16f2e2c3c2 100644
--- a/packages/svelte/tests/validator/samples/inline-new-class/warnings.json
+++ b/packages/svelte/tests/validator/samples/inline-new-class/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "avoid-inline-class",
+		"code": "avoid_inline_class",
 		"message": "Avoid 'new class' — instead, declare the class at the top level scope",
 		"start": {
 			"column": 11,
diff --git a/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json b/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json
index 772140c44e..4e377fa9f1 100644
--- a/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json
+++ b/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-self-closing-tag",
+		"code": "invalid_self_closing_tag",
 		"message": "Self-closing HTML tags for non-void elements are ambiguous — use <div ...></div> rather than <div ... />",
 		"start": {
 			"line": 6,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "invalid-self-closing-tag",
+		"code": "invalid_self_closing_tag",
 		"message": "Self-closing HTML tags for non-void elements are ambiguous — use <my-thing ...></my-thing> rather than <my-thing ... />",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json b/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json
index df53ed6123..60fe159479 100644
--- a/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json
+++ b/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json
@@ -1,8 +1,14 @@
 [
 	{
 		"message": "Reactive declarations only exist at the top level of the instance script",
-		"code": "no-reactive-declaration",
-		"start": { "line": 4, "column": 1 },
-		"end": { "line": 4, "column": 23 }
+		"code": "no_reactive_declaration",
+		"start": {
+			"line": 4,
+			"column": 1
+		},
+		"end": {
+			"line": 4,
+			"column": 23
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json b/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json
index f7598524e2..452333ed98 100644
--- a/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json
+++ b/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json
@@ -1,8 +1,14 @@
 [
 	{
 		"message": "Reactive declarations only exist at the top level of the instance script",
-		"code": "no-reactive-declaration",
-		"start": { "line": 6, "column": 2 },
-		"end": { "line": 6, "column": 22 }
+		"code": "no_reactive_declaration",
+		"start": {
+			"line": 6,
+			"column": 2
+		},
+		"end": {
+			"line": 6,
+			"column": 22
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json b/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json
index 60701e30b7..f47e0e4952 100644
--- a/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json
+++ b/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "module-script-reactive-declaration",
+		"code": "module_script_reactive_declaration",
 		"message": "All dependencies of the reactive declaration are declared in a module script and will not be reactive",
 		"start": {
 			"column": 1,
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json
index 64d71823dd..08cf4a4752 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-rest-eachblock-binding",
+		"code": "invalid_rest_eachblock_binding",
 		"message": "The rest operator (...) will create a new object and binding 'rest' with the original object will not work",
-		"start": { "line": 8, "column": 27 },
-		"end": { "line": 8, "column": 31 }
+		"start": {
+			"line": 8,
+			"column": 27
+		},
+		"end": {
+			"line": 8,
+			"column": 31
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json
index cad7a4e0fe..55a2c2d7a5 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-rest-eachblock-binding",
+		"code": "invalid_rest_eachblock_binding",
 		"message": "The rest operator (...) will create a new object and binding 'rest' with the original object will not work",
-		"start": { "line": 5, "column": 35 },
-		"end": { "line": 5, "column": 39 }
+		"start": {
+			"line": 5,
+			"column": 35
+		},
+		"end": {
+			"line": 5,
+			"column": 39
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json
index e8615de680..f457198a7d 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-rest-eachblock-binding",
+		"code": "invalid_rest_eachblock_binding",
 		"end": {
 			"column": 37,
 			"line": 5
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "invalid-rest-eachblock-binding",
+		"code": "invalid_rest_eachblock_binding",
 		"end": {
 			"column": 50,
 			"line": 5
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json
index 68ae480882..0841781c7f 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json
@@ -1,8 +1,14 @@
 [
 	{
-		"code": "invalid-rest-eachblock-binding",
+		"code": "invalid_rest_eachblock_binding",
 		"message": "The rest operator (...) will create a new object and binding 'rest' with the original object will not work",
-		"start": { "line": 5, "column": 28 },
-		"end": { "line": 5, "column": 32 }
+		"start": {
+			"line": 5,
+			"column": 28
+		},
+		"end": {
+			"line": 5,
+			"column": 32
+		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json b/packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json
index ebcd065f31..f6d4927f60 100644
--- a/packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-bindable-declaration",
-		"message": "Bindable component properties are declared using $bindable() in runes mode. Did you forget to call the function?",
+		"code": "invalid_bindable_declaration",
+		"message": "Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?",
 		"start": {
 			"column": 7,
 			"line": 2
diff --git a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
index c841de3686..b7db493e68 100644
--- a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "deprecated-slot-element",
+		"code": "deprecated_slot_element",
 		"end": {
 			"column": 13,
 			"line": 11
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "deprecated-slot-element",
+		"code": "deprecated_slot_element",
 		"end": {
 			"column": 24,
 			"line": 12
@@ -24,7 +24,7 @@
 		}
 	},
 	{
-		"code": "deprecated-event-handler",
+		"code": "deprecated_event_handler",
 		"end": {
 			"column": 22,
 			"line": 13
diff --git a/packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json b/packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json
index d1900a3085..b906f65c36 100644
--- a/packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid-props-declaration",
-		"message": "Component properties are declared using $props() in runes mode. Did you forget to call the function?",
+		"code": "invalid_props_declaration",
+		"message": "Component properties are declared using `$props()` in runes mode. Did you forget to call the function?",
 		"start": {
 			"column": 5,
 			"line": 2
diff --git a/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json b/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json
index d0b8f7bd3d..bc575249f3 100644
--- a/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "non-state-reference",
-		"message": "does_need1 is updated, but is not declared with $state(...). Changing its value will not correctly trigger updates.",
+		"code": "non_state_reference",
+		"message": "`does_need1` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates",
 		"start": {
 			"column": 5,
 			"line": 3
diff --git a/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json b/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json
index 7e251a4e70..348b270bf6 100644
--- a/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "non-state-reference",
-		"message": "b is updated, but is not declared with $state(...). Changing its value will not correctly trigger updates.",
+		"code": "non_state_reference",
+		"message": "`b` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates",
 		"start": {
 			"column": 5,
 			"line": 3
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "non-state-reference",
-		"message": "c is updated, but is not declared with $state(...). Changing its value will not correctly trigger updates.",
+		"code": "non_state_reference",
+		"message": "`c` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates",
 		"start": {
 			"column": 5,
 			"line": 4
diff --git a/packages/svelte/tests/validator/samples/siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json b/packages/svelte/tests/validator/samples/siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json
index f641467e9a..7e0b05fd43 100644
--- a/packages/svelte/tests/validator/samples/siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json
+++ b/packages/svelte/tests/validator/samples/siblings-combinator-in-custom-element-selects-slot-fallback/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "css-unused-selector",
+		"code": "css_unused_selector",
 		"end": {
 			"column": 17,
 			"line": 10
diff --git a/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte b/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte
index e043fdafd3..3c644b1248 100644
--- a/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte
+++ b/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte
@@ -2,7 +2,7 @@
 	let foo;
 </script>
 
-<!-- svelte-ignore module-script-reactive-declaration -->
+<!-- svelte-ignore module_script_reactive_declaration -->
 <script>
 	$: reactive = foo;
 </script>
diff --git a/packages/svelte/tests/validator/samples/silence-warnings/input.svelte b/packages/svelte/tests/validator/samples/silence-warnings/input.svelte
index 8e1608d837..24becff683 100644
--- a/packages/svelte/tests/validator/samples/silence-warnings/input.svelte
+++ b/packages/svelte/tests/validator/samples/silence-warnings/input.svelte
@@ -3,11 +3,11 @@
 </script>
 
 <script>
-	// svelte-ignore module-script-reactive-declaration
+	// svelte-ignore module_script_reactive_declaration
 	$: reactive = foo;
 </script>
 
-<!-- svelte-ignore css-unused-selector -->
+<!-- svelte-ignore css_unused_selector -->
 <style>
 	.unused {}
 </style>
diff --git a/packages/svelte/tests/validator/samples/slot-warning-ignore/input.svelte b/packages/svelte/tests/validator/samples/slot-warning-ignore/input.svelte
index 032264aa97..3d176490be 100644
--- a/packages/svelte/tests/validator/samples/slot-warning-ignore/input.svelte
+++ b/packages/svelte/tests/validator/samples/slot-warning-ignore/input.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <Component>
-	<!-- svelte-ignore a11y-click-events-have-key-events -->
-	<!-- svelte-ignore a11y-no-static-element-interactions -->
+	<!-- svelte-ignore a11y_click_events_have_key_events -->
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
 	<div slot='foo' on:click>hi!</div>
 </Component>
diff --git a/packages/svelte/tests/validator/samples/slot-warning/input.svelte b/packages/svelte/tests/validator/samples/slot-warning/input.svelte
index d5f0e7b210..b24dc4b63e 100644
--- a/packages/svelte/tests/validator/samples/slot-warning/input.svelte
+++ b/packages/svelte/tests/validator/samples/slot-warning/input.svelte
@@ -3,6 +3,6 @@
 </script>
 
 <Component>
-	<!-- svelte-ignore a11y-no-static-element-interactions -->
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
 	<div slot='foo' on:click>hi!</div>
 </Component>
diff --git a/packages/svelte/tests/validator/samples/slot-warning/warnings.json b/packages/svelte/tests/validator/samples/slot-warning/warnings.json
index 57440d2d76..cd66eab361 100644
--- a/packages/svelte/tests/validator/samples/slot-warning/warnings.json
+++ b/packages/svelte/tests/validator/samples/slot-warning/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"column": 1,
 			"line": 7
diff --git a/packages/svelte/tests/validator/samples/slot-warning2/input.svelte b/packages/svelte/tests/validator/samples/slot-warning2/input.svelte
index e1cf63a5bf..5e129425d5 100644
--- a/packages/svelte/tests/validator/samples/slot-warning2/input.svelte
+++ b/packages/svelte/tests/validator/samples/slot-warning2/input.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <Component>
-	<!-- svelte-ignore unrelated-warning -->
-	<!-- svelte-ignore a11y-no-static-element-interactions -->
+	<!-- svelte-ignore unrelated_warning -->
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
 	<div slot='foo' on:click>hi!</div>
 </Component>
diff --git a/packages/svelte/tests/validator/samples/slot-warning2/warnings.json b/packages/svelte/tests/validator/samples/slot-warning2/warnings.json
index 7dff2657d2..24452c7e70 100644
--- a/packages/svelte/tests/validator/samples/slot-warning2/warnings.json
+++ b/packages/svelte/tests/validator/samples/slot-warning2/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"code": "a11y_click_events_have_key_events",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"column": 1,
 			"line": 8
diff --git a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
index 2961bef5f7..b0649869fc 100644
--- a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
+++ b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "static-state-reference",
+		"code": "static_state_reference",
 		"message": "State referenced in its own scope will never update. Did you mean to reference it inside a closure?",
 		"start": {
 			"column": 13,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "static-state-reference",
+		"code": "static_state_reference",
 		"message": "State referenced in its own scope will never update. Did you mean to reference it inside a closure?",
 		"start": {
 			"column": 13,
diff --git a/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json b/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json
index 58236d814b..0e894db6e1 100644
--- a/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json
+++ b/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "store-with-rune-name",
-		"message": "It looks like you're using the $state rune, but there is a local binding called state. Referencing a local variable with a $ prefix will create a store subscription. Please rename state to avoid the ambiguity.",
+		"code": "store_with_rune_name",
+		"message": "It looks like you're using the `$state` rune, but there is a local binding called `state`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `state` to avoid the ambiguity",
 		"start": {
 			"column": 1,
 			"line": 3
diff --git a/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json b/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
index 5ddce88a53..72602abb85 100644
--- a/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
+++ b/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "missing-custom-element-compile-option",
+		"code": "missing_custom_element_compile_option",
 		"message": "The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json b/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json
index e8791eb61e..0008dd1544 100644
--- a/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json
+++ b/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "unused-export-let",
+		"code": "unused_export_let",
 		"message": "Component has unused export property 'default_value_5'. If it is for external reference only, please consider using `export const default_value_5`",
 		"start": {
 			"column": 12,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "unused-export-let",
+		"code": "unused_export_let",
 		"message": "Component has unused export property 'default_value_6'. If it is for external reference only, please consider using `export const default_value_6`",
 		"start": {
 			"column": 12,
diff --git a/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json b/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json
index 9690e557ec..12b78ee572 100644
--- a/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json
+++ b/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "unused-export-let",
+		"code": "unused_export_let",
 		"end": {
 			"column": 8,
 			"line": 28
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "unused-export-let",
+		"code": "unused_export_let",
 		"end": {
 			"column": 8,
 			"line": 29
@@ -24,7 +24,7 @@
 		}
 	},
 	{
-		"code": "unused-export-let",
+		"code": "unused_export_let",
 		"end": {
 			"column": 15,
 			"line": 32
@@ -36,7 +36,7 @@
 		}
 	},
 	{
-		"code": "unused-export-let",
+		"code": "unused_export_let",
 		"end": {
 			"column": 15,
 			"line": 33
@@ -48,7 +48,7 @@
 		}
 	},
 	{
-		"code": "unused-export-let",
+		"code": "unused_export_let",
 		"end": {
 			"column": 15,
 			"line": 35
diff --git a/packages/svelte/tests/validator/samples/use-the-platform/warnings.json b/packages/svelte/tests/validator/samples/use-the-platform/warnings.json
index 2dfe6b5c8e..f62bbca540 100644
--- a/packages/svelte/tests/validator/samples/use-the-platform/warnings.json
+++ b/packages/svelte/tests/validator/samples/use-the-platform/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid-html-attribute",
+		"code": "invalid_html_attribute",
 		"message": "'className' is not a valid HTML attribute. Did you mean 'class'?",
 		"start": {
 			"column": 5,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "invalid-html-attribute",
+		"code": "invalid_html_attribute",
 		"message": "'htmlFor' is not a valid HTML attribute. Did you mean 'for'?",
 		"start": {
 			"column": 7,

From 1f04045052fabf2a3b20c77b0fedad97b2f2563a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 04:57:50 -0400
Subject: [PATCH 08/27] chore: move legacy context stuff into its own object
 (#11298)

---
 packages/svelte/src/index-client.js           | 15 ++---
 .../internal/client/dom/legacy/lifecycle.js   | 12 ++--
 .../src/internal/client/reactivity/effects.js | 14 ++---
 .../src/internal/client/reactivity/sources.js |  4 +-
 .../svelte/src/internal/client/runtime.js     | 31 ++++------
 .../svelte/src/internal/client/types.d.ts     | 62 ++++++++++++-------
 6 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js
index ba81096925..83fede3863 100644
--- a/packages/svelte/src/index-client.js
+++ b/packages/svelte/src/index-client.js
@@ -21,13 +21,13 @@ export function onMount(fn) {
 		throw new Error('onMount can only be used during component initialisation.');
 	}
 
-	if (current_component_context.r) {
+	if (current_component_context.l !== null) {
+		init_update_callbacks(current_component_context).m.push(fn);
+	} else {
 		user_effect(() => {
 			const cleanup = untrack(fn);
 			if (typeof cleanup === 'function') return /** @type {() => void} */ (cleanup);
 		});
-	} else {
-		init_update_callbacks(current_component_context).m.push(fn);
 	}
 }
 
@@ -129,7 +129,7 @@ export function beforeUpdate(fn) {
 		throw new Error('beforeUpdate can only be used during component initialisation');
 	}
 
-	if (current_component_context.r) {
+	if (current_component_context.l === null) {
 		throw new Error('beforeUpdate cannot be used in runes mode');
 	}
 
@@ -153,7 +153,7 @@ export function afterUpdate(fn) {
 		throw new Error('afterUpdate can only be used during component initialisation.');
 	}
 
-	if (current_component_context.r) {
+	if (current_component_context.l === null) {
 		throw new Error('afterUpdate cannot be used in runes mode');
 	}
 
@@ -162,10 +162,11 @@ export function afterUpdate(fn) {
 
 /**
  * Legacy-mode: Init callbacks object for onMount/beforeUpdate/afterUpdate
- * @param {import('./internal/client/types.js').ComponentContext} context
+ * @param {import('#client').ComponentContext} context
  */
 function init_update_callbacks(context) {
-	return (context.u ??= { a: [], b: [], m: [] });
+	var l = /** @type {import('#client').ComponentContextLegacy} */ (context).l;
+	return (l.u ??= { a: [], b: [], m: [] });
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/dom/legacy/lifecycle.js b/packages/svelte/src/internal/client/dom/legacy/lifecycle.js
index c8a2b72d69..ae4c66ccbb 100644
--- a/packages/svelte/src/internal/client/dom/legacy/lifecycle.js
+++ b/packages/svelte/src/internal/client/dom/legacy/lifecycle.js
@@ -14,9 +14,11 @@ import {
  * Legacy-mode only: Call `onMount` callbacks and set up `beforeUpdate`/`afterUpdate` effects
  */
 export function init() {
-	const context = /** @type {import('#client').ComponentContext} */ (current_component_context);
-	const callbacks = context.u;
+	const context = /** @type {import('#client').ComponentContextLegacy} */ (
+		current_component_context
+	);
 
+	const callbacks = context.l.u;
 	if (!callbacks) return;
 
 	// beforeUpdate
@@ -58,11 +60,11 @@ export function init() {
 /**
  * Invoke the getter of all signals associated with a component
  * so they can be registered to the effect this function is called in.
- * @param {import('#client').ComponentContext} context
+ * @param {import('#client').ComponentContextLegacy} context
  */
 function observe_all(context) {
-	if (context.d) {
-		for (const signal of context.d) get(signal);
+	if (context.l.s) {
+		for (const signal of context.l.s) get(signal);
 	}
 
 	deep_read_state(context.s);
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 515d13136e..2d2ec5e19c 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -182,11 +182,11 @@ export function effect(fn) {
  * @param {() => void | (() => void)} fn
  */
 export function legacy_pre_effect(deps, fn) {
-	var context = /** @type {import('#client').ComponentContext} */ (current_component_context);
+	var context = /** @type {import('#client').ComponentContextLegacy} */ (current_component_context);
 
 	/** @type {{ effect: null | import('#client').Effect, ran: boolean }} */
 	var token = { effect: null, ran: false };
-	context.l1.push(token);
+	context.l.r1.push(token);
 
 	token.effect = render_effect(() => {
 		deps();
@@ -196,19 +196,19 @@ export function legacy_pre_effect(deps, fn) {
 		if (token.ran) return;
 
 		token.ran = true;
-		set(context.l2, true);
+		set(context.l.r2, true);
 		untrack(fn);
 	});
 }
 
 export function legacy_pre_effect_reset() {
-	var context = /** @type {import('#client').ComponentContext} */ (current_component_context);
+	var context = /** @type {import('#client').ComponentContextLegacy} */ (current_component_context);
 
 	render_effect(() => {
-		if (!get(context.l2)) return;
+		if (!get(context.l.r2)) return;
 
 		// Run dirty `$:` statements
-		for (var token of context.l1) {
+		for (var token of context.l.r1) {
 			var effect = token.effect;
 
 			if (check_dirtiness(effect)) {
@@ -218,7 +218,7 @@ export function legacy_pre_effect_reset() {
 			token.ran = false;
 		}
 
-		context.l2.v = false; // set directly to avoid rerunning this effect
+		context.l.r2.v = false; // set directly to avoid rerunning this effect
 	});
 }
 
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 6ad3240d5e..1b955c42dc 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -55,8 +55,8 @@ export function mutable_source(initial_value) {
 
 	// bind the signal to the component context, in case we need to
 	// track updates to trigger beforeUpdate/afterUpdate callbacks
-	if (current_component_context) {
-		(current_component_context.d ??= []).push(s);
+	if (current_component_context !== null && current_component_context.l !== null) {
+		(current_component_context.l.s ??= []).push(s);
 	}
 
 	return s;
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 22038cce70..e8233fbc90 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -115,7 +115,7 @@ export function set_current_component_context(context) {
 
 /** @returns {boolean} */
 export function is_runes() {
-	return current_component_context !== null && current_component_context.r;
+	return current_component_context !== null && current_component_context.l === null;
 }
 
 /**
@@ -1043,29 +1043,24 @@ export async function value_or_fallback_async(value, fallback) {
  */
 export function push(props, runes = false, fn) {
 	current_component_context = {
-		// exports (and props, if `accessors: true`)
-		x: null,
-		// context
+		p: current_component_context,
 		c: null,
-		// effects
 		e: null,
-		// mounted
 		m: false,
-		// parent
-		p: current_component_context,
-		// signals
-		d: null,
-		// props
 		s: props,
-		// runes
-		r: runes,
-		// legacy $:
-		l1: [],
-		l2: source(false),
-		// update_callbacks
-		u: null
+		x: null,
+		l: null
 	};
 
+	if (!runes) {
+		current_component_context.l = {
+			s: null,
+			u: null,
+			r1: [],
+			r2: source(false)
+		};
+	}
+
 	if (DEV) {
 		// component function
 		// @ts-expect-error
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index e1568494a1..dc9672bc0d 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -10,37 +10,51 @@ export type EventCallbackMap = Record<string, EventCallback | EventCallback[]>;
 // when the JS VM JITs the code.
 
 export type ComponentContext = {
-	/** local signals (needed for beforeUpdate/afterUpdate) */
-	d: null | Source[];
-	/** props */
-	s: Record<string, unknown>;
-	/** exports (and props, if `accessors: true`) */
-	x: Record<string, any> | null;
-	/** deferred effects */
-	e: null | Array<() => void | (() => void)>;
-	/** mounted */
-	m: boolean;
 	/** parent */
 	p: null | ComponentContext;
 	/** context */
 	c: null | Map<unknown, unknown>;
-	/** runes */
-	r: boolean;
-	/** legacy mode: if `$:` statements are allowed to run (ensures they only run once per render) */
-	l1: any[];
-	/** legacy mode: if `$:` statements are allowed to run (ensures they only run once per render) */
-	l2: Source<boolean>;
-	/** update_callbacks */
-	u: null | {
-		/** afterUpdate callbacks */
-		a: Array<() => void>;
-		/** beforeUpdate callbacks */
-		b: Array<() => void>;
-		/** onMount callbacks */
-		m: Array<() => any>;
+	/** deferred effects */
+	e: null | Array<() => void | (() => void)>;
+	/** mounted */
+	m: boolean;
+	/**
+	 * props — needed for legacy mode lifecycle functions, and for `createEventDispatcher`
+	 * @deprecated remove in 6.0
+	 */
+	s: Record<string, unknown>;
+	/**
+	 * exports (and props, if `accessors: true`) — needed for `createEventDispatcher`
+	 * @deprecated remove in 6.0
+	 */
+	x: Record<string, any> | null;
+	/**
+	 * legacy stuff
+	 * @deprecated remove in 6.0
+	 */
+	l: null | {
+		/** local signals (needed for beforeUpdate/afterUpdate) */
+		s: null | Source[];
+		/** update_callbacks */
+		u: null | {
+			/** afterUpdate callbacks */
+			a: Array<() => void>;
+			/** beforeUpdate callbacks */
+			b: Array<() => void>;
+			/** onMount callbacks */
+			m: Array<() => any>;
+		};
+		/** `$:` statements */
+		r1: any[];
+		/** This tracks whether `$:` statements have run in the current cycle, to ensure they only run once */
+		r2: Source<boolean>;
 	};
 };
 
+export type ComponentContextLegacy = ComponentContext & {
+	l: NonNullable<ComponentContext['l']>;
+};
+
 export type Equals = (this: Value, value: unknown) => boolean;
 
 export type TemplateNode = Text | Element | Comment;

From f6dfac985cf0ad4ae5f2e5cb740ca847def692ab Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 24 Apr 2024 10:59:16 +0200
Subject: [PATCH 09/27] feat: `Bindable` types (#11225)

This is a typings PR and the companion PR to sveltejs/language-tools#2336

It introduces two new types:
- Binding: Marks a property as being bound (i.e. you must do bind:x)
- Bindable: Marks a property as being able to be bound (i.e. you can do bind:x)

Language tools then uses this generate code accordingly which then generates type errors.

All the other type gymnastics are there to ensure that you don't interact with these bindable types when using mount or hydrate or ComponentProps<MyComponent>, i.e. these two types should be mostly opaque for day-to-day users.

For backwards-compatibility, all properties are automatically wrapped with Bindable, which means existing type definition files will continue to work from a types perspective. Language tools opts into strict bindability by providing its own constructor definition for all generated classes in runes mode which omits the "wrap everything with bindable" behavior.
---
 .changeset/pink-goats-promise.md              |  5 ++
 packages/svelte/src/compiler/index.js         | 26 +++++++
 packages/svelte/src/index.d.ts                | 50 +++++++++---
 packages/svelte/src/internal/client/render.js | 17 ++---
 .../svelte/src/internal/client/types.d.ts     |  1 +
 packages/svelte/src/internal/types.d.ts       |  6 ++
 packages/svelte/tests/types/component.ts      | 55 +++++++++++++-
 packages/svelte/types/index.d.ts              | 76 ++++++++++++++-----
 8 files changed, 193 insertions(+), 43 deletions(-)
 create mode 100644 .changeset/pink-goats-promise.md

diff --git a/.changeset/pink-goats-promise.md b/.changeset/pink-goats-promise.md
new file mode 100644
index 0000000000..fa04e56ef2
--- /dev/null
+++ b/.changeset/pink-goats-promise.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+feat: introduce types to express bindability
diff --git a/packages/svelte/src/compiler/index.js b/packages/svelte/src/compiler/index.js
index c2516a2e5f..97dcc364f0 100644
--- a/packages/svelte/src/compiler/index.js
+++ b/packages/svelte/src/compiler/index.js
@@ -104,6 +104,32 @@ function handle_compile_error(error, filename, source) {
 	throw error;
 }
 
+/**
+ * The parse function parses a component, returning only its abstract syntax tree.
+ *
+ * The `modern` option (`false` by default in Svelte 5) makes the parser return a modern AST instead of the legacy AST.
+ * `modern` will become `true` by default in Svelte 6, and the option will be removed in Svelte 7.
+ *
+ * https://svelte.dev/docs/svelte-compiler#svelte-parse
+ * @overload
+ * @param {string} source
+ * @param {{ filename?: string; modern: true }} options
+ * @returns {import('#compiler').Root}
+ */
+
+/**
+ * The parse function parses a component, returning only its abstract syntax tree.
+ *
+ * The `modern` option (`false` by default in Svelte 5) makes the parser return a modern AST instead of the legacy AST.
+ * `modern` will become `true` by default in Svelte 6, and the option will be removed in Svelte 7.
+ *
+ * https://svelte.dev/docs/svelte-compiler#svelte-parse
+ * @overload
+ * @param {string} source
+ * @param {{ filename?: string; modern?: false }} [options]
+ * @returns {import('./types/legacy-nodes.js').LegacyRoot}
+ */
+
 /**
  * The parse function parses a component, returning only its abstract syntax tree.
  *
diff --git a/packages/svelte/src/index.d.ts b/packages/svelte/src/index.d.ts
index 5239d05f02..2c1b5287d4 100644
--- a/packages/svelte/src/index.d.ts
+++ b/packages/svelte/src/index.d.ts
@@ -1,5 +1,8 @@
 // This should contain all the public interfaces (not all of them are actually importable, check current Svelte for which ones are).
 
+import './ambient.js';
+import type { RemoveBindable } from './internal/types.js';
+
 /**
  * @deprecated Svelte components were classes in Svelte 4. In Svelte 5, thy are not anymore.
  * Use `mount` or `createRoot` instead to instantiate components.
@@ -18,13 +21,37 @@ export interface ComponentConstructorOptions<
 	$$inline?: boolean;
 }
 
-// Utility type for ensuring backwards compatibility on a type level: If there's a default slot, add 'children' to the props if it doesn't exist there already
-type PropsWithChildren<Props, Slots> = Props &
-	(Props extends { children?: any }
-		? {}
-		: Slots extends { default: any }
-			? { children?: Snippet }
-			: {});
+/** Tooling for types uses this for properties are being used with `bind:` */
+export type Binding<T> = { 'bind:': T };
+/**
+ * Tooling for types uses this for properties that may be bound to.
+ * Only use this if you author Svelte component type definition files by hand (we recommend using `@sveltejs/package` instead).
+ * Example:
+ * ```ts
+ * export class MyComponent extends SvelteComponent<{ readonly: string, bindable: Bindable<string> }> {}
+ * ```
+ * means you can now do `<MyComponent {readonly} bind:bindable />`
+ */
+export type Bindable<T> = T | Binding<T>;
+
+type WithBindings<T> = {
+	[Key in keyof T]: Bindable<T[Key]>;
+};
+
+/**
+ * Utility type for ensuring backwards compatibility on a type level:
+ * - If there's a default slot, add 'children' to the props
+ * - All props are bindable
+ */
+type PropsWithChildren<Props, Slots> = WithBindings<Props> &
+	(Slots extends { default: any }
+		? // This is unfortunate because it means "accepts no props" turns into "accepts any prop"
+			// but the alternative is non-fixable type errors because of the way TypeScript index
+			// signatures work (they will always take precedence and make an impossible-to-satisfy children type).
+			Props extends Record<string, never>
+			? any
+			: { children?: any }
+		: {});
 
 /**
  * Can be used to create strongly typed Svelte components.
@@ -55,7 +82,7 @@ type PropsWithChildren<Props, Slots> = Props &
  * for more info.
  */
 export class SvelteComponent<
-	Props extends Record<string, any> = any,
+	Props extends Record<string, any> = Record<string, any>,
 	Events extends Record<string, any> = any,
 	Slots extends Record<string, any> = any
 > {
@@ -74,7 +101,7 @@ export class SvelteComponent<
 	 * Does not exist at runtime.
 	 * ### DO NOT USE!
 	 * */
-	$$prop_def: PropsWithChildren<Props, Slots>;
+	$$prop_def: RemoveBindable<Props>; // Without PropsWithChildren: unnecessary, causes type bugs
 	/**
 	 * For type checking capabilities only.
 	 * Does not exist at runtime.
@@ -119,7 +146,7 @@ export class SvelteComponent<
  * @deprecated Use `SvelteComponent` instead. See TODO for more information.
  */
 export class SvelteComponentTyped<
-	Props extends Record<string, any> = any,
+	Props extends Record<string, any> = Record<string, any>,
 	Events extends Record<string, any> = any,
 	Slots extends Record<string, any> = any
 > extends SvelteComponent<Props, Events, Slots> {}
@@ -154,7 +181,7 @@ export type ComponentEvents<Comp extends SvelteComponent> =
  * ```
  */
 export type ComponentProps<Comp extends SvelteComponent> =
-	Comp extends SvelteComponent<infer Props> ? Props : never;
+	Comp extends SvelteComponent<infer Props> ? RemoveBindable<Props> : never;
 
 /**
  * Convenience type to get the type of a Svelte component. Useful for example in combination with
@@ -226,4 +253,3 @@ export interface EventDispatcher<EventMap extends Record<string, any>> {
 }
 
 export * from './index-client.js';
-import './ambient.js';
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index f9c4dbf1a7..c1b1316cca 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -92,7 +92,7 @@ export function stringify(value) {
  * @param {{
  * 		target: Document | Element | ShadowRoot;
  * 		anchor?: Node;
- * 		props?: Props;
+ * 		props?: import('../types.js').RemoveBindable<Props>;
  * 		events?: { [Property in keyof Events]: (e: Events[Property]) => any };
  * 		context?: Map<any, any>;
  * 		intro?: boolean;
@@ -114,7 +114,7 @@ export function mount(component, options) {
  * @param {import('../../index.js').ComponentType<import('../../index.js').SvelteComponent<Props, Events>>} component
  * @param {{
  * 		target: Document | Element | ShadowRoot;
- * 		props?: Props;
+ * 		props?: import('../types.js').RemoveBindable<Props>;
  * 		events?: { [Property in keyof Events]: (e: Events[Property]) => any };
  *  	context?: Map<any, any>;
  * 		intro?: boolean;
@@ -181,24 +181,19 @@ export function hydrate(component, options) {
 }
 
 /**
- * @template {Record<string, any>} Props
  * @template {Record<string, any>} Exports
- * @template {Record<string, any>} Events
- * @param {import('../../index.js').ComponentType<import('../../index.js').SvelteComponent<Props, Events>>} Component
+ * @param {import('../../index.js').ComponentType<import('../../index.js').SvelteComponent<any>>} Component
  * @param {{
  * 		target: Document | Element | ShadowRoot;
  * 		anchor: Node;
- * 		props?: Props;
- * 		events?: { [Property in keyof Events]: (e: Events[Property]) => any };
+ * 		props?: any;
+ * 		events?: any;
  * 		context?: Map<any, any>;
  * 		intro?: boolean;
  * 	}} options
  * @returns {Exports}
  */
-function _mount(
-	Component,
-	{ target, anchor, props = /** @type {Props} */ ({}), events, context, intro = false }
-) {
+function _mount(Component, { target, anchor, props = {}, events, context, intro = false }) {
 	init_operations();
 
 	const registered_events = new Set();
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index dc9672bc0d..aa2a3321b8 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -1,3 +1,4 @@
+import type { Bindable, Binding } from '../../index.js';
 import type { Store } from '#shared';
 import { STATE_SYMBOL } from './constants.js';
 import type { Effect, Source, Value } from './reactivity/types.js';
diff --git a/packages/svelte/src/internal/types.d.ts b/packages/svelte/src/internal/types.d.ts
index 12b2e5d4fb..1508f2ac84 100644
--- a/packages/svelte/src/internal/types.d.ts
+++ b/packages/svelte/src/internal/types.d.ts
@@ -1,2 +1,8 @@
+import type { Bindable } from '../index.js';
+
 /** Anything except a function */
 export type NotFunction<T> = T extends Function ? never : T;
+
+export type RemoveBindable<Props extends Record<string, any>> = {
+	[Key in keyof Props]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
+};
diff --git a/packages/svelte/tests/types/component.ts b/packages/svelte/tests/types/component.ts
index 55477441bb..affb2f36fb 100644
--- a/packages/svelte/tests/types/component.ts
+++ b/packages/svelte/tests/types/component.ts
@@ -5,7 +5,10 @@ import {
 	type ComponentProps,
 	type ComponentType,
 	mount,
-	hydrate
+	hydrate,
+	type Bindable,
+	type Binding,
+	type ComponentConstructorOptions
 } from 'svelte';
 
 SvelteComponent.element === HTMLElement;
@@ -174,3 +177,53 @@ const x: typeof asLegacyComponent = createClassComponent({
 	hydrate: true,
 	component: NewComponent
 });
+
+// --------------------------------------------------------------------------- bindable
+
+// Test that
+// - everything's bindable unless the component constructor is specifically set telling otherwise (for backwards compatibility)
+// - when using mount etc the props are never bindable because this is language-tools only concept
+
+function binding<T>(value: T): Binding<T> {
+	return value as any;
+}
+
+class Explicit extends SvelteComponent<{
+	foo: string;
+	bar: Bindable<boolean>;
+}> {
+	constructor(options: ComponentConstructorOptions<{ foo: string; bar: Bindable<boolean> }>) {
+		super(options);
+	}
+}
+new Explicit({ target: null as any, props: { foo: 'foo', bar: binding(true) } });
+new Explicit({ target: null as any, props: { foo: 'foo', bar: true } });
+new Explicit({
+	target: null as any,
+	props: {
+		// @ts-expect-error
+		foo: binding(''),
+		bar: true
+	}
+});
+mount(Explicit, { target: null as any, props: { foo: 'foo', bar: true } });
+mount(Explicit, {
+	target: null as any,
+	props: {
+		// @ts-expect-error
+		bar: binding(true)
+	}
+});
+
+class Implicit extends SvelteComponent<{ foo: string; bar: boolean }> {}
+new Implicit({ target: null as any, props: { foo: 'foo', bar: true } });
+new Implicit({ target: null as any, props: { foo: binding(''), bar: binding(true) } });
+mount(Implicit, { target: null as any, props: { foo: 'foo', bar: true } });
+mount(Implicit, {
+	target: null as any,
+	props: {
+		foo: 'foo',
+		// @ts-expect-error
+		bar: binding(true)
+	}
+});
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 5563610b94..c5c91e67cc 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -1,6 +1,4 @@
 declare module 'svelte' {
-	// This should contain all the public interfaces (not all of them are actually importable, check current Svelte for which ones are).
-
 	/**
 	 * @deprecated Svelte components were classes in Svelte 4. In Svelte 5, thy are not anymore.
 	 * Use `mount` or `createRoot` instead to instantiate components.
@@ -19,13 +17,37 @@ declare module 'svelte' {
 		$$inline?: boolean;
 	}
 
-	// Utility type for ensuring backwards compatibility on a type level: If there's a default slot, add 'children' to the props if it doesn't exist there already
-	type PropsWithChildren<Props, Slots> = Props &
-		(Props extends { children?: any }
-			? {}
-			: Slots extends { default: any }
-				? { children?: Snippet }
-				: {});
+	/** Tooling for types uses this for properties are being used with `bind:` */
+	export type Binding<T> = { 'bind:': T };
+	/**
+	 * Tooling for types uses this for properties that may be bound to.
+	 * Only use this if you author Svelte component type definition files by hand (we recommend using `@sveltejs/package` instead).
+	 * Example:
+	 * ```ts
+	 * export class MyComponent extends SvelteComponent<{ readonly: string, bindable: Bindable<string> }> {}
+	 * ```
+	 * means you can now do `<MyComponent {readonly} bind:bindable />`
+	 */
+	export type Bindable<T> = T | Binding<T>;
+
+	type WithBindings<T> = {
+		[Key in keyof T]: Bindable<T[Key]>;
+	};
+
+	/**
+	 * Utility type for ensuring backwards compatibility on a type level:
+	 * - If there's a default slot, add 'children' to the props
+	 * - All props are bindable
+	 */
+	type PropsWithChildren<Props, Slots> = WithBindings<Props> &
+		(Slots extends { default: any }
+			? // This is unfortunate because it means "accepts no props" turns into "accepts any prop"
+				// but the alternative is non-fixable type errors because of the way TypeScript index
+				// signatures work (they will always take precedence and make an impossible-to-satisfy children type).
+				Props extends Record<string, never>
+				? any
+				: { children?: any }
+			: {});
 
 	/**
 	 * Can be used to create strongly typed Svelte components.
@@ -56,7 +78,7 @@ declare module 'svelte' {
 	 * for more info.
 	 */
 	export class SvelteComponent<
-		Props extends Record<string, any> = any,
+		Props extends Record<string, any> = Record<string, any>,
 		Events extends Record<string, any> = any,
 		Slots extends Record<string, any> = any
 	> {
@@ -75,7 +97,7 @@ declare module 'svelte' {
 		 * Does not exist at runtime.
 		 * ### DO NOT USE!
 		 * */
-		$$prop_def: PropsWithChildren<Props, Slots>;
+		$$prop_def: RemoveBindable<Props>; // Without PropsWithChildren: unnecessary, causes type bugs
 		/**
 		 * For type checking capabilities only.
 		 * Does not exist at runtime.
@@ -120,7 +142,7 @@ declare module 'svelte' {
 	 * @deprecated Use `SvelteComponent` instead. See TODO for more information.
 	 */
 	export class SvelteComponentTyped<
-		Props extends Record<string, any> = any,
+		Props extends Record<string, any> = Record<string, any>,
 		Events extends Record<string, any> = any,
 		Slots extends Record<string, any> = any
 	> extends SvelteComponent<Props, Events, Slots> {}
@@ -155,7 +177,7 @@ declare module 'svelte' {
 	 * ```
 	 */
 	export type ComponentProps<Comp extends SvelteComponent> =
-		Comp extends SvelteComponent<infer Props> ? Props : never;
+		Comp extends SvelteComponent<infer Props> ? RemoveBindable<Props> : never;
 
 	/**
 	 * Convenience type to get the type of a Svelte component. Useful for example in combination with
@@ -225,6 +247,12 @@ declare module 'svelte' {
 					: [type: Type, parameter: EventMap[Type], options?: DispatchOptions]
 		): boolean;
 	}
+	/** Anything except a function */
+	type NotFunction<T> = T extends Function ? never : T;
+
+	type RemoveBindable<Props extends Record<string, any>> = {
+		[Key in keyof Props]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
+	};
 	/**
 	 * The `onMount` function schedules a callback to run as soon as the component has been mounted to the DOM.
 	 * It must be called during the component's initialisation (but doesn't need to live *inside* the component;
@@ -295,8 +323,6 @@ declare module 'svelte' {
 	 * Synchronously flushes any pending state changes and those that result from it.
 	 * */
 	export function flushSync(fn?: (() => void) | undefined): void;
-	/** Anything except a function */
-	type NotFunction<T> = T extends Function ? never : T;
 	/**
 	 * Mounts a component to the given target and returns the exports and potentially the props (if compiled with `accessors: true`) of the component
 	 *
@@ -304,7 +330,7 @@ declare module 'svelte' {
 	export function mount<Props extends Record<string, any>, Exports extends Record<string, any>, Events extends Record<string, any>>(component: ComponentType<SvelteComponent<Props, Events, any>>, options: {
 		target: Document | Element | ShadowRoot;
 		anchor?: Node | undefined;
-		props?: Props | undefined;
+		props?: RemoveBindable<Props> | undefined;
 		events?: { [Property in keyof Events]: (e: Events[Property]) => any; } | undefined;
 		context?: Map<any, any> | undefined;
 		intro?: boolean | undefined;
@@ -315,7 +341,7 @@ declare module 'svelte' {
 	 * */
 	export function hydrate<Props extends Record<string, any>, Exports extends Record<string, any>, Events extends Record<string, any>>(component: ComponentType<SvelteComponent<Props, Events, any>>, options: {
 		target: Document | Element | ShadowRoot;
-		props?: Props | undefined;
+		props?: RemoveBindable<Props> | undefined;
 		events?: { [Property in keyof Events]: (e: Events[Property]) => any; } | undefined;
 		context?: Map<any, any> | undefined;
 		intro?: boolean | undefined;
@@ -492,6 +518,18 @@ declare module 'svelte/compiler' {
 	 * @param source The component source code
 	 * */
 	export function compileModule(source: string, options: ModuleCompileOptions): CompileResult;
+	/**
+	 * The parse function parses a component, returning only its abstract syntax tree.
+	 *
+	 * The `modern` option (`false` by default in Svelte 5) makes the parser return a modern AST instead of the legacy AST.
+	 * `modern` will become `true` by default in Svelte 6, and the option will be removed in Svelte 7.
+	 *
+	 * https://svelte.dev/docs/svelte-compiler#svelte-parse
+	 * */
+	export function parse(source: string, options: {
+		filename?: string;
+		modern: true;
+	}): Root;
 	/**
 	 * The parse function parses a component, returning only its abstract syntax tree.
 	 *
@@ -502,8 +540,8 @@ declare module 'svelte/compiler' {
 	 * */
 	export function parse(source: string, options?: {
 		filename?: string | undefined;
-		modern?: boolean | undefined;
-	} | undefined): Root | LegacyRoot;
+		modern?: false | undefined;
+	} | undefined): LegacyRoot;
 	/**
 	 * @deprecated Replace this with `import { walk } from 'estree-walker'`
 	 * */

From eea5c8ff9573e3cc4938ed45c73ca594840ef8ea Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 06:10:49 -0400
Subject: [PATCH 10/27] chore: handle option warnings the same as others
 (#11303)

---
 .../messages/compile-warnings/options.md      | 24 +++++++++-
 .../templates/compile-warnings.js             |  2 +-
 .../src/compiler/phases/2-analyze/index.js    |  2 +-
 .../svelte/src/compiler/validate-options.js   | 43 +++++++----------
 packages/svelte/src/compiler/warnings.js      | 48 +++++++++++++++++--
 .../warnings.json                             |  4 +-
 6 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/packages/svelte/messages/compile-warnings/options.md b/packages/svelte/messages/compile-warnings/options.md
index 0b970fb26c..ed69b9f421 100644
--- a/packages/svelte/messages/compile-warnings/options.md
+++ b/packages/svelte/messages/compile-warnings/options.md
@@ -1,3 +1,23 @@
-## missing_custom_element_compile_option
+## options_deprecated_immutable
 
-The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?
+The `immutable` option has been deprecated. It will have no effect in runes mode
+
+## options_missing_custom_element
+
+The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?
+
+## options_renamed_ssr_dom
+
+`generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
+
+## options_removed_enable_sourcemap
+
+The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them
+
+## options_removed_hydratable
+
+The `hydratable` option has been removed. Svelte components are always hydratable now
+
+## options_removed_loop_guard_timeout
+
+The `loopGuardTimeout` option has been removed
diff --git a/packages/svelte/scripts/process-messages/templates/compile-warnings.js b/packages/svelte/scripts/process-messages/templates/compile-warnings.js
index e9a0ad3a7d..cac547de60 100644
--- a/packages/svelte/scripts/process-messages/templates/compile-warnings.js
+++ b/packages/svelte/scripts/process-messages/templates/compile-warnings.js
@@ -31,7 +31,7 @@ export function reset_warnings(options) {
  */
 function w(node, code, message) {
 	// @ts-expect-error
-	if (node.ignores?.has(code)) return;
+	if (node?.ignores?.has(code)) return;
 
 	warnings.push({
 		code,
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 848ea4ebfa..fad0061551 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -396,7 +396,7 @@ export function analyze_component(root, source, options) {
 	};
 
 	if (!options.customElement && root.options?.customElement) {
-		w.missing_custom_element_compile_option(root.options);
+		w.options_missing_custom_element(root.options);
 	}
 
 	if (analysis.runes) {
diff --git a/packages/svelte/src/compiler/validate-options.js b/packages/svelte/src/compiler/validate-options.js
index d9b0e9b1c3..157ea6fd35 100644
--- a/packages/svelte/src/compiler/validate-options.js
+++ b/packages/svelte/src/compiler/validate-options.js
@@ -1,4 +1,5 @@
 import * as e from './errors.js';
+import * as w from './warnings.js';
 
 /**
  * @template [Input=any]
@@ -13,9 +14,7 @@ const common = {
 
 	generate: validator('client', (input, keypath) => {
 		if (input === 'dom' || input === 'ssr') {
-			warn(
-				'`generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively'
-			);
+			warn_once(w.options_renamed_ssr_dom);
 			return input === 'dom' ? 'client' : 'server';
 		}
 
@@ -72,16 +71,13 @@ export const validate_component_options =
 
 			discloseVersion: boolean(true),
 
-			immutable: deprecate(
-				'The immutable option has been deprecated. It has no effect in runes mode.',
-				boolean(false)
-			),
+			immutable: deprecate(w.options_deprecated_immutable, boolean(false)),
 
 			legacy: object({
 				componentApi: boolean(false)
 			}),
 
-			loopGuardTimeout: warn_removed('The loopGuardTimeout option has been removed.'),
+			loopGuardTimeout: warn_removed(w.options_removed_loop_guard_timeout),
 
 			name: string(undefined),
 
@@ -103,12 +99,8 @@ export const validate_component_options =
 				return input;
 			}),
 
-			enableSourcemap: warn_removed(
-				'The enableSourcemap option has been removed. Source maps are always generated now, and tooling can choose to ignore them.'
-			),
-			hydratable: warn_removed(
-				'The hydratable option has been removed. Svelte components are always hydratable now.'
-			),
+			enableSourcemap: warn_removed(w.options_removed_enable_sourcemap),
+			hydratable: warn_removed(w.options_removed_hydratable),
 			format: removed(
 				'The format option has been removed in Svelte 4, the compiler only outputs ESM now. Remove "format" from your compiler options. ' +
 					'If you did not set this yourself, bump the version of your bundler plugin (vite-plugin-svelte/rollup-plugin-svelte/svelte-loader)'
@@ -149,34 +141,33 @@ function removed(msg) {
 
 const warned = new Set();
 
-/** @param {string} message */
-function warn(message) {
-	if (!warned.has(message)) {
-		warned.add(message);
-		// eslint-disable-next-line no-console
-		console.warn(message);
+/** @param {(node: null) => void} fn */
+function warn_once(fn) {
+	if (!warned.has(fn)) {
+		warned.add(fn);
+		fn(null);
 	}
 }
 
 /**
- * @param {string} message
+ * @param {(node: null) => void} fn
  * @returns {Validator}
  */
-function warn_removed(message) {
+function warn_removed(fn) {
 	return (input) => {
-		if (input !== undefined) warn(message);
+		if (input !== undefined) warn_once(fn);
 		return /** @type {any} */ (undefined);
 	};
 }
 
 /**
- * @param {string} message
+ * @param {(node: null) => void} fn
  * @param {Validator} validator
  * @returns {Validator}
  */
-function deprecate(message, validator) {
+function deprecate(fn, validator) {
 	return (input, keypath) => {
-		if (input !== undefined) warn(message);
+		if (input !== undefined) warn_once(fn);
 		return validator(input, keypath);
 	};
 }
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index 1e71aa51a6..d4a41de1a1 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -29,7 +29,7 @@ export function reset_warnings(options) {
  */
 function w(node, code, message) {
 	// @ts-expect-error
-	if (node.ignores?.has(code)) return;
+	if (node?.ignores?.has(code)) return;
 
 	warnings.push({
 		code,
@@ -545,11 +545,51 @@ export function invalid_self_closing_tag(node, name) {
 }
 
 /**
- * The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?
+ * The `immutable` option has been deprecated. It will have no effect in runes mode
  * @param {null | NodeLike} node
  */
-export function missing_custom_element_compile_option(node) {
-	w(node, "missing_custom_element_compile_option", "The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?");
+export function options_deprecated_immutable(node) {
+	w(node, "options_deprecated_immutable", "The `immutable` option has been deprecated. It will have no effect in runes mode");
+}
+
+/**
+ * The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?
+ * @param {null | NodeLike} node
+ */
+export function options_missing_custom_element(node) {
+	w(node, "options_missing_custom_element", "The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?");
+}
+
+/**
+ * `generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
+ * @param {null | NodeLike} node
+ */
+export function options_renamed_ssr_dom(node) {
+	w(node, "options_renamed_ssr_dom", "`generate: \"dom\"` and `generate: \"ssr\"` options have been renamed to \"client\" and \"server\" respectively");
+}
+
+/**
+ * The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them
+ * @param {null | NodeLike} node
+ */
+export function options_removed_enable_sourcemap(node) {
+	w(node, "options_removed_enable_sourcemap", "The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them");
+}
+
+/**
+ * The `hydratable` option has been removed. Svelte components are always hydratable now
+ * @param {null | NodeLike} node
+ */
+export function options_removed_hydratable(node) {
+	w(node, "options_removed_hydratable", "The `hydratable` option has been removed. Svelte components are always hydratable now");
+}
+
+/**
+ * The `loopGuardTimeout` option has been removed
+ * @param {null | NodeLike} node
+ */
+export function options_removed_loop_guard_timeout(node) {
+	w(node, "options_removed_loop_guard_timeout", "The `loopGuardTimeout` option has been removed");
 }
 
 /**
diff --git a/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json b/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
index 72602abb85..bdc1d737b8 100644
--- a/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
+++ b/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "missing_custom_element_compile_option",
-		"message": "The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
+		"code": "options_missing_custom_element",
+		"message": "The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?",
 		"start": {
 			"line": 1,
 			"column": 0

From 880886061dc0a18fecace3e820fdacb2cca9b4bc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:21:28 +0200
Subject: [PATCH 11/27] Version Packages (next) (#11307)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json            | 1 +
 packages/svelte/CHANGELOG.md   | 6 ++++++
 packages/svelte/package.json   | 2 +-
 packages/svelte/src/version.js | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 300038c872..b2c7662242 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -262,6 +262,7 @@
     "orange-dingos-poke",
     "orange-yaks-protect",
     "pink-bikes-agree",
+    "pink-goats-promise",
     "pink-mayflies-tie",
     "plenty-starfishes-dress",
     "polite-dolphins-care",
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 0e57787e43..ded0371eb1 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.0.0-next.114
+
+### Patch Changes
+
+- feat: introduce types to express bindability ([#11225](https://github.com/sveltejs/svelte/pull/11225))
+
 ## 5.0.0-next.113
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index ff2640b432..fc855d1be2 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.113",
+  "version": "5.0.0-next.114",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 81de554c27..baad214843 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -6,5 +6,5 @@
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-export const VERSION = '5.0.0-next.113';
+export const VERSION = '5.0.0-next.114';
 export const PUBLIC_VERSION = '5';

From 94b4268ce30078cdb29f5af3e12b671005718d09 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 09:30:55 -0400
Subject: [PATCH 12/27] chore: markdown runtime errors/warnings (#11304)

* chore: markdown runtime warnings

* on second thoughts

* start adding errors too

* lint

* centralise
---
 .prettierignore                               |  3 ++
 eslint.config.js                              |  3 ++
 .../svelte/messages/client-errors/effects.md  |  3 ++
 .../messages/client-errors/lifecycle.md       |  7 +++
 .../messages/client-warnings/warnings.md      |  7 +++
 .../messages/shared-warnings/warnings.md      |  3 ++
 .../svelte/scripts/process-messages/index.js  |  4 ++
 .../templates/client-errors.js                | 17 ++++++
 .../templates/client-warnings.js              | 17 ++++++
 .../templates/shared-warnings.js              | 19 +++++++
 packages/svelte/src/index-client.js           | 13 ++---
 .../src/internal/client/dev/ownership.js      |  7 ++-
 packages/svelte/src/internal/client/errors.js | 53 +++++++++++++++++++
 packages/svelte/src/internal/client/render.js |  5 +-
 .../svelte/src/internal/client/runtime.js     | 39 +++++++-------
 .../svelte/src/internal/client/warnings.js    | 33 ++++++++++++
 .../svelte/src/internal/shared/validate.js    |  4 +-
 .../svelte/src/internal/shared/warnings.js    | 21 ++++++++
 .../samples/component-nested-deep/_config.js  |  2 +-
 .../samples/destroy-twice/_config.js          |  4 +-
 .../_config.js                                |  2 +-
 .../_config.js                                |  2 +-
 .../_config.js                                |  2 +-
 .../_config.js                                |  2 +-
 .../_config.js                                |  2 +-
 .../svelte/tests/runtime-legacy/shared.ts     | 10 +++-
 packages/svelte/tests/signals/test.ts         |  4 +-
 27 files changed, 243 insertions(+), 45 deletions(-)
 create mode 100644 packages/svelte/messages/client-errors/effects.md
 create mode 100644 packages/svelte/messages/client-errors/lifecycle.md
 create mode 100644 packages/svelte/messages/client-warnings/warnings.md
 create mode 100644 packages/svelte/messages/shared-warnings/warnings.md
 create mode 100644 packages/svelte/scripts/process-messages/templates/client-errors.js
 create mode 100644 packages/svelte/scripts/process-messages/templates/client-warnings.js
 create mode 100644 packages/svelte/scripts/process-messages/templates/shared-warnings.js
 create mode 100644 packages/svelte/src/internal/client/errors.js
 create mode 100644 packages/svelte/src/internal/client/warnings.js
 create mode 100644 packages/svelte/src/internal/shared/warnings.js

diff --git a/.prettierignore b/.prettierignore
index 4eea07c2e7..0e08fae5e9 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -5,6 +5,9 @@ packages/**/config/*.js
 packages/svelte/messages/**/*.md
 packages/svelte/src/compiler/errors.js
 packages/svelte/src/compiler/warnings.js
+packages/svelte/src/internal/client/errors.js
+packages/svelte/src/internal/client/warnings.js
+packages/svelte/src/internal/shared/warnings.js
 packages/svelte/tests/**/*.svelte
 packages/svelte/tests/**/_expected*
 packages/svelte/tests/**/_actual*
diff --git a/eslint.config.js b/eslint.config.js
index a86f724d34..569d237cd8 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -35,6 +35,9 @@ export default [
 			'**/tests',
 			'packages/svelte/scripts/process-messages/templates/*.js',
 			'packages/svelte/src/compiler/errors.js',
+			'packages/svelte/src/internal/client/errors.js',
+			'packages/svelte/src/internal/client/warnings.js',
+			'packages/svelte/src/internal/shared/warnings.js',
 			'packages/svelte/compiler/index.js',
 			// documentation can contain invalid examples
 			'documentation',
diff --git a/packages/svelte/messages/client-errors/effects.md b/packages/svelte/messages/client-errors/effects.md
new file mode 100644
index 0000000000..f720575c49
--- /dev/null
+++ b/packages/svelte/messages/client-errors/effects.md
@@ -0,0 +1,3 @@
+## effect_update_depth_exceeded
+
+Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops
diff --git a/packages/svelte/messages/client-errors/lifecycle.md b/packages/svelte/messages/client-errors/lifecycle.md
new file mode 100644
index 0000000000..7b1ce19a0e
--- /dev/null
+++ b/packages/svelte/messages/client-errors/lifecycle.md
@@ -0,0 +1,7 @@
+## lifecycle_outside_component
+
+`%name%(...)` can only be used during component initialisation
+
+## lifecycle_legacy_only
+
+`%name%(...)` cannot be used in runes mode
diff --git a/packages/svelte/messages/client-warnings/warnings.md b/packages/svelte/messages/client-warnings/warnings.md
new file mode 100644
index 0000000000..a3e2b6e3fe
--- /dev/null
+++ b/packages/svelte/messages/client-warnings/warnings.md
@@ -0,0 +1,7 @@
+## lifecycle_double_unmount
+
+Tried to unmount a component that was not mounted
+
+## ownership_invalid_binding
+
+%parent% passed a value to %child% with `bind:`, but the value is owned by %owner%. Consider creating a binding between %owner% and %parent%
diff --git a/packages/svelte/messages/shared-warnings/warnings.md b/packages/svelte/messages/shared-warnings/warnings.md
new file mode 100644
index 0000000000..07c3fd50bf
--- /dev/null
+++ b/packages/svelte/messages/shared-warnings/warnings.md
@@ -0,0 +1,3 @@
+## dynamic_void_element_content
+
+`<svelte:element this="%tag%">` is a void element — it cannot have content
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
index 80c3a811d9..b02696a1dd 100644
--- a/packages/svelte/scripts/process-messages/index.js
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -220,3 +220,7 @@ function transform(name, dest) {
 
 transform('compile-errors', 'src/compiler/errors.js');
 transform('compile-warnings', 'src/compiler/warnings.js');
+
+transform('client-warnings', 'src/internal/client/warnings.js');
+transform('client-errors', 'src/internal/client/errors.js');
+transform('shared-warnings', 'src/internal/shared/warnings.js');
diff --git a/packages/svelte/scripts/process-messages/templates/client-errors.js b/packages/svelte/scripts/process-messages/templates/client-errors.js
new file mode 100644
index 0000000000..c63a22da96
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/client-errors.js
@@ -0,0 +1,17 @@
+import { DEV } from 'esm-env';
+
+/**
+ * MESSAGE
+ * @param {string} PARAMETER
+ * @returns {never}
+ */
+export function CODE(PARAMETER) {
+	if (DEV) {
+		const error = new Error(`${'CODE'}\n${MESSAGE}`);
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error('CODE');
+	}
+}
diff --git a/packages/svelte/scripts/process-messages/templates/client-warnings.js b/packages/svelte/scripts/process-messages/templates/client-warnings.js
new file mode 100644
index 0000000000..d40a59ec0c
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/client-warnings.js
@@ -0,0 +1,17 @@
+import { DEV } from 'esm-env';
+
+var bold = 'font-weight: bold';
+var normal = 'font-weight: normal';
+
+/**
+ * MESSAGE
+ * @param {string} PARAMETER
+ */
+export function CODE(PARAMETER) {
+	if (DEV) {
+		console.warn(`%c[svelte] ${'CODE'}\n%c${MESSAGE}`, bold, normal);
+	} else {
+		// TODO print a link to the documentation
+		console.warn('CODE');
+	}
+}
diff --git a/packages/svelte/scripts/process-messages/templates/shared-warnings.js b/packages/svelte/scripts/process-messages/templates/shared-warnings.js
new file mode 100644
index 0000000000..801785f176
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/shared-warnings.js
@@ -0,0 +1,19 @@
+import { DEV } from 'esm-env';
+
+var bold = 'font-weight: bold';
+var normal = 'font-weight: normal';
+
+/**
+ * MESSAGE
+ * @param {boolean} trace
+ * @param {string} PARAMETER
+ */
+export function CODE(trace, PARAMETER) {
+	if (DEV) {
+		console.warn(`%c[svelte] ${'CODE'}\n%c${MESSAGE}`, bold, normal);
+		if (trace) console.trace('stack trace');
+	} else {
+		// TODO print a link to the documentation
+		console.warn('CODE');
+	}
+}
diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js
index 83fede3863..ea909fe4d9 100644
--- a/packages/svelte/src/index-client.js
+++ b/packages/svelte/src/index-client.js
@@ -1,6 +1,7 @@
 import { current_component_context, flush_sync, untrack } from './internal/client/runtime.js';
 import { is_array } from './internal/client/utils.js';
 import { user_effect } from './internal/client/index.js';
+import * as e from './internal/client/errors.js';
 
 /**
  * The `onMount` function schedules a callback to run as soon as the component has been mounted to the DOM.
@@ -18,7 +19,7 @@ import { user_effect } from './internal/client/index.js';
  */
 export function onMount(fn) {
 	if (current_component_context === null) {
-		throw new Error('onMount can only be used during component initialisation.');
+		e.lifecycle_outside_component('onMount');
 	}
 
 	if (current_component_context.l !== null) {
@@ -43,7 +44,7 @@ export function onMount(fn) {
  */
 export function onDestroy(fn) {
 	if (current_component_context === null) {
-		throw new Error('onDestroy can only be used during component initialisation.');
+		e.lifecycle_outside_component('onDestroy');
 	}
 
 	onMount(() => () => untrack(fn));
@@ -87,7 +88,7 @@ function create_custom_event(type, detail, { bubbles = false, cancelable = false
 export function createEventDispatcher() {
 	const component_context = current_component_context;
 	if (component_context === null) {
-		throw new Error('createEventDispatcher can only be used during component initialisation.');
+		e.lifecycle_outside_component('createEventDispatcher');
 	}
 
 	return (type, detail, options) => {
@@ -126,7 +127,7 @@ export function createEventDispatcher() {
  */
 export function beforeUpdate(fn) {
 	if (current_component_context === null) {
-		throw new Error('beforeUpdate can only be used during component initialisation');
+		e.lifecycle_outside_component('beforeUpdate');
 	}
 
 	if (current_component_context.l === null) {
@@ -150,11 +151,11 @@ export function beforeUpdate(fn) {
  */
 export function afterUpdate(fn) {
 	if (current_component_context === null) {
-		throw new Error('afterUpdate can only be used during component initialisation.');
+		e.lifecycle_outside_component('afterUpdate');
 	}
 
 	if (current_component_context.l === null) {
-		throw new Error('afterUpdate cannot be used in runes mode');
+		e.lifecycle_legacy_only('afterUpdate');
 	}
 
 	init_update_callbacks(current_component_context).a.push(fn);
diff --git a/packages/svelte/src/internal/client/dev/ownership.js b/packages/svelte/src/internal/client/dev/ownership.js
index 30dceab486..4fac7837fd 100644
--- a/packages/svelte/src/internal/client/dev/ownership.js
+++ b/packages/svelte/src/internal/client/dev/ownership.js
@@ -4,6 +4,7 @@ import { STATE_SYMBOL } from '../constants.js';
 import { render_effect } from '../reactivity/effects.js';
 import { current_component_context, untrack } from '../runtime.js';
 import { get_prototype_of } from '../utils.js';
+import * as w from '../warnings.js';
 
 /** @type {Record<string, Array<{ start: Location, end: Location, component: Function }>>} */
 const boundaries = {};
@@ -115,10 +116,7 @@ export function add_owner(object, owner, global = false) {
 			let original = get_owner(metadata);
 
 			if (owner.filename !== component.filename) {
-				let message = `${component.filename} passed a value to ${owner.filename} with \`bind:\`, but the value is owned by ${original.filename}. Consider creating a binding between ${original.filename} and ${component.filename}`;
-
-				// eslint-disable-next-line no-console
-				console.warn(message);
+				w.ownership_invalid_binding(component.filename, owner.filename, original.filename);
 			}
 		}
 	}
@@ -234,6 +232,7 @@ export function check_ownership(metadata) {
 					`${component.filename} mutated a value owned by ${original.filename}. This is strongly discouraged`
 				: 'Mutating a value outside the component that created it is strongly discouraged';
 
+		// TODO get rid of this, but implement message overloads first
 		// eslint-disable-next-line no-console
 		console.warn(
 			`${message}. Consider passing values to child components with \`bind:\`, or use a callback instead.`
diff --git a/packages/svelte/src/internal/client/errors.js b/packages/svelte/src/internal/client/errors.js
new file mode 100644
index 0000000000..a3bbc71b65
--- /dev/null
+++ b/packages/svelte/src/internal/client/errors.js
@@ -0,0 +1,53 @@
+/* This file is generated by scripts/process-messages.js. Do not edit! */
+
+import { DEV } from 'esm-env';
+
+/**
+ * Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops
+ * @returns {never}
+ */
+export function effect_update_depth_exceeded() {
+	if (DEV) {
+		const error = new Error(`${"effect_update_depth_exceeded"}\n${"Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("effect_update_depth_exceeded");
+	}
+}
+
+/**
+ * `%name%(...)` can only be used during component initialisation
+ * @param {string} name
+ * @returns {never}
+ */
+export function lifecycle_outside_component(name) {
+	if (DEV) {
+		const error = new Error(`${"lifecycle_outside_component"}\n${`\`${name}(...)\` can only be used during component initialisation`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("lifecycle_outside_component");
+	}
+}
+
+/**
+ * `%name%(...)` cannot be used in runes mode
+ * @param {string} name
+ * @returns {never}
+ */
+export function lifecycle_legacy_only(name) {
+	if (DEV) {
+		const error = new Error(`${"lifecycle_legacy_only"}\n${`\`${name}(...)\` cannot be used in runes mode`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("lifecycle_legacy_only");
+	}
+}
\ No newline at end of file
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index c1b1316cca..698935ff44 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -19,6 +19,7 @@ import {
 import { array_from } from './utils.js';
 import { handle_event_propagation } from './dom/elements/events.js';
 import { reset_head_anchor } from './dom/blocks/svelte-head.js';
+import * as w from './warnings.js';
 
 /** @type {Set<string>} */
 export const all_registered_events = new Set();
@@ -269,6 +270,7 @@ function _mount(Component, { target, anchor, props = {}, events, context, intro
 				target.removeEventListener(event_name, bound_event_listener);
 			}
 			root_event_handles.delete(event_handle);
+			mounted_components.delete(component);
 		};
 	});
 
@@ -289,8 +291,9 @@ let mounted_components = new WeakMap();
 export function unmount(component) {
 	const fn = mounted_components.get(component);
 	if (DEV && !fn) {
+		w.lifecycle_double_unmount();
 		// eslint-disable-next-line no-console
-		console.warn('Tried to unmount a component that was not mounted.');
+		console.trace('stack trace');
 	}
 	fn?.();
 }
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index e8233fbc90..c593f79f09 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -22,6 +22,7 @@ import { add_owner } from './dev/ownership.js';
 import { mutate, set, source } from './reactivity/sources.js';
 import { update_derived } from './reactivity/deriveds.js';
 import { inspect_captured_signals, inspect_fn, set_inspect_fn } from './dev/inspect.js';
+import * as e from './errors.js';
 
 const FLUSH_MICROTASK = 0;
 const FLUSH_SYNC = 1;
@@ -412,13 +413,7 @@ export function execute_effect(effect) {
 function infinite_loop_guard() {
 	if (flush_count > 1000) {
 		flush_count = 0;
-		throw new Error(
-			'ERR_SVELTE_TOO_MANY_UPDATES' +
-				(DEV
-					? ': Maximum update depth exceeded. This can happen when a reactive block or effect ' +
-						'repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops.'
-					: '')
-		);
+		e.effect_update_depth_exceeded();
 	}
 	flush_count++;
 }
@@ -880,12 +875,12 @@ export function is_signal(val) {
  * @returns {T}
  */
 export function getContext(key) {
-	const context_map = get_or_init_context_map();
+	const context_map = get_or_init_context_map('getContext');
 	const result = /** @type {T} */ (context_map.get(key));
 
 	if (DEV) {
 		// @ts-expect-error
-		const fn = current_component_context?.function;
+		const fn = current_component_context.function;
 		if (fn) {
 			add_owner(result, fn, true);
 		}
@@ -908,7 +903,7 @@ export function getContext(key) {
  * @returns {T}
  */
 export function setContext(key, context) {
-	const context_map = get_or_init_context_map();
+	const context_map = get_or_init_context_map('setContext');
 	context_map.set(key, context);
 	return context;
 }
@@ -922,7 +917,7 @@ export function setContext(key, context) {
  * @returns {boolean}
  */
 export function hasContext(key) {
-	const context_map = get_or_init_context_map();
+	const context_map = get_or_init_context_map('hasContext');
 	return context_map.has(key);
 }
 
@@ -936,7 +931,7 @@ export function hasContext(key) {
  * @returns {T}
  */
 export function getAllContexts() {
-	const context_map = get_or_init_context_map();
+	const context_map = get_or_init_context_map('getAllContexts');
 
 	if (DEV) {
 		// @ts-expect-error
@@ -951,16 +946,18 @@ export function getAllContexts() {
 	return /** @type {T} */ (context_map);
 }
 
-/** @returns {Map<unknown, unknown>} */
-function get_or_init_context_map() {
-	const component_context = current_component_context;
-	if (component_context === null) {
-		throw new Error(
-			'ERR_SVELTE_ORPHAN_CONTEXT' +
-				(DEV ? 'Context can only be used during component initialisation.' : '')
-		);
+/**
+ * @param {string} name
+ * @returns {Map<unknown, unknown>}
+ */
+function get_or_init_context_map(name) {
+	if (current_component_context === null) {
+		e.lifecycle_outside_component(name);
 	}
-	return (component_context.c ??= new Map(get_parent_context(component_context) || undefined));
+
+	return (current_component_context.c ??= new Map(
+		get_parent_context(current_component_context) || undefined
+	));
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/warnings.js b/packages/svelte/src/internal/client/warnings.js
new file mode 100644
index 0000000000..6cf03e5d98
--- /dev/null
+++ b/packages/svelte/src/internal/client/warnings.js
@@ -0,0 +1,33 @@
+/* This file is generated by scripts/process-messages.js. Do not edit! */
+
+import { DEV } from 'esm-env';
+
+var bold = 'font-weight: bold';
+var normal = 'font-weight: normal';
+
+/**
+ * Tried to unmount a component that was not mounted
+ */
+export function lifecycle_double_unmount() {
+	if (DEV) {
+		console.warn(`%c[svelte] ${"lifecycle_double_unmount"}\n%c${"Tried to unmount a component that was not mounted"}`, bold, normal);
+	} else {
+		// TODO print a link to the documentation
+		console.warn("lifecycle_double_unmount");
+	}
+}
+
+/**
+ * %parent% passed a value to %child% with `bind:`, but the value is owned by %owner%. Consider creating a binding between %owner% and %parent%
+ * @param {string} parent
+ * @param {string} child
+ * @param {string} owner
+ */
+export function ownership_invalid_binding(parent, child, owner) {
+	if (DEV) {
+		console.warn(`%c[svelte] ${"ownership_invalid_binding"}\n%c${`${parent} passed a value to ${child} with \`bind:\`, but the value is owned by ${owner}. Consider creating a binding between ${owner} and ${parent}`}`, bold, normal);
+	} else {
+		// TODO print a link to the documentation
+		console.warn("ownership_invalid_binding");
+	}
+}
\ No newline at end of file
diff --git a/packages/svelte/src/internal/shared/validate.js b/packages/svelte/src/internal/shared/validate.js
index 692a62fa07..65dde3011c 100644
--- a/packages/svelte/src/internal/shared/validate.js
+++ b/packages/svelte/src/internal/shared/validate.js
@@ -1,4 +1,5 @@
 import { is_void } from '../../compiler/phases/1-parse/utils/names.js';
+import * as w from './warnings.js';
 
 const snippet_symbol = Symbol.for('svelte.snippet');
 
@@ -42,8 +43,7 @@ export function validate_component(component_fn) {
 export function validate_void_dynamic_element(tag_fn) {
 	const tag = tag_fn();
 	if (tag && is_void(tag)) {
-		// eslint-disable-next-line no-console
-		console.warn(`<svelte:element this="${tag}"> is self-closing and cannot have content.`);
+		w.dynamic_void_element_content(false, tag);
 	}
 }
 
diff --git a/packages/svelte/src/internal/shared/warnings.js b/packages/svelte/src/internal/shared/warnings.js
new file mode 100644
index 0000000000..7d85dcf154
--- /dev/null
+++ b/packages/svelte/src/internal/shared/warnings.js
@@ -0,0 +1,21 @@
+/* This file is generated by scripts/process-messages.js. Do not edit! */
+
+import { DEV } from 'esm-env';
+
+var bold = 'font-weight: bold';
+var normal = 'font-weight: normal';
+
+/**
+ * `<svelte:element this="%tag%">` is a void element — it cannot have content
+ * @param {boolean} trace
+ * @param {string} tag
+ */
+export function dynamic_void_element_content(trace, tag) {
+	if (DEV) {
+		console.warn(`%c[svelte] ${"dynamic_void_element_content"}\n%c${`\`<svelte:element this="${tag}">\` is a void element — it cannot have content`}`, bold, normal);
+		if (trace) console.trace('stack trace');
+	} else {
+		// TODO print a link to the documentation
+		console.warn("dynamic_void_element_content");
+	}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js b/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js
index da6b9c0442..62685edd8d 100644
--- a/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js
@@ -6,5 +6,5 @@ export default test({
 		unmount(component.l1);
 	},
 
-	warnings: ['Tried to unmount a component that was not mounted.']
+	warnings: ['Tried to unmount a component that was not mounted']
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js b/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js
index bfdf090cbd..d6900ef91d 100644
--- a/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js
@@ -8,7 +8,7 @@ export default test({
 	},
 
 	warnings: [
-		'Tried to unmount a component that was not mounted.',
-		'Tried to unmount a component that was not mounted.'
+		'Tried to unmount a component that was not mounted',
+		'Tried to unmount a component that was not mounted'
 	]
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-1/_config.js b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-1/_config.js
index 4ba1c2e001..d880635a59 100644
--- a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-1/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-1/_config.js
@@ -7,5 +7,5 @@ export default test({
 	get props() {
 		return { tag: 'br' };
 	},
-	warnings: ['<svelte:element this="br"> is self-closing and cannot have content.']
+	warnings: ['`<svelte:element this="br">` is a void element — it cannot have content']
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-2/_config.js b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-2/_config.js
index 4ba1c2e001..d880635a59 100644
--- a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-2/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-2/_config.js
@@ -7,5 +7,5 @@ export default test({
 	get props() {
 		return { tag: 'br' };
 	},
-	warnings: ['<svelte:element this="br"> is self-closing and cannot have content.']
+	warnings: ['`<svelte:element this="br">` is a void element — it cannot have content']
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-3/_config.js b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-3/_config.js
index 4ba1c2e001..d880635a59 100644
--- a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-3/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-3/_config.js
@@ -7,5 +7,5 @@ export default test({
 	get props() {
 		return { tag: 'br' };
 	},
-	warnings: ['<svelte:element this="br"> is self-closing and cannot have content.']
+	warnings: ['`<svelte:element this="br">` is a void element — it cannot have content']
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-4/_config.js b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-4/_config.js
index bde68337f0..51e056d429 100644
--- a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-4/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-4/_config.js
@@ -8,5 +8,5 @@ export default test({
 		return { tag: 'br' };
 	},
 	html: '<br>',
-	warnings: ['<svelte:element this="br"> is self-closing and cannot have content.']
+	warnings: ['`<svelte:element this="br">` is a void element — it cannot have content']
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-5/_config.js b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-5/_config.js
index a41a39d980..86f63d9d32 100644
--- a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-5/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-void-with-content-5/_config.js
@@ -4,5 +4,5 @@ export default test({
 	compileOptions: {
 		dev: true
 	},
-	warnings: ['<svelte:element this="input"> is self-closing and cannot have content.']
+	warnings: ['`<svelte:element this="input">` is a void element — it cannot have content']
 });
diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts
index 039cf64eb0..029b9e4cef 100644
--- a/packages/svelte/tests/runtime-legacy/shared.ts
+++ b/packages/svelte/tests/runtime-legacy/shared.ts
@@ -178,7 +178,15 @@ async function run_test_variant(
 
 		if (str.slice(0, i).includes('warnings') || config.warnings) {
 			// eslint-disable-next-line no-console
-			console.warn = (...args) => warnings.push(...args);
+			console.warn = (...args) => {
+				if (args[0].startsWith('%c[svelte]')) {
+					// TODO convert this to structured data, for more robust comparison?
+					const message = args[0];
+					warnings.push(message.slice(message.indexOf('%c', 2) + 2));
+				} else {
+					warnings.push(...args);
+				}
+			};
 		}
 	}
 
diff --git a/packages/svelte/tests/signals/test.ts b/packages/svelte/tests/signals/test.ts
index a6efb9aefa..d7dc76558c 100644
--- a/packages/svelte/tests/signals/test.ts
+++ b/packages/svelte/tests/signals/test.ts
@@ -327,7 +327,7 @@ describe('signals', () => {
 			try {
 				flushSync();
 			} catch (e: any) {
-				assert.include(e.message, 'ERR_SVELTE_TOO_MANY_UPDATES');
+				assert.include(e.message, 'effect_update_depth_exceeded');
 				errored = true;
 			}
 			assert.equal(errored, true);
@@ -348,7 +348,7 @@ describe('signals', () => {
 			try {
 				flushSync();
 			} catch (e: any) {
-				assert.include(e.message, 'ERR_SVELTE_TOO_MANY_UPDATES');
+				assert.include(e.message, 'effect_update_depth_exceeded');
 				errored = true;
 			}
 			assert.equal(errored, true);

From f906aa207b6a22c951911ce9a4a55c9dce04f7e4 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 09:34:53 -0400
Subject: [PATCH 13/27] chore: fix playground (#11310)

---
 packages/svelte/src/compiler/phases/2-analyze/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index fad0061551..5811f130b9 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -236,7 +236,7 @@ export function analyze_module(ast, options) {
 
 	walk(
 		/** @type {import('estree').Node} */ (ast),
-		{ scope },
+		{ scope, analysis: { runes: true } },
 		// @ts-expect-error TODO clean this mess up
 		merge(set_scope(scopes), validation_runes_js, runes_scope_js_tweaker)
 	);
@@ -862,7 +862,7 @@ const legacy_scope_tweaker = {
 	}
 };
 
-/** @type {import('zimmerframe').Visitors<import('#compiler').SvelteNode, { scope: Scope }>} */
+/** @type {import('zimmerframe').Visitors<import('#compiler').SvelteNode, { scope: Scope, analysis: { runes: true } }>} */
 const runes_scope_js_tweaker = {
 	VariableDeclarator(node, { state }) {
 		if (node.init?.type !== 'CallExpression') return;

From 22b2c15280c5c66ba35efae07365061789931366 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 09:57:49 -0400
Subject: [PATCH 14/27] put messages in blockquotes (#11311)

---
 .../svelte/messages/client-errors/effects.md  |  2 +-
 .../messages/client-errors/lifecycle.md       |  4 +-
 .../messages/client-warnings/warnings.md      |  4 +-
 .../messages/compile-errors/attributes.md     | 30 +++----
 .../messages/compile-errors/bindings.md       | 18 ++--
 .../compile-errors/compiler_options.md        |  4 +-
 .../messages/compile-errors/components.md     |  2 +-
 .../messages/compile-errors/const_tag.md      |  2 +-
 .../svelte/messages/compile-errors/css.md     | 26 +++---
 .../messages/compile-errors/elements.md       | 14 +--
 .../compile-errors/legacy_reactivity.md       |  2 +-
 .../svelte/messages/compile-errors/parse.md   | 74 ++++++++--------
 .../svelte/messages/compile-errors/runes.md   | 48 +++++------
 .../svelte/messages/compile-errors/slots.md   | 16 ++--
 .../compile-errors/special_elements.md        | 50 +++++------
 .../messages/compile-errors/variables.md      | 10 +--
 .../svelte/messages/compile-warnings/a11y.md  | 86 +++++++++----------
 .../messages/compile-warnings/attributes.md   |  8 +-
 .../svelte/messages/compile-warnings/block.md |  2 +-
 .../messages/compile-warnings/components.md   |  2 +-
 .../svelte/messages/compile-warnings/css.md   |  2 +-
 .../messages/compile-warnings/legacy.md       | 10 +--
 .../svelte/messages/compile-warnings/misc.md  |  2 +-
 .../messages/compile-warnings/options.md      | 12 +--
 .../messages/compile-warnings/performance.md  |  4 +-
 .../svelte/messages/compile-warnings/runes.md | 10 +--
 .../svelte/messages/compile-warnings/state.md |  4 +-
 .../messages/shared-warnings/warnings.md      |  2 +-
 .../svelte/scripts/process-messages/index.js  |  6 +-
 29 files changed, 230 insertions(+), 226 deletions(-)

diff --git a/packages/svelte/messages/client-errors/effects.md b/packages/svelte/messages/client-errors/effects.md
index f720575c49..88847ea0d5 100644
--- a/packages/svelte/messages/client-errors/effects.md
+++ b/packages/svelte/messages/client-errors/effects.md
@@ -1,3 +1,3 @@
 ## effect_update_depth_exceeded
 
-Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops
+> Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops
\ No newline at end of file
diff --git a/packages/svelte/messages/client-errors/lifecycle.md b/packages/svelte/messages/client-errors/lifecycle.md
index 7b1ce19a0e..98b644d8ec 100644
--- a/packages/svelte/messages/client-errors/lifecycle.md
+++ b/packages/svelte/messages/client-errors/lifecycle.md
@@ -1,7 +1,7 @@
 ## lifecycle_outside_component
 
-`%name%(...)` can only be used during component initialisation
+> `%name%(...)` can only be used during component initialisation
 
 ## lifecycle_legacy_only
 
-`%name%(...)` cannot be used in runes mode
+> `%name%(...)` cannot be used in runes mode
\ No newline at end of file
diff --git a/packages/svelte/messages/client-warnings/warnings.md b/packages/svelte/messages/client-warnings/warnings.md
index a3e2b6e3fe..643de0ed1d 100644
--- a/packages/svelte/messages/client-warnings/warnings.md
+++ b/packages/svelte/messages/client-warnings/warnings.md
@@ -1,7 +1,7 @@
 ## lifecycle_double_unmount
 
-Tried to unmount a component that was not mounted
+> Tried to unmount a component that was not mounted
 
 ## ownership_invalid_binding
 
-%parent% passed a value to %child% with `bind:`, but the value is owned by %owner%. Consider creating a binding between %owner% and %parent%
+> %parent% passed a value to %child% with `bind:`, but the value is owned by %owner%. Consider creating a binding between %owner% and %parent%
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/attributes.md b/packages/svelte/messages/compile-errors/attributes.md
index 9501080ee0..8e27e74076 100644
--- a/packages/svelte/messages/compile-errors/attributes.md
+++ b/packages/svelte/messages/compile-errors/attributes.md
@@ -1,59 +1,59 @@
 ## empty_attribute_shorthand
 
-Attribute shorthand cannot be empty
+> Attribute shorthand cannot be empty
 
 ## duplicate_attribute
 
-Attributes need to be unique
+> Attributes need to be unique
 
 ## invalid_event_attribute_value
 
-Event attribute must be a JavaScript expression, not a string
+> Event attribute must be a JavaScript expression, not a string
 
 ## invalid_attribute_name
 
-'%name%' is not a valid attribute name
+> '%name%' is not a valid attribute name
 
 ## animation_invalid_placement
 
-An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
+> An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
 
 ## animation_missing_key
 
-An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
+> An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
 
 ## animation_duplicate
 
-An element can only have one 'animate' directive
+> An element can only have one 'animate' directive
 
 ## invalid_event_modifier
 
-Valid event modifiers are %list%
+> Valid event modifiers are %list%
 
 ## invalid_component_event_modifier
 
-Event modifiers other than 'once' can only be used on DOM elements
+> Event modifiers other than 'once' can only be used on DOM elements
 
 ## invalid_event_modifier_combination
 
-The '%modifier1%' and '%modifier2%' modifiers cannot be used together
+> The '%modifier1%' and '%modifier2%' modifiers cannot be used together
 
 ## transition_duplicate
 
-Cannot use multiple `%type%:` directives on a single element
+> Cannot use multiple `%type%:` directives on a single element
 
 ## transition_conflict
 
-Cannot use `%type%:` alongside existing `%existing%:` directive
+> Cannot use `%type%:` alongside existing `%existing%:` directive
 
 ## invalid_let_directive_placement
 
-`let:` directive at invalid position
+> `let:` directive at invalid position
 
 ## invalid_style_directive_modifier
 
-Invalid 'style:' modifier. Valid modifiers are: 'important'
+> Invalid 'style:' modifier. Valid modifiers are: 'important'
 
 ## invalid_sequence_expression
 
-Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
+> Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/bindings.md b/packages/svelte/messages/compile-errors/bindings.md
index 5e88c5890a..9afa81d1f2 100644
--- a/packages/svelte/messages/compile-errors/bindings.md
+++ b/packages/svelte/messages/compile-errors/bindings.md
@@ -1,35 +1,35 @@
 ## invalid_binding_expression
 
-Can only bind to an Identifier or MemberExpression
+> Can only bind to an Identifier or MemberExpression
 
 ## invalid_binding_value
 
-Can only bind to state or props
+> Can only bind to state or props
 
 ## bind_invalid_target
 
-`bind:%name%` can only be used with %elements%
+> `bind:%name%` can only be used with %elements%
 
 ## bind_invalid
 
-`bind:%name%` is not a valid binding
+> `bind:%name%` is not a valid binding
 
 ## bind_invalid_detailed
 
-`bind:%name%` is not a valid binding. %explanation%
+> `bind:%name%` is not a valid binding. %explanation%
 
 ## invalid_type_attribute
 
-'type' attribute must be a static text value if input uses two-way binding
+> 'type' attribute must be a static text value if input uses two-way binding
 
 ## invalid_multiple_attribute
 
-'multiple' attribute must be static if select uses two-way binding
+> 'multiple' attribute must be static if select uses two-way binding
 
 ## missing_contenteditable_attribute
 
-'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
+> 'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
 
 ## dynamic_contenteditable_attribute
 
-'contenteditable' attribute cannot be dynamic if element uses two-way binding
+> 'contenteditable' attribute cannot be dynamic if element uses two-way binding
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/compiler_options.md b/packages/svelte/messages/compile-errors/compiler_options.md
index 761d74c72a..b2702a1a7e 100644
--- a/packages/svelte/messages/compile-errors/compiler_options.md
+++ b/packages/svelte/messages/compile-errors/compiler_options.md
@@ -1,7 +1,7 @@
 ## invalid_compiler_option
 
-Invalid compiler option: %msg%
+> Invalid compiler option: %msg%
 
 ## removed_compiler_option
 
-Invalid compiler option: %msg%
\ No newline at end of file
+> Invalid compiler option: %msg%
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/components.md b/packages/svelte/messages/compile-errors/components.md
index 88a31a81c6..651c80d733 100644
--- a/packages/svelte/messages/compile-errors/components.md
+++ b/packages/svelte/messages/compile-errors/components.md
@@ -1,3 +1,3 @@
 ## invalid_component_directive
 
-This type of directive is not valid on components
\ No newline at end of file
+> This type of directive is not valid on components
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/const_tag.md b/packages/svelte/messages/compile-errors/const_tag.md
index de8a8ca909..720aba9860 100644
--- a/packages/svelte/messages/compile-errors/const_tag.md
+++ b/packages/svelte/messages/compile-errors/const_tag.md
@@ -1,3 +1,3 @@
 ## invalid_const_placement
 
-{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>
\ No newline at end of file
+> {@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/css.md b/packages/svelte/messages/compile-errors/css.md
index 33331cfac6..9a31300786 100644
--- a/packages/svelte/messages/compile-errors/css.md
+++ b/packages/svelte/messages/compile-errors/css.md
@@ -1,51 +1,51 @@
 ## invalid_css_empty_declaration
 
-Declaration cannot be empty
+> Declaration cannot be empty
 
 ## invalid_css_global_block_list
 
-A :global {...} block cannot be part of a selector list with more than one item
+> A :global {...} block cannot be part of a selector list with more than one item
 
 ## invalid_css_global_block_modifier
 
-A :global {...} block cannot modify an existing selector
+> A :global {...} block cannot modify an existing selector
 
 ## invalid_css_global_block_combinator
 
-A :global {...} block cannot follow a %name% combinator
+> A :global {...} block cannot follow a %name% combinator
 
 ## invalid_css_global_block_declaration
 
-A :global {...} block can only contain rules, not declarations
+> A :global {...} block can only contain rules, not declarations
 
 ## invalid_css_global_placement
 
-:global(...) can be at the start or end of a selector sequence, but not in the middle
+> :global(...) can be at the start or end of a selector sequence, but not in the middle
 
 ## invalid_css_global_selector
 
-:global(...) must contain exactly one selector
+> :global(...) must contain exactly one selector
 
 ## invalid_css_global_selector_list
 
-:global(...) must not contain type or universal selectors when used in a compound selector
+> :global(...) must not contain type or universal selectors when used in a compound selector
 
 ## invalid_css_type_selector_placement
 
-:global(...) must not be followed with a type selector
+> :global(...) must not be followed with a type selector
 
 ## invalid_css_selector
 
-Invalid selector
+> Invalid selector
 
 ## invalid_css_identifier
 
-Expected a valid CSS identifier
+> Expected a valid CSS identifier
 
 ## invalid_nesting_selector
 
-Nesting selectors can only be used inside a rule
+> Nesting selectors can only be used inside a rule
 
 ## invalid_css_declaration
 
-Declaration cannot be empty
+> Declaration cannot be empty
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/elements.md b/packages/svelte/messages/compile-errors/elements.md
index 466a26a7ac..2686f2370d 100644
--- a/packages/svelte/messages/compile-errors/elements.md
+++ b/packages/svelte/messages/compile-errors/elements.md
@@ -1,27 +1,27 @@
 ## invalid_textarea_content
 
-A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
+> A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
 
 ## invalid_void_content
 
-Void elements cannot have children or closing tags
+> Void elements cannot have children or closing tags
 
 ## invalid_element_content
 
-<%name%> cannot have children
+> <%name%> cannot have children
 
 ## invalid_tag_name
 
-Expected valid tag name
+> Expected valid tag name
 
 ## invalid_node_placement
 
-%thing% is invalid inside <%parent%>
+> %thing% is invalid inside <%parent%>
 
 ## illegal_title_attribute
 
-`<title>` cannot have attributes nor directives
+> `<title>` cannot have attributes nor directives
 
 ## invalid_title_content
 
-`<title>` can only contain text and {tags}
+> `<title>` can only contain text and {tags}
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/legacy_reactivity.md b/packages/svelte/messages/compile-errors/legacy_reactivity.md
index 6f4234aa01..cc4504b08e 100644
--- a/packages/svelte/messages/compile-errors/legacy_reactivity.md
+++ b/packages/svelte/messages/compile-errors/legacy_reactivity.md
@@ -1,3 +1,3 @@
 ## cyclical_reactive_declaration
 
-Cyclical dependency detected: %cycle%
+> Cyclical dependency detected: %cycle%
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/parse.md b/packages/svelte/messages/compile-errors/parse.md
index e09c61e419..c7270f0d45 100644
--- a/packages/svelte/messages/compile-errors/parse.md
+++ b/packages/svelte/messages/compile-errors/parse.md
@@ -1,147 +1,147 @@
 ## unclosed_element
 
-`<%name%>` was left open
+> `<%name%>` was left open
 
 ## unclosed_block
 
-Block was left open
+> Block was left open
 
 ## unexpected_block_close
 
-Unexpected block closing tag
+> Unexpected block closing tag
 
 ## unexpected_eof
 
-Unexpected end of input
+> Unexpected end of input
 
 ## js_parse_error
 
-%message%
+> %message%
 
 ## expected_token
 
-Expected token %token%
+> Expected token %token%
 
 ## unexpected_reserved_word
 
-'%word%' is a reserved word in JavaScript and cannot be used here
+> '%word%' is a reserved word in JavaScript and cannot be used here
 
 ## missing_whitespace
 
-Expected whitespace
+> Expected whitespace
 
 ## expected_pattern
 
-Expected identifier or destructure pattern
+> Expected identifier or destructure pattern
 
 ## invalid_script_context
 
-If the context attribute is supplied, its value must be "module"
+> If the context attribute is supplied, its value must be "module"
 
 ## invalid_elseif
 
-'elseif' should be 'else if'
+> 'elseif' should be 'else if'
 
 ## invalid_continuing_block_placement
 
-{:...} block is invalid at this position (did you forget to close the preceeding element or block?)
+> {:...} block is invalid at this position (did you forget to close the preceeding element or block?)
 
 ## invalid_block_missing_parent
 
-%child% block must be a child of %parent%
+> %child% block must be a child of %parent%
 
 ## duplicate_block_part
 
-%name% cannot appear more than once within a block
+> %name% cannot appear more than once within a block
 
 ## expected_block_type
 
-Expected 'if', 'each', 'await', 'key' or 'snippet'
+> Expected 'if', 'each', 'await', 'key' or 'snippet'
 
 ## expected_identifier
 
-Expected an identifier
+> Expected an identifier
 
 ## invalid_debug
 
-{@debug ...} arguments must be identifiers, not arbitrary expressions
+> {@debug ...} arguments must be identifiers, not arbitrary expressions
 
 ## invalid_const
 
-{@const ...} must be an assignment
+> {@const ...} must be an assignment
 
 ## invalid_block_placement
 
-{#%name% ...} block cannot be %location%
+> {#%name% ...} block cannot be %location%
 
 ## invalid_tag_placement
 
-{@%name% ...} tag cannot be %location%
+> {@%name% ...} tag cannot be %location%
 
 ## missing_attribute_value
 
-Expected attribute value
+> Expected attribute value
 
 ## unclosed_attribute_value
 
-Expected closing %delimiter% character
+> Expected closing %delimiter% character
 
 ## invalid_directive_value
 
-Directive value must be a JavaScript expression enclosed in curly braces
+> Directive value must be a JavaScript expression enclosed in curly braces
 
 ## empty_directive_name
 
-%type% name cannot be empty
+> %type% name cannot be empty
 
 ## invalid_closing_tag
 
-</%name%> attempted to close an element that was not open
+> </%name%> attempted to close an element that was not open
 
 ## invalid_closing_tag_after_autoclose
 
-</%name%> attempted to close element that was already automatically closed by <%reason%> (cannot nest <%reason%> inside <%name%>)
+> </%name%> attempted to close element that was already automatically closed by <%reason%> (cannot nest <%reason%> inside <%name%>)
 
 ## invalid_dollar_binding
 
-The $ name is reserved, and cannot be used for variables and imports
+> The $ name is reserved, and cannot be used for variables and imports
 
 ## invalid_dollar_prefix
 
-The $ prefix is reserved, and cannot be used for variables and imports
+> The $ prefix is reserved, and cannot be used for variables and imports
 
 ## invalid_dollar_global
 
-The $ name is reserved. To reference a global variable called $, use globalThis.$
+> The $ name is reserved. To reference a global variable called $, use globalThis.$
 
 ## illegal_subscription
 
-Cannot reference store value inside `<script context="module">`
+> Cannot reference store value inside `<script context="module">`
 
 ## duplicate_style_element
 
-A component can have a single top-level `<style>` element
+> A component can have a single top-level `<style>` element
 
 ## duplicate_script_element
 
-A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
+> A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
 
 ## invalid_render_expression
 
-{@render ...} tags can only contain call expressions
+> {@render ...} tags can only contain call expressions
 
 ## invalid_render_arguments
 
-expected at most one argument
+> expected at most one argument
 
 ## invalid_render_call
 
-Calling a snippet function using apply, bind or call is not allowed
+> Calling a snippet function using apply, bind or call is not allowed
 
 ## invalid_render_spread_argument
 
-cannot use spread arguments in {@render ...} tags
+> cannot use spread arguments in {@render ...} tags
 
 ## invalid_snippet_rest_parameter
 
-snippets do not support rest parameters; use an array instead
+> snippets do not support rest parameters; use an array instead
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/runes.md b/packages/svelte/messages/compile-errors/runes.md
index c8efa4eefb..3cb2465754 100644
--- a/packages/svelte/messages/compile-errors/runes.md
+++ b/packages/svelte/messages/compile-errors/runes.md
@@ -1,95 +1,95 @@
 ## invalid_legacy_props
 
-Cannot use `$$props` in runes mode
+> Cannot use `$$props` in runes mode
 
 ## invalid_legacy_rest_props
 
-Cannot use `$$restProps` in runes mode
+> Cannot use `$$restProps` in runes mode
 
 ## invalid_legacy_reactive_statement
 
-`$:` is not allowed in runes mode, use `$derived` or `$effect` instead
+> `$:` is not allowed in runes mode, use `$derived` or `$effect` instead
 
 ## invalid_legacy_export
 
-Cannot use `export let` in runes mode — use $props instead
+> Cannot use `export let` in runes mode — use $props instead
 
 ## invalid_rune_usage
 
-Cannot use %rune% rune in non-runes mode
+> Cannot use %rune% rune in non-runes mode
 
 ## invalid_state_export
 
-Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
+> Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
 
 ## invalid_derived_export
 
-Cannot export derived state from a module. To expose the current derived value, export a function returning its value
+> Cannot export derived state from a module. To expose the current derived value, export a function returning its value
 
 ## invalid_props_id
 
-`$props()` can only be used with an object destructuring pattern
+> `$props()` can only be used with an object destructuring pattern
 
 ## invalid_props_pattern
 
-`$props()` assignment must not contain nested properties or computed keys
+> `$props()` assignment must not contain nested properties or computed keys
 
 ## invalid_props_location
 
-`$props()` can only be used at the top level of components as a variable declaration initializer
+> `$props()` can only be used at the top level of components as a variable declaration initializer
 
 ## invalid_bindable_location
 
-`$bindable()` can only be used inside a `$props()` declaration
+> `$bindable()` can only be used inside a `$props()` declaration
 
 ## invalid_state_location
 
-`%rune%(...)` can only be used as a variable declaration initializer or a class field
+> `%rune%(...)` can only be used as a variable declaration initializer or a class field
 
 ## invalid_effect_location
 
-`$effect()` can only be used as an expression statement
+> `$effect()` can only be used as an expression statement
 
 ## invalid_host_location
 
-`$host()` can only be used inside custom element component instances
+> `$host()` can only be used inside custom element component instances
 
 ## invalid_assignment
 
-Cannot assign to %thing%
+> Cannot assign to %thing%
 
 ## invalid_binding
 
-Cannot bind to %thing%
+> Cannot bind to %thing%
 
 ## invalid_rune_args
 
-`%rune%` cannot be called with arguments
+> `%rune%` cannot be called with arguments
 
 ## invalid_rune_args_length
 
-`%rune%` must be called with %args%
+> `%rune%` must be called with %args%
 
 ## invalid_runes_mode_import
 
-%name% cannot be used in runes mode
+> %name% cannot be used in runes mode
 
 ## duplicate_props_rune
 
-Cannot use `$props()` more than once
+> Cannot use `$props()` more than once
 
 ## invalid_each_assignment
 
-Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
+> Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
 
 ## invalid_snippet_assignment
 
-Cannot reassign or bind to snippet parameter
+> Cannot reassign or bind to snippet parameter
 
 ## invalid_derived_call
 
-`$derived.call(...)` has been replaced with `$derived.by(...)`
+> `$derived.call(...)` has been replaced with `$derived.by(...)`
 
 ## conflicting_property_name
 
-Cannot have a property and a component export with the same name
+> Cannot have a property and a component export with the same name
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/slots.md b/packages/svelte/messages/compile-errors/slots.md
index 51213c5b5d..9f92448847 100644
--- a/packages/svelte/messages/compile-errors/slots.md
+++ b/packages/svelte/messages/compile-errors/slots.md
@@ -1,31 +1,31 @@
 ## invalid_slot_element_attribute
 
-`<slot>` can only receive attributes and (optionally) let directives
+> `<slot>` can only receive attributes and (optionally) let directives
 
 ## invalid_slot_attribute
 
-slot attribute must be a static value
+> slot attribute must be a static value
 
 ## invalid_slot_name_default
 
-`default` is a reserved word — it cannot be used as a slot name
+> `default` is a reserved word — it cannot be used as a slot name
 
 ## invalid_slot_name
 
-slot attribute must be a static value
+> slot attribute must be a static value
 
 ## invalid_slot_placement
 
-Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
+> Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
 
 ## duplicate_slot_name
 
-Duplicate slot name '%name%' in <%component%>
+> Duplicate slot name '%name%' in <%component%>
 
 ## invalid_default_slot_content
 
-Found default slot content alongside an explicit slot="default"
+> Found default slot content alongside an explicit slot="default"
 
 ## conflicting_children_snippet
 
-Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
+> Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/special_elements.md b/packages/svelte/messages/compile-errors/special_elements.md
index 6617d0e0fb..bf69e59e05 100644
--- a/packages/svelte/messages/compile-errors/special_elements.md
+++ b/packages/svelte/messages/compile-errors/special_elements.md
@@ -1,99 +1,99 @@
 ## invalid_svelte_option_attribute
 
-`<svelte:options>` can only receive static attributes
+> `<svelte:options>` can only receive static attributes
 
 ## invalid_svelte_option_namespace
 
-Unsupported `<svelte:option>` value for "namespace". Valid values are "html", "svg" or "foreign"
+> Unsupported `<svelte:option>` value for "namespace". Valid values are "html", "svg" or "foreign"
 
 ## tag_option_deprecated
 
-"tag" option is deprecated — use "customElement" instead
+> "tag" option is deprecated — use "customElement" instead
 
 ## invalid_svelte_option_runes
 
-Unsupported `<svelte:option>` value for "runes". Valid values are true or false
+> Unsupported `<svelte:option>` value for "runes". Valid values are true or false
 
 ## invalid_svelte_option_accessors
 
-Unsupported `<svelte:option>` value for "accessors". Valid values are true or false
+> Unsupported `<svelte:option>` value for "accessors". Valid values are true or false
 
 ## invalid_svelte_option_preserveWhitespace
 
-Unsupported `<svelte:option>` value for "preserveWhitespace". Valid values are true or false
+> Unsupported `<svelte:option>` value for "preserveWhitespace". Valid values are true or false
 
 ## invalid_svelte_option_immutable
 
-Unsupported `<svelte:option>` value for "immutable". Valid values are true or false
+> Unsupported `<svelte:option>` value for "immutable". Valid values are true or false
 
 ## invalid_tag_property
 
-Tag name must be two or more words joined by the "-" character
+> Tag name must be two or more words joined by the "-" character
 
 ## invalid_svelte_option_customElement
 
-"customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
+> "customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
 
 ## invalid_customElement_props_attribute
 
-"props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
+> "props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
 
 ## invalid_customElement_shadow_attribute
 
-"shadow" must be either "open" or "none"
+> "shadow" must be either "open" or "none"
 
 ## unknown_svelte_option_attribute
 
-`<svelte:options>` unknown attribute '%name%'
+> `<svelte:options>` unknown attribute '%name%'
 
 ## illegal_svelte_head_attribute
 
-`<svelte:head>` cannot have attributes nor directives
+> `<svelte:head>` cannot have attributes nor directives
 
 ## invalid_svelte_fragment_attribute
 
-`<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
+> `<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
 
 ## invalid_svelte_fragment_slot
 
-`<svelte:fragment>` slot attribute must have a static value
+> `<svelte:fragment>` slot attribute must have a static value
 
 ## invalid_svelte_fragment_placement
 
-`<svelte:fragment>` must be the direct child of a component
+> `<svelte:fragment>` must be the direct child of a component
 
 ## invalid_svelte_element_placement
 
-<%name%> tags cannot be inside elements or blocks
+> <%name%> tags cannot be inside elements or blocks
 
 ## duplicate_svelte_element
 
-A component can only have one <%name%> element
+> A component can only have one <%name%> element
 
 ## invalid_self_placement
 
-`<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components
+> `<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components
 
 ## missing_svelte_element_definition
 
-`<svelte:element>` must have a 'this' attribute
+> `<svelte:element>` must have a 'this' attribute
 
 ## missing_svelte_component_definition
 
-`<svelte:component>` must have a 'this' attribute
+> `<svelte:component>` must have a 'this' attribute
 
 ## invalid_svelte_element_definition
 
-Invalid element definition — must be an {expression}
+> Invalid element definition — must be an {expression}
 
 ## invalid_svelte_component_definition
 
-Invalid component definition — must be an {expression}
+> Invalid component definition — must be an {expression}
 
 ## invalid_svelte_tag
 
-Valid `<svelte:...>` tag names are %list%
+> Valid `<svelte:...>` tag names are %list%
 
 ## conflicting_slot_usage
 
-Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
+> Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/variables.md b/packages/svelte/messages/compile-errors/variables.md
index f1ac317b59..179393f61c 100644
--- a/packages/svelte/messages/compile-errors/variables.md
+++ b/packages/svelte/messages/compile-errors/variables.md
@@ -1,19 +1,19 @@
 ## illegal_global
 
-`%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
+> `%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
 
 ## duplicate_declaration
 
-`%name%` has already been declared
+> `%name%` has already been declared
 
 ## default_export
 
-A component cannot have a default export
+> A component cannot have a default export
 
 ## illegal_variable_declaration
 
-Cannot declare same variable name which is imported inside `<script context="module">`
+> Cannot declare same variable name which is imported inside `<script context="module">`
 
 ## illegal_store_subscription
 
-Cannot subscribe to stores that are not declared at the top level of the component
+> Cannot subscribe to stores that are not declared at the top level of the component
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/a11y.md b/packages/svelte/messages/compile-warnings/a11y.md
index 0e2aaa92b0..feb602344d 100644
--- a/packages/svelte/messages/compile-warnings/a11y.md
+++ b/packages/svelte/messages/compile-warnings/a11y.md
@@ -1,171 +1,171 @@
 ## a11y_aria_attributes
 
-<%name%> should not have aria-* attributes
+> <%name%> should not have aria-* attributes
 
 ## a11y_unknown_aria_attribute
 
-Unknown aria attribute 'aria-%attribute%'
+> Unknown aria attribute 'aria-%attribute%'
 
 ## a11y_unknown_aria_attribute_suggestion
 
-Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
+> Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
 
 ## a11y_hidden
 
-<%name%> element should not be hidden
+> <%name%> element should not be hidden
 
 ## a11y_incorrect_aria_attribute_type_boolean
 
-The value of '%attribute%' must be either 'true' or 'false'
+> The value of '%attribute%' must be either 'true' or 'false'
 
 ## a11y_incorrect_aria_attribute_type_integer
 
-The value of '%attribute%' must be an integer
+> The value of '%attribute%' must be an integer
 
 ## a11y_incorrect_aria_attribute_type_id
 
-The value of '%attribute%' must be a string that represents a DOM element ID
+> The value of '%attribute%' must be a string that represents a DOM element ID
 
 ## a11y_incorrect_aria_attribute_type_idlist
 
-The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
+> The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
 
 ## a11y_incorrect_aria_attribute_type_tristate
 
-The value of '%attribute%' must be exactly one of true, false, or mixed
+> The value of '%attribute%' must be exactly one of true, false, or mixed
 
 ## a11y_incorrect_aria_attribute_type_token
 
-The value of '%attribute%' must be exactly one of %values%
+> The value of '%attribute%' must be exactly one of %values%
 
 ## a11y_incorrect_aria_attribute_type_tokenlist
 
-The value of '%attribute%' must be a space-separated list of one or more of %values%
+> The value of '%attribute%' must be a space-separated list of one or more of %values%
 
 ## a11y_incorrect_aria_attribute_type
 
-The value of '%attribute%' must be of type %type%
+> The value of '%attribute%' must be of type %type%
 
 ## a11y_aria_activedescendant_has_tabindex
 
-Elements with attribute aria-activedescendant should have tabindex value
+> Elements with attribute aria-activedescendant should have tabindex value
 
 ## a11y_misplaced_role
 
-<%name%> should not have role attribute
+> <%name%> should not have role attribute
 
 ## a11y_no_abstract_role
 
-Abstract role '%role%' is forbidden
+> Abstract role '%role%' is forbidden
 
 ## a11y_unknown_role
 
-Unknown role '%role%'
+> Unknown role '%role%'
 
 ## a11y_unknown_role_suggestion
 
-Unknown role '%role%'. Did you mean '%suggestion%'?
+> Unknown role '%role%'. Did you mean '%suggestion%'?
 
 ## a11y_no_redundant_roles
 
-Redundant role '%role%'
+> Redundant role '%role%'
 
 ## a11y_role_has_required_aria_props
 
-Elements with the ARIA role "%role%" must have the following attributes defined: %props%
+> Elements with the ARIA role "%role%" must have the following attributes defined: %props%
 
 ## a11y_interactive_supports_focus
 
-Elements with the '%role%' interactive role must have a tabindex value.
+> Elements with the '%role%' interactive role must have a tabindex value.
 
 ## a11y_no_interactive_element_to_noninteractive_role
 
-<%element%> cannot have role '%role%'
+> <%element%> cannot have role '%role%'
 
 ## a11y_no_noninteractive_element_to_interactive_role
 
-Non-interactive element <%element%> cannot have interactive role '%role%'
+> Non-interactive element <%element%> cannot have interactive role '%role%'
 
 ## a11y_accesskey
 
-Avoid using accesskey
+> Avoid using accesskey
 
 ## a11y_autofocus
 
-Avoid using autofocus
+> Avoid using autofocus
 
 ## a11y_misplaced_scope
 
-The scope attribute should only be used with <th> elements
+> The scope attribute should only be used with <th> elements
 
 ## a11y_positive_tabindex
 
-Avoid tabindex values above zero
+> Avoid tabindex values above zero
 
 ## a11y_click_events_have_key_events
 
-Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type="button"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
+> Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type="button"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
 
 ## a11y_no_noninteractive_tabindex
 
-noninteractive element cannot have nonnegative tabIndex value
+> noninteractive element cannot have nonnegative tabIndex value
 
 ## a11y_role_supports_aria_props
 
-The attribute '%attribute%' is not supported by the role '%role%'
+> The attribute '%attribute%' is not supported by the role '%role%'
 
 ## a11y_role_supports_aria_props_implicit
 
-The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element <%name%>
+> The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element <%name%>
 
 ## a11y_no_noninteractive_element_interactions
 
-Non-interactive element <%element%> should not be assigned mouse or keyboard event listeners.
+> Non-interactive element <%element%> should not be assigned mouse or keyboard event listeners.
 
 ## a11y_no_static_element_interactions
 
-<%element%> with a %handler% handler must have an ARIA role
+> <%element%> with a %handler% handler must have an ARIA role
 
 ## a11y_invalid_attribute
 
-'%href_value%' is not a valid %href_attribute% attribute
+> '%href_value%' is not a valid %href_attribute% attribute
 
 ## a11y_missing_attribute
 
-<%name%> element should have %article% %sequence% attribute
+> <%name%> element should have %article% %sequence% attribute
 
 ## a11y_autocomplete_valid
 
-The value '%value%' is not supported by the attribute 'autocomplete' on element <input type="%type%">
+> The value '%value%' is not supported by the attribute 'autocomplete' on element <input type="%type%">
 
 ## a11y_img_redundant_alt
 
-Screenreaders already announce <img> elements as an image.
+> Screenreaders already announce <img> elements as an image.
 
 ## a11y_label_has_associated_control
 
-A form label must be associated with a control.
+> A form label must be associated with a control.
 
 ## a11y_media_has_caption
 
-<video> elements must have a <track kind="captions">
+> <video> elements must have a <track kind="captions">
 
 ## a11y_distracting_elements
 
-Avoid <%name%> elements
+> Avoid <%name%> elements
 
 ## a11y_figcaption_parent
 
-`<figcaption>` must be an immediate child of `<figure>`
+> `<figcaption>` must be an immediate child of `<figure>`
 
 ## a11y_figcaption_index
 
-`<figcaption>` must be first or last child of `<figure>`
+> `<figcaption>` must be first or last child of `<figure>`
 
 ## a11y_mouse_events_have_key_events
 
-'%event%' event must be accompanied by '%accompanied_by%' event
+> '%event%' event must be accompanied by '%accompanied_by%' event
 
 ## a11y_missing_content
 
-<%name%> element should have child content
+> <%name%> element should have child content
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/attributes.md b/packages/svelte/messages/compile-warnings/attributes.md
index dba95975e8..68227e3285 100644
--- a/packages/svelte/messages/compile-warnings/attributes.md
+++ b/packages/svelte/messages/compile-warnings/attributes.md
@@ -1,15 +1,15 @@
 ## avoid_is
 
-The "is" attribute is not supported cross-browser and should be avoided
+> The "is" attribute is not supported cross-browser and should be avoided
 
 ## global_event_reference
 
-You are referencing globalThis.%name%. Did you forget to declare a variable with that name?
+> You are referencing globalThis.%name%. Did you forget to declare a variable with that name?
 
 ## illegal_attribute_character
 
-Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
+> Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
 
 ## invalid_html_attribute
 
-'%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
+> '%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/block.md b/packages/svelte/messages/compile-warnings/block.md
index bf4f07c31e..08ab9d57bb 100644
--- a/packages/svelte/messages/compile-warnings/block.md
+++ b/packages/svelte/messages/compile-warnings/block.md
@@ -1,3 +1,3 @@
 ## empty_block
 
-Empty block
+> Empty block
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/components.md b/packages/svelte/messages/compile-warnings/components.md
index f13f105a68..9182299c54 100644
--- a/packages/svelte/messages/compile-warnings/components.md
+++ b/packages/svelte/messages/compile-warnings/components.md
@@ -1,3 +1,3 @@
 ## component_name_lowercase
 
-<%name%> will be treated as an HTML element unless it begins with a capital letter
\ No newline at end of file
+> <%name%> will be treated as an HTML element unless it begins with a capital letter
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/css.md b/packages/svelte/messages/compile-warnings/css.md
index 1272fe69a1..733f32f5b5 100644
--- a/packages/svelte/messages/compile-warnings/css.md
+++ b/packages/svelte/messages/compile-warnings/css.md
@@ -1,3 +1,3 @@
 ## css_unused_selector
 
-Unused CSS selector "%name%"
+> Unused CSS selector "%name%"
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/legacy.md b/packages/svelte/messages/compile-warnings/legacy.md
index c87d717d2d..88c5ea9670 100644
--- a/packages/svelte/messages/compile-warnings/legacy.md
+++ b/packages/svelte/messages/compile-warnings/legacy.md
@@ -1,19 +1,19 @@
 ## no_reactive_declaration
 
-Reactive declarations only exist at the top level of the instance script
+> Reactive declarations only exist at the top level of the instance script
 
 ## module_script_reactive_declaration
 
-All dependencies of the reactive declaration are declared in a module script and will not be reactive
+> All dependencies of the reactive declaration are declared in a module script and will not be reactive
 
 ## unused_export_let
 
-Component has unused export property '%name%'. If it is for external reference only, please consider using `export const %name%`
+> Component has unused export property '%name%'. If it is for external reference only, please consider using `export const %name%`
 
 ## deprecated_slot_element
 
-Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.
+> Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.
 
 ## deprecated_event_handler
 
-Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
+> Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/misc.md b/packages/svelte/messages/compile-warnings/misc.md
index dfdf6bdef2..8a6f3b68ad 100644
--- a/packages/svelte/messages/compile-warnings/misc.md
+++ b/packages/svelte/messages/compile-warnings/misc.md
@@ -1,3 +1,3 @@
 ## invalid_self_closing_tag
 
-Self-closing HTML tags for non-void elements are ambiguous — use <%name% ...></%name%> rather than <%name% ... />
\ No newline at end of file
+> Self-closing HTML tags for non-void elements are ambiguous — use <%name% ...></%name%> rather than <%name% ... />
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/options.md b/packages/svelte/messages/compile-warnings/options.md
index ed69b9f421..584900923c 100644
--- a/packages/svelte/messages/compile-warnings/options.md
+++ b/packages/svelte/messages/compile-warnings/options.md
@@ -1,23 +1,23 @@
 ## options_deprecated_immutable
 
-The `immutable` option has been deprecated. It will have no effect in runes mode
+> The `immutable` option has been deprecated. It will have no effect in runes mode
 
 ## options_missing_custom_element
 
-The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?
+> The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?
 
 ## options_renamed_ssr_dom
 
-`generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
+> `generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
 
 ## options_removed_enable_sourcemap
 
-The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them
+> The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them
 
 ## options_removed_hydratable
 
-The `hydratable` option has been removed. Svelte components are always hydratable now
+> The `hydratable` option has been removed. Svelte components are always hydratable now
 
 ## options_removed_loop_guard_timeout
 
-The `loopGuardTimeout` option has been removed
+> The `loopGuardTimeout` option has been removed
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/performance.md b/packages/svelte/messages/compile-warnings/performance.md
index b39511370d..0bd8115466 100644
--- a/packages/svelte/messages/compile-warnings/performance.md
+++ b/packages/svelte/messages/compile-warnings/performance.md
@@ -1,7 +1,7 @@
 ## avoid_inline_class
 
-Avoid 'new class' — instead, declare the class at the top level scope
+> Avoid 'new class' — instead, declare the class at the top level scope
 
 ## avoid_nested_class
 
-Avoid declaring classes below the top level scope
\ No newline at end of file
+> Avoid declaring classes below the top level scope
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/runes.md b/packages/svelte/messages/compile-warnings/runes.md
index a29d6c41b5..c3518bea6c 100644
--- a/packages/svelte/messages/compile-warnings/runes.md
+++ b/packages/svelte/messages/compile-warnings/runes.md
@@ -1,19 +1,19 @@
 ## store_with_rune_name
 
-It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
+> It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
 
 ## non_state_reference
 
-`%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
+> `%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
 
 ## derived_iife
 
-Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
+> Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
 
 ## invalid_props_declaration
 
-Component properties are declared using `$props()` in runes mode. Did you forget to call the function?
+> Component properties are declared using `$props()` in runes mode. Did you forget to call the function?
 
 ## invalid_bindable_declaration
 
-Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?
+> Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/state.md b/packages/svelte/messages/compile-warnings/state.md
index f77fbe514e..674d8ebe3d 100644
--- a/packages/svelte/messages/compile-warnings/state.md
+++ b/packages/svelte/messages/compile-warnings/state.md
@@ -1,7 +1,7 @@
 ## static_state_reference
 
-State referenced in its own scope will never update. Did you mean to reference it inside a closure?
+> State referenced in its own scope will never update. Did you mean to reference it inside a closure?
 
 ## invalid_rest_eachblock_binding
 
-The rest operator (...) will create a new object and binding '%name%' with the original object will not work
\ No newline at end of file
+> The rest operator (...) will create a new object and binding '%name%' with the original object will not work
\ No newline at end of file
diff --git a/packages/svelte/messages/shared-warnings/warnings.md b/packages/svelte/messages/shared-warnings/warnings.md
index 07c3fd50bf..0d30a32dc8 100644
--- a/packages/svelte/messages/shared-warnings/warnings.md
+++ b/packages/svelte/messages/shared-warnings/warnings.md
@@ -1,3 +1,3 @@
 ## dynamic_void_element_content
 
-`<svelte:element this="%tag%">` is a void element — it cannot have content
+> `<svelte:element this="%tag%">` is a void element — it cannot have content
\ No newline at end of file
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
index b02696a1dd..84a0b25d5c 100644
--- a/packages/svelte/scripts/process-messages/index.js
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -23,7 +23,11 @@ for (const category of fs.readdirSync('messages')) {
 			}
 
 			seen.add(code);
-			messages[category][code] = text.trim();
+			messages[category][code] = text
+				.trim()
+				.split('\n')
+				.map((line) => line.slice(2))
+				.join('\n');
 		}
 	}
 }

From 476f2172b6bc204f73fbbf886fbc7098d2ac93f3 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 10:55:39 -0400
Subject: [PATCH 15/27] fix: mark `accessors` and `immutable` as deprecated
 (#11277)

* fix: mark `accessors` and `immutable` as deprecated

* add warnings for deprecated <svelte:options> attributes

* disable accessors in runes mode

* update tests

* tidy up

* the hell?

* regenerate types

* if I would get a dollar for every windows bug I fix I would be a millionaire by now

* return instance _and_ props in runes mode, move flushSync into shared code, don't set accessors in runes mode

* goddammit

* note breaking change

* fix

* regenerate messages

* Revert "return instance _and_ props in runes mode, move flushSync into shared code, don't set accessors in runes mode"

This reverts commit a47827e57d70adf909a789e2028098dbb3d51fbb.

* pass instance to tests

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/tiny-meals-deliver.md              |  5 ++
 .../messages/compile-warnings/legacy.md       |  2 +-
 .../messages/compile-warnings/options.md      |  4 ++
 .../svelte/scripts/process-messages/index.js  | 11 ++--
 packages/svelte/src/compiler/errors.js        |  2 +-
 .../src/compiler/phases/2-analyze/index.js    | 18 +++++--
 packages/svelte/src/compiler/types/index.d.ts |  2 +
 .../svelte/src/compiler/validate-options.js   |  2 +-
 packages/svelte/src/compiler/warnings.js      | 10 +++-
 packages/svelte/src/internal/client/errors.js |  2 +-
 packages/svelte/src/internal/client/render.js |  2 +-
 .../svelte/src/internal/client/warnings.js    |  2 +-
 .../svelte/src/internal/shared/warnings.js    |  2 +-
 packages/svelte/tests/runtime-browser/test.ts |  6 ++-
 .../svelte/tests/runtime-legacy/shared.ts     | 51 ++++++++++++++-----
 .../samples/each-bind-this-member/_config.js  |  6 +++
 .../samples/each-bind-this-member/main.svelte |  2 +-
 .../_config.js                                |  3 +-
 .../_config.js                                |  3 +-
 .../_config.js                                |  3 +-
 .../_config.js                                |  3 +-
 .../_config.js                                |  3 +-
 .../_config.js                                | 35 ++++++++-----
 .../samples/props-quoted/_config.js           |  3 +-
 .../runtime-runes/samples/props/_config.js    |  7 +--
 .../samples/transition-evaluation/_config.js  |  7 ++-
 .../warnings.json                             |  4 +-
 packages/svelte/types/index.d.ts              |  6 ++-
 .../03-appendix/02-breaking-changes.md        |  4 ++
 29 files changed, 154 insertions(+), 56 deletions(-)
 create mode 100644 .changeset/tiny-meals-deliver.md

diff --git a/.changeset/tiny-meals-deliver.md b/.changeset/tiny-meals-deliver.md
new file mode 100644
index 0000000000..94969362d0
--- /dev/null
+++ b/.changeset/tiny-meals-deliver.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: mark `accessors` and `immutable` as deprecated
diff --git a/packages/svelte/messages/compile-warnings/legacy.md b/packages/svelte/messages/compile-warnings/legacy.md
index 88c5ea9670..c0cc85359e 100644
--- a/packages/svelte/messages/compile-warnings/legacy.md
+++ b/packages/svelte/messages/compile-warnings/legacy.md
@@ -16,4 +16,4 @@
 
 ## deprecated_event_handler
 
-> Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
\ No newline at end of file
+> Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
diff --git a/packages/svelte/messages/compile-warnings/options.md b/packages/svelte/messages/compile-warnings/options.md
index 584900923c..5513f05f6e 100644
--- a/packages/svelte/messages/compile-warnings/options.md
+++ b/packages/svelte/messages/compile-warnings/options.md
@@ -1,3 +1,7 @@
+## options_deprecated_accessors
+
+The `accessors` option has been deprecated. It will have no effect in runes mode
+
 ## options_deprecated_immutable
 
 > The `immutable` option has been deprecated. It will have no effect in runes mode
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
index 84a0b25d5c..ace3a5e66c 100644
--- a/packages/svelte/scripts/process-messages/index.js
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -13,7 +13,9 @@ for (const category of fs.readdirSync('messages')) {
 	for (const file of fs.readdirSync(`messages/${category}`)) {
 		if (!file.endsWith('.md')) continue;
 
-		const markdown = fs.readFileSync(`messages/${category}/${file}`, 'utf-8');
+		const markdown = fs
+			.readFileSync(`messages/${category}/${file}`, 'utf-8')
+			.replace(/\r\n/g, '\n');
 
 		for (const match of markdown.matchAll(/## ([\w]+)\n\n([^]+?)(?=$|\n\n## )/g)) {
 			const [_, code, text] = match;
@@ -33,7 +35,9 @@ for (const category of fs.readdirSync('messages')) {
 }
 
 function transform(name, dest) {
-	const source = fs.readFileSync(new URL(`./templates/${name}.js`, import.meta.url), 'utf-8');
+	const source = fs
+		.readFileSync(new URL(`./templates/${name}.js`, import.meta.url), 'utf-8')
+		.replace(/\r\n/g, '\n');
 
 	const comments = [];
 
@@ -217,7 +221,8 @@ function transform(name, dest) {
 
 	fs.writeFileSync(
 		dest,
-		`/* This file is generated by scripts/process-messages.js. Do not edit! */\n\n` + module.code,
+		`/* This file is generated by scripts/process-messages/index.js. Do not edit! */\n\n` +
+			module.code,
 		'utf-8'
 	);
 }
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 761478c24c..096a2ef97c 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -1,4 +1,4 @@
-/* This file is generated by scripts/process-messages.js. Do not edit! */
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
 
 /** @typedef {{ start?: number, end?: number }} NodeLike */
 // interface is duplicated between here (used internally) and ./interfaces.js
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 5811f130b9..bac63eab45 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -374,7 +374,7 @@ export function analyze_component(root, source, options) {
 		inject_styles: options.css === 'injected' || options.customElement,
 		accessors: options.customElement
 			? true
-			: !!options.accessors ||
+			: (runes ? false : !!options.accessors) ||
 				// because $set method needs accessors
 				!!options.legacy?.componentApi,
 		reactive_statements: new Map(),
@@ -395,8 +395,20 @@ export function analyze_component(root, source, options) {
 		source
 	};
 
-	if (!options.customElement && root.options?.customElement) {
-		w.options_missing_custom_element(root.options);
+	if (root.options) {
+		for (const attribute of root.options.attributes) {
+			if (attribute.name === 'accessors') {
+				w.options_deprecated_accessors(attribute);
+			}
+
+			if (attribute.name === 'customElement' && !options.customElement) {
+				w.options_missing_custom_element(attribute);
+			}
+
+			if (attribute.name === 'immutable') {
+				w.options_deprecated_immutable(attribute);
+			}
+		}
 	}
 
 	if (analysis.runes) {
diff --git a/packages/svelte/src/compiler/types/index.d.ts b/packages/svelte/src/compiler/types/index.d.ts
index d94a80a77c..1b4a09d989 100644
--- a/packages/svelte/src/compiler/types/index.d.ts
+++ b/packages/svelte/src/compiler/types/index.d.ts
@@ -94,6 +94,7 @@ export interface CompileOptions extends ModuleCompileOptions {
 	 * If `true`, getters and setters will be created for the component's props. If `false`, they will only be created for readonly exported values (i.e. those declared with `const`, `class` and `function`). If compiling with `customElement: true` this option defaults to `true`.
 	 *
 	 * @default false
+	 * @deprecated This will have no effect in runes mode
 	 */
 	accessors?: boolean;
 	/**
@@ -107,6 +108,7 @@ export interface CompileOptions extends ModuleCompileOptions {
 	 * This allows it to be less conservative about checking whether values have changed.
 	 *
 	 * @default false
+	 * @deprecated This will have no effect in runes mode
 	 */
 	immutable?: boolean;
 	/**
diff --git a/packages/svelte/src/compiler/validate-options.js b/packages/svelte/src/compiler/validate-options.js
index 157ea6fd35..4d3880c52c 100644
--- a/packages/svelte/src/compiler/validate-options.js
+++ b/packages/svelte/src/compiler/validate-options.js
@@ -39,7 +39,7 @@ export const validate_component_options =
 		object({
 			...common,
 
-			accessors: boolean(false),
+			accessors: deprecate(w.options_deprecated_accessors, boolean(false)),
 
 			css: validator('external', (input) => {
 				if (input === true || input === false) {
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index d4a41de1a1..2d1d80c403 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -1,4 +1,4 @@
-/* This file is generated by scripts/process-messages.js. Do not edit! */
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
 
 import { getLocator } from 'locate-character';
 
@@ -544,6 +544,14 @@ export function invalid_self_closing_tag(node, name) {
 	w(node, "invalid_self_closing_tag", `Self-closing HTML tags for non-void elements are ambiguous — use <${name} ...></${name}> rather than <${name} ... />`);
 }
 
+/**
+ * e `accessors` option has been deprecated. It will have no effect in runes mode
+ * @param {null | NodeLike} node
+ */
+export function options_deprecated_accessors(node) {
+	w(node, "options_deprecated_accessors", "e `accessors` option has been deprecated. It will have no effect in runes mode");
+}
+
 /**
  * The `immutable` option has been deprecated. It will have no effect in runes mode
  * @param {null | NodeLike} node
diff --git a/packages/svelte/src/internal/client/errors.js b/packages/svelte/src/internal/client/errors.js
index a3bbc71b65..1666e30ff5 100644
--- a/packages/svelte/src/internal/client/errors.js
+++ b/packages/svelte/src/internal/client/errors.js
@@ -1,4 +1,4 @@
-/* This file is generated by scripts/process-messages.js. Do not edit! */
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
 
 import { DEV } from 'esm-env';
 
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index 698935ff44..17933b3559 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -119,7 +119,7 @@ export function mount(component, options) {
  * 		events?: { [Property in keyof Events]: (e: Events[Property]) => any };
  *  	context?: Map<any, any>;
  * 		intro?: boolean;
- * 		recover?: false;
+ * 		recover?: boolean;
  * 	}} options
  * @returns {Exports}
  */
diff --git a/packages/svelte/src/internal/client/warnings.js b/packages/svelte/src/internal/client/warnings.js
index 6cf03e5d98..66d72758bf 100644
--- a/packages/svelte/src/internal/client/warnings.js
+++ b/packages/svelte/src/internal/client/warnings.js
@@ -1,4 +1,4 @@
-/* This file is generated by scripts/process-messages.js. Do not edit! */
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
 
 import { DEV } from 'esm-env';
 
diff --git a/packages/svelte/src/internal/shared/warnings.js b/packages/svelte/src/internal/shared/warnings.js
index 7d85dcf154..a3b4876a74 100644
--- a/packages/svelte/src/internal/shared/warnings.js
+++ b/packages/svelte/src/internal/shared/warnings.js
@@ -1,4 +1,4 @@
-/* This file is generated by scripts/process-messages.js. Do not edit! */
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
 
 import { DEV } from 'esm-env';
 
diff --git a/packages/svelte/tests/runtime-browser/test.ts b/packages/svelte/tests/runtime-browser/test.ts
index d58f7e78cd..1b97988fda 100644
--- a/packages/svelte/tests/runtime-browser/test.ts
+++ b/packages/svelte/tests/runtime-browser/test.ts
@@ -94,7 +94,10 @@ async function run_test(
 
 						write(`${test_dir}/_output/client/${path.basename(args.path)}.js`, compiled.js.code);
 
-						compiled.warnings.forEach((warning) => warnings.push(warning));
+						compiled.warnings.forEach((warning) => {
+							if (warning.code === 'options_deprecated_accessors') return;
+							warnings.push(warning);
+						});
 
 						if (compiled.css !== null) {
 							compiled.js.code += `document.head.innerHTML += \`<style>${compiled.css.code}</style>\``;
@@ -179,6 +182,7 @@ async function run_test(
 			);
 		} else if (warnings.length) {
 			/* eslint-disable no-unsafe-finally */
+			console.warn(warnings);
 			throw new Error('Received unexpected warnings');
 		}
 	}
diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts
index 029b9e4cef..21012a8f5a 100644
--- a/packages/svelte/tests/runtime-legacy/shared.ts
+++ b/packages/svelte/tests/runtime-legacy/shared.ts
@@ -2,7 +2,8 @@ import * as fs from 'node:fs';
 import { setImmediate } from 'node:timers/promises';
 import glob from 'tiny-glob/sync.js';
 import { createClassComponent } from 'svelte/legacy';
-import { flushSync } from 'svelte';
+import { proxy } from 'svelte/internal/client';
+import { flushSync, hydrate, mount, unmount } from 'svelte';
 import { render } from 'svelte/server';
 import { afterAll, assert, beforeAll } from 'vitest';
 import { compile_directory } from '../helpers.js';
@@ -43,6 +44,7 @@ export interface RuntimeTest<Props extends Record<string, any> = Record<string,
 		component: Props & {
 			[key: string]: any;
 		};
+		instance: Record<string, any>;
 		mod: any;
 		ok: typeof ok;
 		raf: {
@@ -120,7 +122,7 @@ export function runtime_suite(runes: boolean) {
 			return common_setup(cwd, runes, config);
 		},
 		async (config, cwd, variant, common) => {
-			await run_test_variant(cwd, config, variant, common);
+			await run_test_variant(cwd, config, variant, common, runes);
 		}
 	);
 }
@@ -148,7 +150,8 @@ async function run_test_variant(
 	cwd: string,
 	config: RuntimeTest,
 	variant: 'dom' | 'hydrate' | 'ssr',
-	compileOptions: CompileOptions
+	compileOptions: CompileOptions,
+	runes: boolean
 ) {
 	let unintended_error = false;
 
@@ -289,15 +292,30 @@ async function run_test_variant(
 				}
 			};
 
-			const instance = createClassComponent({
-				component: mod.default,
-				props: config.props,
-				target,
-				immutable: config.immutable,
-				intro: config.intro,
-				recover: config.recover ?? false,
-				hydrate: variant === 'hydrate'
-			});
+			let instance: any;
+			let props: any;
+
+			if (runes) {
+				props = proxy({ ...(config.props || {}) });
+
+				const render = variant === 'hydrate' ? hydrate : mount;
+				instance = render(mod.default, {
+					target,
+					props,
+					intro: config.intro,
+					recover: config.recover ?? false
+				});
+			} else {
+				instance = createClassComponent({
+					component: mod.default,
+					props: config.props,
+					target,
+					immutable: config.immutable,
+					intro: config.intro,
+					recover: config.recover ?? false,
+					hydrate: variant === 'hydrate'
+				});
+			}
 
 			// eslint-disable-next-line no-console
 			console.error = error;
@@ -327,7 +345,8 @@ async function run_test_variant(
 							htmlEqualWithOptions: assert_html_equal_with_options
 						},
 						variant,
-						component: instance,
+						component: runes ? props : instance,
+						instance,
 						mod,
 						target,
 						snapshot,
@@ -344,7 +363,11 @@ async function run_test_variant(
 					assert.fail('Expected a runtime error');
 				}
 			} finally {
-				instance.$destroy();
+				if (runes) {
+					unmount(instance);
+				} else {
+					instance.$destroy();
+				}
 
 				if (config.warnings) {
 					assert.deepEqual(warnings, config.warnings);
diff --git a/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/_config.js b/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/_config.js
index 4b5596cb3a..51458e901d 100644
--- a/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/_config.js
@@ -1,6 +1,12 @@
 import { test } from '../../test';
 
 export default test({
+	get props() {
+		return {
+			items: [{ src: 'https://ds' }]
+		};
+	},
+
 	async test({ assert, target, component }) {
 		assert.equal(target.querySelector('img'), component.items[0].img);
 	}
diff --git a/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/main.svelte
index 7d46ea90f0..2926ba615b 100644
--- a/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/each-bind-this-member/main.svelte
@@ -1,5 +1,5 @@
 <script>
-	let { items = $bindable([{ src: 'https://ds' }]) } = $props();
+	let { items } = $props();
 </script>
 
 {#each items as item, i}
diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js
index b0271da3f1..1066d9a2df 100644
--- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -27,7 +28,7 @@ export default test({
 
 		logs.length = 0;
 
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: $effect.pre 1',
diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js
index 04cfa4b0d5..55847c35a2 100644
--- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -22,7 +23,7 @@ export default test({
 
 		logs.length = 0;
 
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: render 1',
diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js
index d0e27957c5..0cd7e15a37 100644
--- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -27,7 +28,7 @@ export default test({
 
 		logs.length = 0;
 
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: $effect.pre 1',
diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js
index 54212a580a..1cea16963f 100644
--- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -9,7 +10,7 @@ export default test({
 		assert.deepEqual(logs, ['$effect.pre 0', 'another $effect.pre 1', 'render n0', 'render i1']);
 
 		logs.length = 0;
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, ['$effect.pre 1', 'another $effect.pre 2', 'render n1', 'render i2']);
 	}
diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js
index affe03c344..19b8fb3938 100644
--- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -23,7 +24,7 @@ export default test({
 
 		logs.length = 0;
 
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: $effect.pre 1',
diff --git a/packages/svelte/tests/runtime-runes/samples/props-default-value-lazy-accessors/_config.js b/packages/svelte/tests/runtime-runes/samples/props-default-value-lazy-accessors/_config.js
index 0919bdfca9..68402956d5 100644
--- a/packages/svelte/tests/runtime-runes/samples/props-default-value-lazy-accessors/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props-default-value-lazy-accessors/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from '../../../../src/index-client.js';
 import { test } from '../../test';
 
 // Tests that default values only fire lazily when the prop is undefined, and every time
@@ -8,22 +9,32 @@ export default test({
 		p2: 0,
 		p3: 0
 	},
+
 	html: `<p>props: 0 0 0 0 1 1 1 1</p><p>log: nested.fallback_value,fallback_fn`,
+
 	async test({ assert, target, component }) {
-		component.p0 = undefined;
-		component.p1 = undefined;
-		component.p2 = undefined;
-		component.p3 = undefined;
-		// Nuance: these are already undefined in the props, but we're setting them to undefined again,
-		// which calls the fallback value again, even if it will result in the same value. There's no way
-		// to prevent this, and in practise it won't matter - and you shouldn't use accessors in runes mode anyway.
-		component.p4 = undefined;
-		component.p5 = undefined;
-		component.p6 = undefined;
-		component.p7 = undefined;
+		flushSync(() => {
+			component.p0 = undefined;
+			component.p1 = undefined;
+			component.p2 = undefined;
+			component.p3 = undefined;
+		});
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`<p>props: 1 1 1 1 1 1 1 1</p><p>log: nested.fallback_value,fallback_fn,nested.fallback_value,fallback_fn`
+		);
+
+		flushSync(() => {
+			component.p4 = undefined;
+			component.p5 = undefined;
+			component.p6 = undefined;
+			component.p7 = undefined;
+		});
+
 		assert.htmlEqual(
 			target.innerHTML,
-			`<p>props: 1 1 1 1 1 1 1 1</p><p>log: nested.fallback_value,fallback_fn,nested.fallback_value,fallback_fn,nested.fallback_value,fallback_fn`
+			`<p>props: 1 1 1 1 1 1 1 1</p><p>log: nested.fallback_value,fallback_fn,nested.fallback_value,fallback_fn`
 		);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/props-quoted/_config.js b/packages/svelte/tests/runtime-runes/samples/props-quoted/_config.js
index c2cc143e5c..7058097317 100644
--- a/packages/svelte/tests/runtime-runes/samples/props-quoted/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props-quoted/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -8,7 +9,7 @@ export default test({
 	html: `hello`,
 
 	async test({ assert, target, component }) {
-		component['kebab-case'] = 'goodbye';
+		flushSync(() => (component['kebab-case'] = 'goodbye'));
 		assert.htmlEqual(target.innerHTML, `goodbye`);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/props/_config.js b/packages/svelte/tests/runtime-runes/samples/props/_config.js
index 751d89e35b..f8c3efb534 100644
--- a/packages/svelte/tests/runtime-runes/samples/props/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -9,14 +10,14 @@ export default test({
 			default2: undefined
 		};
 	},
+
 	html: `x 1 2 3 z`,
 
 	async test({ assert, target, component }) {
-		component.foo = 'y';
+		flushSync(() => (component.foo = 'y'));
 		assert.htmlEqual(target.innerHTML, `y 1 2 3 z`);
 
-		// rest props don't generate accessors, so we need to use $set
-		await component.$set({ bar: 'w' });
+		flushSync(() => (component.bar = 'w'));
 		assert.htmlEqual(target.innerHTML, `y 1 2 3 w`);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-evaluation/_config.js b/packages/svelte/tests/runtime-runes/samples/transition-evaluation/_config.js
index f07ed3e0a6..982cd3a9eb 100644
--- a/packages/svelte/tests/runtime-runes/samples/transition-evaluation/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/transition-evaluation/_config.js
@@ -1,3 +1,4 @@
+import { flushSync } from '../../../../src/index-client.js';
 import { test } from '../../test';
 
 export default test({
@@ -5,8 +6,10 @@ export default test({
 		const div = /** @type {HTMLDivElement & { foo?: number }} */ (target.querySelector('div'));
 
 		assert.equal(div.foo, undefined);
-		component.foo = 2;
-		component.visible = false;
+		flushSync(() => {
+			component.foo = 2;
+			component.visible = false;
+		});
 		assert.equal(div.foo, 2);
 	}
 });
diff --git a/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json b/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
index bdc1d737b8..b3b8054008 100644
--- a/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
+++ b/packages/svelte/tests/validator/samples/tag-custom-element-options-missing/warnings.json
@@ -4,11 +4,11 @@
 		"message": "The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?",
 		"start": {
 			"line": 1,
-			"column": 0
+			"column": 16
 		},
 		"end": {
 			"line": 1,
-			"column": 49
+			"column": 46
 		}
 	}
 ]
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index c5c91e67cc..9540b52e57 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -345,7 +345,7 @@ declare module 'svelte' {
 		events?: { [Property in keyof Events]: (e: Events[Property]) => any; } | undefined;
 		context?: Map<any, any> | undefined;
 		intro?: boolean | undefined;
-		recover?: false | undefined;
+		recover?: boolean | undefined;
 	}): Exports;
 	/**
 	 * Unmounts a component that was previously mounted using `mount` or `hydrate`.
@@ -623,6 +623,7 @@ declare module 'svelte/compiler' {
 		 * If `true`, getters and setters will be created for the component's props. If `false`, they will only be created for readonly exported values (i.e. those declared with `const`, `class` and `function`). If compiling with `customElement: true` this option defaults to `true`.
 		 *
 		 * @default false
+		 * @deprecated This will have no effect in runes mode
 		 */
 		accessors?: boolean;
 		/**
@@ -636,6 +637,7 @@ declare module 'svelte/compiler' {
 		 * This allows it to be less conservative about checking whether values have changed.
 		 *
 		 * @default false
+		 * @deprecated This will have no effect in runes mode
 		 */
 		immutable?: boolean;
 		/**
@@ -2419,6 +2421,7 @@ declare module 'svelte/types/compiler/interfaces' {
 		 * If `true`, getters and setters will be created for the component's props. If `false`, they will only be created for readonly exported values (i.e. those declared with `const`, `class` and `function`). If compiling with `customElement: true` this option defaults to `true`.
 		 *
 		 * @default false
+		 * @deprecated This will have no effect in runes mode
 		 */
 		accessors?: boolean;
 		/**
@@ -2432,6 +2435,7 @@ declare module 'svelte/types/compiler/interfaces' {
 		 * This allows it to be less conservative about checking whether values have changed.
 		 *
 		 * @default false
+		 * @deprecated This will have no effect in runes mode
 		 */
 		immutable?: boolean;
 		/**
diff --git a/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md b/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md
index 43a5c7134c..c5b35e2423 100644
--- a/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md
+++ b/sites/svelte-5-preview/src/routes/docs/content/03-appendix/02-breaking-changes.md
@@ -129,6 +129,10 @@ Exports from runes mode components cannot be bound to directly. For example, hav
 
 In Svelte 4 syntax, every property (declared via `export let`) is bindable, meaning you can `bind:` to it. In runes mode, properties are not bindable by default: you need to denote bindable props with the [`$bindable`](/docs/runes#$bindable) rune.
 
+### `accessors` option is ignored
+
+Setting the `accessors` option to `true` makes properties of a component directly accessible on the component instance. In runes mode, properties are never accessible on the component instance. You can use component exports instead if you need to expose them.
+
 ## Other breaking changes
 
 ### Stricter `@const` assignment validation

From 6eb70f88bbaee99b6b5949fc7ab914f6aeaaaec4 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 14:46:49 -0400
Subject: [PATCH 16/27] fix: remove `bind_prop` in runes mode (#11321)

---
 .changeset/lucky-geckos-swim.md               |  5 +++
 .../3-transform/client/transform-client.js    | 31 ++++++++++---------
 2 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/lucky-geckos-swim.md

diff --git a/.changeset/lucky-geckos-swim.md b/.changeset/lucky-geckos-swim.md
new file mode 100644
index 0000000000..c11b3b57fd
--- /dev/null
+++ b/.changeset/lucky-geckos-swim.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: remove `bind_prop` in runes mode
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
index 2498f24a69..f9d06ac0d0 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -232,18 +232,6 @@ export function client_component(source, analysis, options) {
 		group_binding_declarations.push(b.const(group.name, b.array([])));
 	}
 
-	// Bind static exports to props so that people can access them with bind:x
-	const static_bindings = analysis.exports.map(({ name, alias }) => {
-		return b.stmt(
-			b.call(
-				'$.bind_prop',
-				b.id('$$props'),
-				b.literal(alias ?? name),
-				serialize_get_binding(b.id(name), instance_state)
-			)
-		);
-	});
-
 	const component_returned_object = analysis.exports.map(({ name, alias }) => {
 		const expression = serialize_get_binding(b.id(name), instance_state);
 
@@ -369,10 +357,25 @@ export function client_component(source, analysis, options) {
 		...group_binding_declarations,
 		.../** @type {import('estree').Statement[]} */ (instance.body),
 		analysis.runes ? b.empty : b.stmt(b.call('$.init')),
-		.../** @type {import('estree').Statement[]} */ (template.body),
-		...static_bindings
+		.../** @type {import('estree').Statement[]} */ (template.body)
 	]);
 
+	if (!analysis.runes) {
+		// Bind static exports to props so that people can access them with bind:x
+		for (const { name, alias } of analysis.exports) {
+			component_block.body.push(
+				b.stmt(
+					b.call(
+						'$.bind_prop',
+						b.id('$$props'),
+						b.literal(alias ?? name),
+						serialize_get_binding(b.id(name), instance_state)
+					)
+				)
+			);
+		}
+	}
+
 	const append_styles =
 		analysis.inject_styles && analysis.css.ast
 			? () =>

From 4be593472d240f3b94fbd21ef5f147a99c93a791 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 21:19:09 +0200
Subject: [PATCH 17/27] Version Packages (next) (#11315)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json            | 2 ++
 packages/svelte/CHANGELOG.md   | 8 ++++++++
 packages/svelte/package.json   | 2 +-
 packages/svelte/src/version.js | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index b2c7662242..a3c2cd1621 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -215,6 +215,7 @@
     "lovely-items-turn",
     "lovely-rules-eat",
     "lucky-colts-remember",
+    "lucky-geckos-swim",
     "lucky-schools-hang",
     "lucky-toes-begin",
     "many-rockets-give",
@@ -432,6 +433,7 @@
     "tidy-chefs-taste",
     "tidy-starfishes-allow",
     "tiny-kings-whisper",
+    "tiny-meals-deliver",
     "tough-radios-punch",
     "twelve-dragons-join",
     "twelve-onions-juggle",
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index ded0371eb1..bceeb209b0 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.0.0-next.115
+
+### Patch Changes
+
+- fix: remove `bind_prop` in runes mode ([#11321](https://github.com/sveltejs/svelte/pull/11321))
+
+- fix: mark `accessors` and `immutable` as deprecated ([#11277](https://github.com/sveltejs/svelte/pull/11277))
+
 ## 5.0.0-next.114
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index fc855d1be2..b6087b6a0f 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.114",
+  "version": "5.0.0-next.115",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index baad214843..1d4da8571b 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -6,5 +6,5 @@
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-export const VERSION = '5.0.0-next.114';
+export const VERSION = '5.0.0-next.115';
 export const PUBLIC_VERSION = '5';

From 6ad5cd4461878f171b55f1a44d5d0106e84ab941 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Apr 2024 15:45:55 -0400
Subject: [PATCH 18/27] feat: implement message overloads (#11318)

---
 .../messages/client-warnings/warnings.md      |   8 +-
 .../messages/compile-errors/bindings.md       |   4 +-
 .../svelte/messages/compile-warnings/a11y.md  |   6 +-
 .../messages/compile-warnings/options.md      |   4 +-
 .../svelte/scripts/process-messages/index.js  | 157 ++++++++++++------
 packages/svelte/src/compiler/errors.js        |  16 +-
 .../src/compiler/phases/2-analyze/a11y.js     |  13 +-
 .../compiler/phases/2-analyze/validation.js   |   4 +-
 packages/svelte/src/compiler/warnings.js      |  34 +---
 .../src/internal/client/dev/ownership.js      |  17 +-
 .../svelte/src/internal/client/warnings.js    |  14 ++
 .../non-local-mutation-discouraged/_config.js |  19 +--
 .../_config.js                                |  21 +--
 .../_config.js                                |  21 +--
 .../_config.js                                |   2 +-
 .../samples/a11y-aria-props/warnings.json     |   2 +-
 .../samples/a11y-aria-role/warnings.json      |   4 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 19 files changed, 163 insertions(+), 187 deletions(-)

diff --git a/packages/svelte/messages/client-warnings/warnings.md b/packages/svelte/messages/client-warnings/warnings.md
index 643de0ed1d..865d968144 100644
--- a/packages/svelte/messages/client-warnings/warnings.md
+++ b/packages/svelte/messages/client-warnings/warnings.md
@@ -4,4 +4,10 @@
 
 ## ownership_invalid_binding
 
-> %parent% passed a value to %child% with `bind:`, but the value is owned by %owner%. Consider creating a binding between %owner% and %parent%
\ No newline at end of file
+> %parent% passed a value to %child% with `bind:`, but the value is owned by %owner%. Consider creating a binding between %owner% and %parent%
+
+## ownership_invalid_mutation
+
+> Mutating a value outside the component that created it is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead
+
+> %component% mutated a value owned by %owner%. This is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead
diff --git a/packages/svelte/messages/compile-errors/bindings.md b/packages/svelte/messages/compile-errors/bindings.md
index 9afa81d1f2..1a7ef806ac 100644
--- a/packages/svelte/messages/compile-errors/bindings.md
+++ b/packages/svelte/messages/compile-errors/bindings.md
@@ -14,8 +14,6 @@
 
 > `bind:%name%` is not a valid binding
 
-## bind_invalid_detailed
-
 > `bind:%name%` is not a valid binding. %explanation%
 
 ## invalid_type_attribute
@@ -32,4 +30,4 @@
 
 ## dynamic_contenteditable_attribute
 
-> 'contenteditable' attribute cannot be dynamic if element uses two-way binding
\ No newline at end of file
+> 'contenteditable' attribute cannot be dynamic if element uses two-way binding
diff --git a/packages/svelte/messages/compile-warnings/a11y.md b/packages/svelte/messages/compile-warnings/a11y.md
index feb602344d..e520f01aba 100644
--- a/packages/svelte/messages/compile-warnings/a11y.md
+++ b/packages/svelte/messages/compile-warnings/a11y.md
@@ -6,8 +6,6 @@
 
 > Unknown aria attribute 'aria-%attribute%'
 
-## a11y_unknown_aria_attribute_suggestion
-
 > Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
 
 ## a11y_hidden
@@ -62,8 +60,6 @@
 
 > Unknown role '%role%'
 
-## a11y_unknown_role_suggestion
-
 > Unknown role '%role%'. Did you mean '%suggestion%'?
 
 ## a11y_no_redundant_roles
@@ -168,4 +164,4 @@
 
 ## a11y_missing_content
 
-> <%name%> element should have child content
\ No newline at end of file
+> <%name%> element should have child content
diff --git a/packages/svelte/messages/compile-warnings/options.md b/packages/svelte/messages/compile-warnings/options.md
index 5513f05f6e..2bd4d7ca7a 100644
--- a/packages/svelte/messages/compile-warnings/options.md
+++ b/packages/svelte/messages/compile-warnings/options.md
@@ -1,6 +1,6 @@
 ## options_deprecated_accessors
 
-The `accessors` option has been deprecated. It will have no effect in runes mode
+> The `accessors` option has been deprecated. It will have no effect in runes mode
 
 ## options_deprecated_immutable
 
@@ -24,4 +24,4 @@ The `accessors` option has been deprecated. It will have no effect in runes mode
 
 ## options_removed_loop_guard_timeout
 
-> The `loopGuardTimeout` option has been removed
\ No newline at end of file
+> The `loopGuardTimeout` option has been removed
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
index ace3a5e66c..fc4ac6ee20 100644
--- a/packages/svelte/scripts/process-messages/index.js
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -4,6 +4,7 @@ import * as acorn from 'acorn';
 import { walk } from 'zimmerframe';
 import * as esrap from 'esrap';
 
+/** @type {Record<string, Record<string, { messages: string[], details: string | null }>>} */
 const messages = {};
 const seen = new Set();
 
@@ -24,12 +25,21 @@ for (const category of fs.readdirSync('messages')) {
 				throw new Error(`Duplicate message code ${category}/${code}`);
 			}
 
+			const sections = text.trim().split('\n\n');
+			let details = null;
+			if (!sections[sections.length - 1].startsWith('> ')) {
+				details = /** @type {string} */ (sections.pop());
+			}
+
+			if (sections.length === 0) {
+				throw new Error('No message text');
+			}
+
 			seen.add(code);
-			messages[category][code] = text
-				.trim()
-				.split('\n')
-				.map((line) => line.slice(2))
-				.join('\n');
+			messages[category][code] = {
+				messages: sections.map((section) => section.replace(/^> /gm, '')),
+				details
+			};
 		}
 	}
 }
@@ -102,13 +112,89 @@ function transform(name, dest) {
 	ast.body.splice(index, 1);
 
 	for (const code in category) {
-		const message = category[code];
+		const { messages } = category[code];
 		const vars = [];
-		for (const match of message.matchAll(/%(\w+)%/g)) {
-			const name = match[1];
-			if (!vars.includes(name)) {
-				vars.push(match[1]);
+
+		const group = messages.map((text, i) => {
+			for (const match of text.matchAll(/%(\w+)%/g)) {
+				const name = match[1];
+				if (!vars.includes(name)) {
+					vars.push(match[1]);
+				}
+			}
+
+			return {
+				text,
+				vars: vars.slice()
+			};
+		});
+
+		/** @type {import('estree').Expression} */
+		let message = { type: 'Literal', value: '' };
+		let prev_vars;
+
+		for (let i = 0; i < group.length; i += 1) {
+			const { text, vars } = group[i];
+
+			if (vars.length === 0) {
+				message = {
+					type: 'Literal',
+					value: text
+				};
+				continue;
 			}
+
+			const parts = text.split(/(%\w+%)/);
+
+			/** @type {import('estree').Expression[]} */
+			const expressions = [];
+
+			/** @type {import('estree').TemplateElement[]} */
+			const quasis = [];
+
+			for (let i = 0; i < parts.length; i += 1) {
+				const part = parts[i];
+				if (i % 2 === 0) {
+					const str = part.replace(/(`|\${)/g, '\\$1');
+					quasis.push({
+						type: 'TemplateElement',
+						value: { raw: str, cooked: str },
+						tail: i === parts.length - 1
+					});
+				} else {
+					expressions.push({
+						type: 'Identifier',
+						name: part.slice(1, -1)
+					});
+				}
+			}
+
+			/** @type {import('estree').Expression} */
+			const expression = {
+				type: 'TemplateLiteral',
+				expressions,
+				quasis
+			};
+
+			if (prev_vars) {
+				if (vars.length === prev_vars.length) {
+					throw new Error('Message overloads must have new parameters');
+				}
+
+				message = {
+					type: 'ConditionalExpression',
+					test: {
+						type: 'Identifier',
+						name: vars[prev_vars.length]
+					},
+					consequent: expression,
+					alternate: message
+				};
+			} else {
+				message = expression;
+			}
+
+			prev_vars = vars;
 		}
 
 		const clone = walk(/** @type {import('estree').Node} */ (template_node), null, {
@@ -120,14 +206,22 @@ function transform(name, dest) {
 					.split('\n')
 					.map((line) => {
 						if (line === ' * MESSAGE') {
-							return message
+							return messages[messages.length - 1]
 								.split('\n')
 								.map((line) => ` * ${line}`)
 								.join('\n');
 						}
 
 						if (line.includes('PARAMETER')) {
-							return vars.map((name) => ` * @param {string} ${name}`).join('\n');
+							return vars
+								.map((name, i) => {
+									const optional = i >= group[0].vars.length;
+
+									return optional
+										? ` * @param {string | undefined | null} [${name}]`
+										: ` * @param {string} ${name}`;
+								})
+								.join('\n');
 						}
 
 						return line;
@@ -171,44 +265,7 @@ function transform(name, dest) {
 			},
 			Identifier(node) {
 				if (node.name !== 'MESSAGE') return;
-
-				if (/%\w+%/.test(message)) {
-					const parts = message.split(/(%\w+%)/);
-
-					/** @type {import('estree').Expression[]} */
-					const expressions = [];
-
-					/** @type {import('estree').TemplateElement[]} */
-					const quasis = [];
-
-					for (let i = 0; i < parts.length; i += 1) {
-						const part = parts[i];
-						if (i % 2 === 0) {
-							const str = part.replace(/(`|\${)/g, '\\$1');
-							quasis.push({
-								type: 'TemplateElement',
-								value: { raw: str, cooked: str },
-								tail: i === parts.length - 1
-							});
-						} else {
-							expressions.push({
-								type: 'Identifier',
-								name: part.slice(1, -1)
-							});
-						}
-					}
-
-					return {
-						type: 'TemplateLiteral',
-						expressions,
-						quasis
-					};
-				}
-
-				return {
-					type: 'Literal',
-					value: message
-				};
+				return message;
 			}
 		});
 
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 096a2ef97c..810c1582be 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -227,25 +227,15 @@ export function bind_invalid_target(node, name, elements) {
 	e(node, "bind_invalid_target", `\`bind:${name}\` can only be used with ${elements}`);
 }
 
-/**
- * `bind:%name%` is not a valid binding
- * @param {null | number | NodeLike} node
- * @param {string} name
- * @returns {never}
- */
-export function bind_invalid(node, name) {
-	e(node, "bind_invalid", `\`bind:${name}\` is not a valid binding`);
-}
-
 /**
  * `bind:%name%` is not a valid binding. %explanation%
  * @param {null | number | NodeLike} node
  * @param {string} name
- * @param {string} explanation
+ * @param {string | undefined | null} [explanation]
  * @returns {never}
  */
-export function bind_invalid_detailed(node, name, explanation) {
-	e(node, "bind_invalid_detailed", `\`bind:${name}\` is not a valid binding. ${explanation}`);
+export function bind_invalid(node, name, explanation) {
+	e(node, "bind_invalid", explanation ? `\`bind:${name}\` is not a valid binding. ${explanation}` : `\`bind:${name}\` is not a valid binding`);
 }
 
 /**
diff --git a/packages/svelte/src/compiler/phases/2-analyze/a11y.js b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
index 0b54af4b85..91dc7cf8fb 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/a11y.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
@@ -739,12 +739,7 @@ function check_element(node, state) {
 			const type = name.slice(5);
 			if (!aria_attributes.includes(type)) {
 				const match = fuzzymatch(type, aria_attributes);
-				if (match) {
-					// TODO allow 'overloads' in messages, so that we can use the same code with and without suggestions
-					w.a11y_unknown_aria_attribute_suggestion(attribute, type, match);
-				} else {
-					w.a11y_unknown_aria_attribute(attribute, type);
-				}
+				w.a11y_unknown_aria_attribute(attribute, type, match);
 			}
 
 			if (name === 'aria-hidden' && regex_heading_tags.test(node.name)) {
@@ -792,11 +787,7 @@ function check_element(node, state) {
 						w.a11y_no_abstract_role(attribute, current_role);
 					} else if (current_role && !aria_roles.includes(current_role)) {
 						const match = fuzzymatch(current_role, aria_roles);
-						if (match) {
-							w.a11y_unknown_role_suggestion(attribute, current_role, match);
-						} else {
-							w.a11y_unknown_role(attribute, current_role);
-						}
+						w.a11y_unknown_role(attribute, current_role, match);
 					}
 
 					// no-redundant-roles
diff --git a/packages/svelte/src/compiler/phases/2-analyze/validation.js b/packages/svelte/src/compiler/phases/2-analyze/validation.js
index 55ae8c64d2..eaa486cd21 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/validation.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/validation.js
@@ -373,7 +373,7 @@ const validation = {
 			parent?.type === 'SvelteBody'
 		) {
 			if (context.state.options.namespace === 'foreign' && node.name !== 'this') {
-				e.bind_invalid_detailed(node, node.name, 'Foreign elements only support `bind:this`');
+				e.bind_invalid(node, node.name, 'Foreign elements only support `bind:this`');
 			}
 
 			if (node.name in binding_properties) {
@@ -442,7 +442,7 @@ const validation = {
 				if (match) {
 					const property = binding_properties[match];
 					if (!property.valid_elements || property.valid_elements.includes(parent.name)) {
-						e.bind_invalid_detailed(node, node.name, `Did you mean '${match}'?`);
+						e.bind_invalid(node, node.name, `Did you mean '${match}'?`);
 					}
 				}
 				e.bind_invalid(node, node.name);
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index 2d1d80c403..1dbfcf9705 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -49,23 +49,14 @@ export function a11y_aria_attributes(node, name) {
 	w(node, "a11y_aria_attributes", `<${name}> should not have aria-* attributes`);
 }
 
-/**
- * Unknown aria attribute 'aria-%attribute%'
- * @param {null | NodeLike} node
- * @param {string} attribute
- */
-export function a11y_unknown_aria_attribute(node, attribute) {
-	w(node, "a11y_unknown_aria_attribute", `Unknown aria attribute 'aria-${attribute}'`);
-}
-
 /**
  * Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
  * @param {null | NodeLike} node
  * @param {string} attribute
- * @param {string} suggestion
+ * @param {string | undefined | null} [suggestion]
  */
-export function a11y_unknown_aria_attribute_suggestion(node, attribute, suggestion) {
-	w(node, "a11y_unknown_aria_attribute_suggestion", `Unknown aria attribute 'aria-${attribute}'. Did you mean '${suggestion}'?`);
+export function a11y_unknown_aria_attribute(node, attribute, suggestion) {
+	w(node, "a11y_unknown_aria_attribute", suggestion ? `Unknown aria attribute 'aria-${attribute}'. Did you mean '${suggestion}'?` : `Unknown aria attribute 'aria-${attribute}'`);
 }
 
 /**
@@ -178,23 +169,14 @@ export function a11y_no_abstract_role(node, role) {
 	w(node, "a11y_no_abstract_role", `Abstract role '${role}' is forbidden`);
 }
 
-/**
- * Unknown role '%role%'
- * @param {null | NodeLike} node
- * @param {string} role
- */
-export function a11y_unknown_role(node, role) {
-	w(node, "a11y_unknown_role", `Unknown role '${role}'`);
-}
-
 /**
  * Unknown role '%role%'. Did you mean '%suggestion%'?
  * @param {null | NodeLike} node
  * @param {string} role
- * @param {string} suggestion
+ * @param {string | undefined | null} [suggestion]
  */
-export function a11y_unknown_role_suggestion(node, role, suggestion) {
-	w(node, "a11y_unknown_role_suggestion", `Unknown role '${role}'. Did you mean '${suggestion}'?`);
+export function a11y_unknown_role(node, role, suggestion) {
+	w(node, "a11y_unknown_role", suggestion ? `Unknown role '${role}'. Did you mean '${suggestion}'?` : `Unknown role '${role}'`);
 }
 
 /**
@@ -545,11 +527,11 @@ export function invalid_self_closing_tag(node, name) {
 }
 
 /**
- * e `accessors` option has been deprecated. It will have no effect in runes mode
+ * The `accessors` option has been deprecated. It will have no effect in runes mode
  * @param {null | NodeLike} node
  */
 export function options_deprecated_accessors(node) {
-	w(node, "options_deprecated_accessors", "e `accessors` option has been deprecated. It will have no effect in runes mode");
+	w(node, "options_deprecated_accessors", "The `accessors` option has been deprecated. It will have no effect in runes mode");
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/dev/ownership.js b/packages/svelte/src/internal/client/dev/ownership.js
index 4fac7837fd..e9fe0f4fb4 100644
--- a/packages/svelte/src/internal/client/dev/ownership.js
+++ b/packages/svelte/src/internal/client/dev/ownership.js
@@ -225,18 +225,13 @@ export function check_ownership(metadata) {
 	if (component && !has_owner(metadata, component)) {
 		let original = get_owner(metadata);
 
-		let message =
+		// @ts-expect-error
+		if (original.filename !== component.filename) {
 			// @ts-expect-error
-			original.filename !== component.filename
-				? // @ts-expect-error
-					`${component.filename} mutated a value owned by ${original.filename}. This is strongly discouraged`
-				: 'Mutating a value outside the component that created it is strongly discouraged';
-
-		// TODO get rid of this, but implement message overloads first
-		// eslint-disable-next-line no-console
-		console.warn(
-			`${message}. Consider passing values to child components with \`bind:\`, or use a callback instead.`
-		);
+			w.ownership_invalid_mutation(component.filename, original.filename);
+		} else {
+			w.ownership_invalid_mutation();
+		}
 
 		// eslint-disable-next-line no-console
 		console.trace();
diff --git a/packages/svelte/src/internal/client/warnings.js b/packages/svelte/src/internal/client/warnings.js
index 66d72758bf..eec28ac1c6 100644
--- a/packages/svelte/src/internal/client/warnings.js
+++ b/packages/svelte/src/internal/client/warnings.js
@@ -30,4 +30,18 @@ export function ownership_invalid_binding(parent, child, owner) {
 		// TODO print a link to the documentation
 		console.warn("ownership_invalid_binding");
 	}
+}
+
+/**
+ * %component% mutated a value owned by %owner%. This is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead
+ * @param {string | undefined | null} [component]
+ * @param {string | undefined | null} [owner]
+ */
+export function ownership_invalid_mutation(component, owner) {
+	if (DEV) {
+		console.warn(`%c[svelte] ${"ownership_invalid_mutation"}\n%c${`${component} mutated a value owned by ${owner}. This is strongly discouraged. Consider passing values to child components with \`bind:\`, or use a callback instead`}`, bold, normal);
+	} else {
+		// TODO print a link to the documentation
+		console.warn("ownership_invalid_mutation");
+	}
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js
index 7a78630da5..5cef52a86b 100644
--- a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js
@@ -1,14 +1,8 @@
 import { test } from '../../test';
 
-/** @type {typeof console.warn} */
-let warn;
-
 /** @type {typeof console.trace} */
 let trace;
 
-/** @type {any[]} */
-let warnings = [];
-
 export default test({
 	html: `<button>clicks: 0</button>`,
 
@@ -17,31 +11,22 @@ export default test({
 	},
 
 	before_test: () => {
-		warn = console.warn;
 		trace = console.trace;
-
-		console.warn = (...args) => {
-			warnings.push(...args);
-		};
-
 		console.trace = () => {};
 	},
 
 	after_test: () => {
-		console.warn = warn;
 		console.trace = trace;
-
-		warnings = [];
 	},
 
-	async test({ assert, target }) {
+	async test({ assert, target, warnings }) {
 		const btn = target.querySelector('button');
 		await btn?.click();
 
 		assert.htmlEqual(target.innerHTML, `<button>clicks: 1</button>`);
 
 		assert.deepEqual(warnings, [
-			'.../samples/non-local-mutation-discouraged/Counter.svelte mutated a value owned by .../samples/non-local-mutation-discouraged/main.svelte. This is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead.'
+			'.../samples/non-local-mutation-discouraged/Counter.svelte mutated a value owned by .../samples/non-local-mutation-discouraged/main.svelte. This is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-5/_config.js b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-5/_config.js
index 0d075cca25..7f0581d6c4 100644
--- a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-5/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-5/_config.js
@@ -1,31 +1,12 @@
 import { tick } from 'svelte';
 import { test } from '../../test';
 
-/** @type {typeof console.warn} */
-let warn;
-
-/** @type {any[]} */
-let warnings = [];
-
 export default test({
 	compileOptions: {
 		dev: true
 	},
 
-	before_test: () => {
-		warn = console.warn;
-
-		console.warn = (...args) => {
-			warnings.push(...args);
-		};
-	},
-
-	after_test: () => {
-		console.warn = warn;
-		warnings = [];
-	},
-
-	async test({ assert, target }) {
+	async test({ assert, target, warnings }) {
 		const [btn1, btn2] = target.querySelectorAll('button');
 
 		await btn1.click();
diff --git a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-7/_config.js b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-7/_config.js
index df3ca08f03..ec8e5ada28 100644
--- a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-7/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-inherited-owner-7/_config.js
@@ -1,31 +1,12 @@
 import { tick } from 'svelte';
 import { test } from '../../test';
 
-/** @type {typeof console.warn} */
-let warn;
-
-/** @type {any[]} */
-let warnings = [];
-
 export default test({
 	compileOptions: {
 		dev: true
 	},
 
-	before_test: () => {
-		warn = console.warn;
-
-		console.warn = (...args) => {
-			warnings.push(...args);
-		};
-	},
-
-	after_test: () => {
-		console.warn = warn;
-		warnings = [];
-	},
-
-	async test({ assert, target }) {
+	async test({ assert, target, warnings }) {
 		const [btn1, btn2] = target.querySelectorAll('button');
 
 		btn1.click();
diff --git a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js
index 6fc699efb6..fd0ace4fda 100644
--- a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js
@@ -33,7 +33,7 @@ export default test({
 		assert.htmlEqual(target.innerHTML, `<button>clicks: 1</button><button>clicks: 1</button>`);
 
 		assert.deepEqual(warnings, [
-			'.../samples/non-local-mutation-with-binding-3/Counter.svelte mutated a value owned by .../samples/non-local-mutation-with-binding-3/main.svelte. This is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead.'
+			'.../samples/non-local-mutation-with-binding-3/Counter.svelte mutated a value owned by .../samples/non-local-mutation-with-binding-3/main.svelte. This is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
index cd36ffd42d..bdb7a976a2 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "a11y_unknown_aria_attribute_suggestion",
+		"code": "a11y_unknown_aria_attribute",
 		"message": "Unknown aria attribute 'aria-labeledby'. Did you mean 'labelledby'?",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json
index 3b250958b0..a0133cc1bb 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-role/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "a11y_unknown_role_suggestion",
+		"code": "a11y_unknown_role",
 		"message": "Unknown role 'toooltip'. Did you mean 'tooltip'?",
 		"start": {
 			"line": 6,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "a11y_unknown_role_suggestion",
+		"code": "a11y_unknown_role",
 		"message": "Unknown role 'toooltip'. Did you mean 'tooltip'?",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
index de997e5394..aa2d7c1621 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "bind_invalid_detailed",
+		"code": "bind_invalid",
 		"message": "`bind:value` is not a valid binding. Foreign elements only support `bind:this`",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json b/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
index 99a1c892d3..a63e8a0877 100644
--- a/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
+++ b/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "bind_invalid_detailed",
+		"code": "bind_invalid",
 		"message": "`bind:innerwidth` is not a valid binding. Did you mean 'innerWidth'?",
 		"start": {
 			"line": 5,

From 8e17428316cbad94d21306b75f6ef4d389b6e301 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 25 Apr 2024 08:54:05 -0400
Subject: [PATCH 19/27] chore: tidy up messages (#11327)

* start reorganising messages

* tidy up

* more

* more

* more

* alphabetise

* consolidate

* more

* more

* more

* more

* more

* more

* alphabetise

* more

* this is no longer needed

* no longer necessary

* more

* more

* fix

* regenerate messages

* more

* more

* tighten up rune validation

* more

* fix

* more

* tweak a11y messages

* add server errors

* overhaul runtime errors

* regenerate messages

* unused

* lint

* more

* more

* Update packages/svelte/messages/compile-errors/script.md

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* Update packages/svelte/messages/client-warnings/warnings.md

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* fix

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .prettierignore                               |   2 +
 .../svelte/messages/client-errors/effects.md  |   3 -
 .../svelte/messages/client-errors/errors.md   |  67 ++
 .../messages/client-errors/lifecycle.md       |   7 -
 .../messages/client-warnings/warnings.md      |   8 +
 .../messages/compile-errors/attributes.md     |  59 --
 .../messages/compile-errors/bindings.md       |  33 -
 .../compile-errors/compiler_options.md        |   7 -
 .../messages/compile-errors/components.md     |   3 -
 .../messages/compile-errors/const_tag.md      |   3 -
 .../messages/compile-errors/elements.md       |  27 -
 .../compile-errors/legacy_reactivity.md       |   3 -
 .../svelte/messages/compile-errors/options.md |  11 +
 .../svelte/messages/compile-errors/parse.md   | 147 ---
 .../svelte/messages/compile-errors/runes.md   |  95 --
 .../svelte/messages/compile-errors/script.md  | 135 +++
 .../svelte/messages/compile-errors/slots.md   |  31 -
 .../compile-errors/special_elements.md        |  99 --
 .../compile-errors/{css.md => style.md}       |  46 +-
 .../messages/compile-errors/template.md       | 365 +++++++
 .../messages/compile-errors/variables.md      |  19 -
 .../svelte/messages/compile-warnings/a11y.md  | 160 +--
 .../messages/compile-warnings/attributes.md   |  15 -
 .../svelte/messages/compile-warnings/block.md |   3 -
 .../messages/compile-warnings/components.md   |   3 -
 .../svelte/messages/compile-warnings/css.md   |   3 -
 .../messages/compile-warnings/legacy.md       |  19 -
 .../svelte/messages/compile-warnings/misc.md  |   3 -
 .../messages/compile-warnings/options.md      |   8 +-
 .../messages/compile-warnings/performance.md  |   7 -
 .../svelte/messages/compile-warnings/runes.md |  19 -
 .../messages/compile-warnings/script.md       |  35 +
 .../svelte/messages/compile-warnings/state.md |   7 -
 .../svelte/messages/compile-warnings/style.md |   3 +
 .../messages/compile-warnings/template.md     |  39 +
 .../messages/server-errors/lifecycle.md       |   3 +
 .../svelte/messages/shared-errors/errors.md   |  19 +
 .../messages/shared-warnings/warnings.md      |   2 +-
 .../svelte/scripts/process-messages/index.js  |  12 +
 .../templates/server-errors.js                |  10 +
 .../templates/shared-errors.js                |  17 +
 packages/svelte/src/compiler/errors.js        | 981 ++++++++----------
 .../src/compiler/phases/1-parse/index.js      |   6 +-
 .../compiler/phases/1-parse/read/options.js   |  80 +-
 .../compiler/phases/1-parse/read/script.js    |   6 +-
 .../src/compiler/phases/1-parse/read/style.js |  11 +-
 .../compiler/phases/1-parse/state/element.js  |  50 +-
 .../src/compiler/phases/1-parse/state/tag.js  |  16 +-
 .../phases/2-analyze/css/css-analyze.js       |  18 +-
 .../src/compiler/phases/2-analyze/index.js    |  44 +-
 .../compiler/phases/2-analyze/validation.js   | 251 +++--
 packages/svelte/src/compiler/phases/scope.js  |   7 +-
 .../svelte/src/compiler/validate-options.js   |   9 +-
 packages/svelte/src/compiler/warnings.js      | 516 +++++----
 packages/svelte/src/index-client.js           |  13 +-
 packages/svelte/src/index-server.js           |   7 +-
 .../client/dom/elements/attributes.js         |  12 +-
 .../client/dom/elements/bindings/input.js     |  11 +-
 .../src/internal/client/dom/hydration.js      |   3 +-
 packages/svelte/src/internal/client/errors.js | 233 ++++-
 packages/svelte/src/internal/client/index.js  |   4 +-
 packages/svelte/src/internal/client/proxy.js  |   3 +-
 .../src/internal/client/reactivity/effects.js |  14 +-
 .../src/internal/client/reactivity/props.js   |  14 +-
 .../src/internal/client/reactivity/sources.js |  10 +-
 packages/svelte/src/internal/client/render.js |  12 +-
 .../svelte/src/internal/client/runtime.js     |   9 +-
 .../svelte/src/internal/client/validate.js    |  61 +-
 .../svelte/src/internal/client/warnings.js    |  27 +
 .../svelte/src/internal/server/context.js     |  24 +-
 packages/svelte/src/internal/server/errors.js |  13 +
 packages/svelte/src/internal/server/index.js  |  24 +-
 packages/svelte/src/internal/shared/errors.js |  85 ++
 .../svelte/src/internal/shared/validate.js    |  22 +-
 .../samples/attribute-empty/_config.js        |   2 +-
 .../_config.js                                |   2 +-
 .../attribute-sequence-expression/_config.js  |   2 +-
 .../attribute-unique-binding/_config.js       |   2 +-
 .../attribute-unique-shorthand/_config.js     |   2 +-
 .../samples/attribute-unique/_config.js       |   2 +-
 .../samples/catch-without-await/_config.js    |   2 +-
 .../class-state-field-static/_config.js       |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../component-slot-duplicate-error/_config.js |   2 +-
 .../component-slot-nested-error-2/_config.js  |   2 +-
 .../component-slot-nested-error-3/_config.js  |   2 +-
 .../component-slot-nested-error/_config.js    |   2 +-
 .../css-global-block-combinator/_config.js    |   2 +-
 .../css-global-block-declaration/_config.js   |   2 +-
 .../css-global-block-modifier/_config.js      |   2 +-
 .../css-global-block-multiple/_config.js      |   2 +-
 .../compiler-errors/samples/css/_config.js    |   2 +-
 .../dollar-binding-declaration/_config.js     |   2 +-
 .../dollar-binding-global-js/_config.js       |   2 +-
 .../samples/dollar-binding-global/_config.js  |   2 +-
 .../samples/dollar-binding-import/_config.js  |   2 +-
 .../samples/else-before-closing-3/_config.js  |   2 +-
 .../samples/else-before-closing/_config.js    |   2 +-
 .../else-if-before-closing-2/_config.js       |   2 +-
 .../empty-attribute-shorthand/_config.js      |   2 +-
 .../empty-classname-binding/_config.js        |   6 +-
 .../samples/empty-directive-name/_config.js   |   6 +-
 .../samples/export-derived-state/_config.js   |   2 +-
 .../samples/export-state-module/_config.js    |   2 +-
 .../samples/export-state/_config.js           |   2 +-
 .../invalid-snippet-binding/_config.js        |   2 +-
 .../invalid-snippet-mutation/_config.js       |   2 +-
 .../legacy-no-const-assignment/_config.js     |   2 +-
 .../samples/legacy-no-const-update/_config.js |   2 +-
 .../samples/multiple-styles/_config.js        |   2 +-
 .../samples/options-children/_config.js       |   2 +-
 .../raw-mustaches-whitespace/_config.js       |   2 +-
 .../render-tag-invalid-call/_config.js        |   2 +-
 .../runes-before-after-update/_config.js      |   2 +-
 .../runes-bindable-not-called/_config.js      |   8 +
 .../runes-bindable-not-called/main.svelte}    |   0
 .../samples/runes-duplicate-props/_config.js  |   2 +-
 .../samples/runes-export-let/_config.js       |   4 +-
 .../runes-export-named-state/_config.js       |   2 +-
 .../runes-invalid-each-binding/_config.js     |   2 +-
 .../runes-invalid-each-mutation/_config.js    |   2 +-
 .../runes-no-const-assignment/_config.js      |   2 +-
 .../samples/runes-no-const-update/_config.js  |   2 +-
 .../runes-no-derived-assignment/_config.js    |   2 +-
 .../runes-no-derived-binding/_config.js       |   2 +-
 .../_config.js                                |   2 +-
 .../_config.js                                |   2 +-
 .../runes-no-derived-update/_config.js        |   2 +-
 .../samples/runes-no-rune-each/_config.js     |   2 +-
 .../runes-prop-export-conflict/_config.js     |   8 -
 .../runes-prop-export-conflict/main.svelte    |   4 -
 .../samples/runes-props-not-called/_config.js |   8 +
 .../runes-props-not-called/main.svelte}       |   0
 .../runes-wrong-bindable-args/_config.js      |   2 +-
 .../runes-wrong-bindable-placement/_config.js |   2 +-
 .../runes-wrong-derived-args/_config.js       |   2 +-
 .../runes-wrong-derived-placement/_config.js  |   2 +-
 .../runes-wrong-effect-args/_config.js        |   2 +-
 .../runes-wrong-effect-placement/_config.js   |   2 +-
 .../runes-wrong-host-placement/_config.js     |   2 +-
 .../samples/runes-wrong-props-args/_config.js |   2 +-
 .../runes-wrong-props-placement/_config.js    |   2 +-
 .../samples/runes-wrong-state-args/_config.js |   2 +-
 .../runes-wrong-state-placement/_config.js    |   2 +-
 .../_config.js                                |   2 +-
 .../samples/script-unclosed/_config.js        |   2 +-
 .../samples/self-reference/_config.js         |   4 +-
 .../_config.js                                |   2 +-
 .../snippet-children-conflict/_config.js      |   2 +-
 .../store-autosub-context-module/_config.js   |   2 +-
 .../samples/store-contextual/_config.js       |   2 +-
 .../store-global-disallowed/_config.js        |   2 +-
 .../_config.js                                |   2 +-
 .../samples/store-shadow-scope-2/_config.js   |   2 +-
 .../samples/store-shadow-scope-3/_config.js   |   2 +-
 .../samples/store-shadow-scope/_config.js     |   2 +-
 .../_config.js                                |   2 +-
 .../samples/style-unclosed/_config.js         |   2 +-
 .../samples/svelte-selfdestructive/_config.js |   2 +-
 .../samples/then-before-closing/_config.js    |   2 +-
 .../samples/then-without-await/_config.js     |   2 +-
 .../_config.js                                |   4 +-
 .../unexpected-end-of-input-d/_config.js      |   2 +-
 .../unexpected-end-of-input/_config.js        |   2 +-
 .../_config.js                                |   4 +-
 .../_config.js                                |   4 +-
 .../samples/unmatched-closing-tag/_config.js  |   4 +-
 .../samples/void-closing/_config.js           |   2 +-
 .../samples/window-children/_config.js        |   2 +-
 .../samples/window-duplicate/_config.js       |   4 +-
 .../samples/window-inside-block/_config.js    |   4 +-
 .../samples/window-inside-element/_config.js  |   4 +-
 .../samples/ignore-mismatched-href/_config.js |   2 +-
 packages/svelte/tests/hydration/test.ts       |  25 +-
 .../extended-builtin/_config.js               |   2 +-
 .../component-not-constructor-dev/_config.js  |   3 +-
 .../component-not-constructor2-dev/_config.js |   2 +-
 .../dynamic-element-invalid-this/_config.js   |   4 +-
 .../each-block-keyed-non-prop/_config.js      |   6 +-
 .../_config.js                                |   4 +-
 .../samples/each-block-keyed/_config.js       |   4 +-
 .../samples/keyed-each-dev-unique/_config.js  |   3 +-
 .../samples/store-dev-mode-error/_config.js   |   2 +-
 .../samples/export-binding/_config.js         |   4 +-
 .../samples/props-bound-fallback/_config.js   |   2 +-
 .../props-not-bindable-spread/_config.js      |   9 +-
 .../samples/props-not-bindable/_config.js     |   9 +-
 .../snippet-validation-error-1/_config.js     |   3 +-
 .../snippet-validation-error-2/_config.js     |   2 +-
 .../samples/a11y-alt-text/warnings.json       |   8 +-
 .../a11y-anchor-has-content/warnings.json     |   2 +-
 .../a11y-anchor-in-svg-is-valid/warnings.json |   2 +-
 .../a11y-anchor-is-valid/warnings.json        |   6 +-
 .../a11y-aria-activedescendant/warnings.json  |   2 +-
 .../samples/a11y-aria-props/warnings.json     |   2 +-
 .../warnings.json                             |   4 +-
 .../a11y-autocomplete-valid/warnings.json     |   6 +-
 .../warnings.json                             |  16 +-
 .../a11y-heading-has-content/warnings.json    |   4 +-
 .../samples/a11y-html-has-lang/warnings.json  |   2 +-
 .../a11y-iframe-has-title/warnings.json       |   2 +-
 .../a11y-img-redundant-alt/warnings.json      |   6 +-
 .../a11y-media-has-caption/warnings.json      |   8 +-
 .../warnings.json                             |   4 +-
 .../warnings.json                             |  92 +-
 .../warnings.json                             |  10 +-
 .../warnings.json                             |  96 +-
 .../warnings.json                             |   4 +-
 .../warnings.json                             | 118 +--
 .../samples/a11y-scope/warnings.json          |   2 +-
 .../samples/action-on-component/errors.json   |   2 +-
 .../animation-on-component/errors.json        |   2 +-
 .../samples/assignment-to-const-2/errors.json |   2 +-
 .../samples/assignment-to-const-3/errors.json |   2 +-
 .../samples/assignment-to-const-4/errors.json |   2 +-
 .../samples/assignment-to-const-5/errors.json |   2 +-
 .../samples/assignment-to-const-7/errors.json |   2 +-
 .../samples/assignment-to-const/errors.json   |   2 +-
 .../attribute-invalid-name-2/errors.json      |   2 +-
 .../attribute-invalid-name-3/errors.json      |   2 +-
 .../attribute-invalid-name-4/errors.json      |   2 +-
 .../attribute-invalid-name-5/errors.json      |   2 +-
 .../attribute-invalid-name/errors.json        |   2 +-
 .../samples/binding-await-catch/errors.json   |   2 +-
 .../samples/binding-await-then-2/errors.json  |   2 +-
 .../samples/binding-await-then/errors.json    |   2 +-
 .../samples/binding-const/errors.json         |   2 +-
 .../binding-input-type-boolean/errors.json    |   2 +-
 .../errors.json                               |   2 +-
 .../binding-invalid-value-global/errors.json  |   2 +-
 .../samples/binding-invalid-value/errors.json |   2 +-
 .../samples/binding-invalid/errors.json       |   2 +-
 .../validator/samples/binding-let/errors.json |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../component-name-lowercase/warnings.json    |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../component-slot-dynamic/errors.json        |   2 +-
 .../errors.json                               |   2 +-
 .../component-slotted-each-block/errors.json  |   2 +-
 .../component-slotted-if-block/errors.json    |   2 +-
 .../samples/const-tag-conflict-1/errors.json  |   2 +-
 .../samples/const-tag-conflict-2/errors.json  |   2 +-
 .../samples/const-tag-placement-1/errors.json |   4 +-
 .../samples/const-tag-placement-2/errors.json |   4 +-
 .../samples/const-tag-readonly-1/errors.json  |   2 +-
 .../samples/const-tag-readonly-2/errors.json  |   2 +-
 .../contenteditable-dynamic/errors.json       |   2 +-
 .../contenteditable-missing/errors.json       |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../css-invalid-global-placement/errors.json  |   2 +-
 .../css-invalid-global-selector-2/errors.json |   2 +-
 .../css-invalid-global-selector-3/errors.json |   2 +-
 .../css-invalid-global-selector-4/errors.json |   2 +-
 .../css-invalid-global-selector-5/errors.json |   2 +-
 .../css-invalid-global-selector-6/errors.json |   2 +-
 .../errors.json                               |   2 +-
 .../css-invalid-global-selector/errors.json   |   2 +-
 .../errors.json                               |   2 +-
 .../samples/debug-invalid-args/errors.json    |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../samples/default-export/errors.json        |   2 +-
 .../directive-non-expression/errors.json      |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../dollar-global-in-markup/errors.json       |   2 +-
 .../dollar-global-in-script/errors.json       |   2 +-
 .../dynamic-element-invalid-tag/errors.json   |   4 +-
 .../dynamic-element-missing-tag/errors.json   |   2 +-
 .../samples/empty-block/warnings.json         |   8 +-
 .../samples/error-mode-warn/warnings.json     |   2 +-
 .../samples/event-attribute/errors.json       |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../event-modifiers-invalid/errors.json       |   2 +-
 .../global-event-reference/warnings.json      |   8 +-
 .../html-block-in-attribute/errors.json       |   2 +-
 .../html-block-in-textarea/errors.json        |   2 +-
 .../samples/ignore-warning/warnings.json      |   4 +-
 .../ignore-warnings-cumulative/warnings.json  |   2 +-
 .../ignore-warnings-newline/warnings.json     |   2 +-
 .../ignore-warnings-stacked/warnings.json     |   2 +-
 .../samples/ignore-warnings/warnings.json     |   2 +-
 .../illegal-attribute-character/warnings.json |   4 +-
 .../illegal-variable-declaration/errors.json  |   2 +-
 .../samples/inline-new-class-2/warnings.json  |   2 +-
 .../samples/inline-new-class-4/warnings.json  |   2 +-
 .../samples/inline-new-class/warnings.json    |   2 +-
 .../invalid-empty-css-declaration/errors.json |   4 +-
 .../invalid-node-placement-2/errors.json      |   2 +-
 .../invalid-node-placement/errors.json        |   2 +-
 .../invalid-self-closing-tag/warnings.json    |   8 +-
 .../samples/let-directive/errors.json         |   2 +-
 .../logic-block-in-attribute/errors.json      |   2 +-
 .../logic-block-in-textarea/errors.json       |   2 +-
 .../warnings.json                             |   2 +-
 .../errors.json                               |   2 +-
 .../errors.json                               |   2 +-
 .../samples/namespace-invalid/errors.json     |   4 +-
 .../samples/namespace-non-literal/errors.json |   4 +-
 .../reactive-declaration-cyclical/errors.json |   2 +-
 .../warnings.json                             |   2 +-
 .../reactive-module-variable/warnings.json    |   2 +-
 .../rest-eachblock-binding-2/warnings.json    |   2 +-
 .../rest-eachblock-binding-3/warnings.json    |   2 +-
 .../warnings.json                             |   4 +-
 .../rest-eachblock-binding/warnings.json      |   2 +-
 .../runes-bindable-not-called/_config.js      |   3 -
 .../runes-bindable-not-called/warnings.json   |  14 -
 .../warnings.json                             |  12 +-
 .../samples/runes-props-not-called/_config.js |   3 -
 .../runes-props-not-called/warnings.json      |  14 -
 .../warnings.json                             |   2 +-
 .../runes-referenced-nonstate/warnings.json   |   4 +-
 .../script-invalid-context/errors.json        |   2 +-
 .../samples/silence-warnings-2/input.svelte   |   2 +-
 .../samples/silence-warnings/input.svelte     |   2 +-
 .../slot-attribute-invalid/errors.json        |   2 +-
 .../samples/slot-warning/warnings.json        |   2 +-
 .../samples/slot-warning2/warnings.json       |   2 +-
 .../static-state-reference/warnings.json      |   4 +-
 .../store-runes-conflict/warnings.json        |   2 +-
 .../errors.json                               |   4 +-
 .../svelte-fragment-placement-2/errors.json   |   2 +-
 .../svelte-fragment-placement/errors.json     |   2 +-
 .../svelte-head-attributes/errors.json        |   2 +-
 .../validator/samples/tag-invalid/errors.json |   2 +-
 .../samples/tag-non-string/errors.json        |   2 +-
 .../textarea-value-children/errors.json       |   2 +-
 .../samples/title-no-attributes/errors.json   |   2 +-
 .../samples/title-no-children/errors.json     |   2 +-
 .../transition-on-component/errors.json       |   2 +-
 .../unreferenced-variables-each/warnings.json |   4 +-
 .../unreferenced-variables/warnings.json      |  10 +-
 .../samples/use-the-platform/warnings.json    |   4 +-
 .../errors.json                               |   2 +-
 .../window-binding-invalid/errors.json        |   2 +-
 packages/svelte/tests/validator/test.ts       |   2 +-
 353 files changed, 2772 insertions(+), 2477 deletions(-)
 delete mode 100644 packages/svelte/messages/client-errors/effects.md
 create mode 100644 packages/svelte/messages/client-errors/errors.md
 delete mode 100644 packages/svelte/messages/client-errors/lifecycle.md
 delete mode 100644 packages/svelte/messages/compile-errors/attributes.md
 delete mode 100644 packages/svelte/messages/compile-errors/bindings.md
 delete mode 100644 packages/svelte/messages/compile-errors/compiler_options.md
 delete mode 100644 packages/svelte/messages/compile-errors/components.md
 delete mode 100644 packages/svelte/messages/compile-errors/const_tag.md
 delete mode 100644 packages/svelte/messages/compile-errors/elements.md
 delete mode 100644 packages/svelte/messages/compile-errors/legacy_reactivity.md
 create mode 100644 packages/svelte/messages/compile-errors/options.md
 delete mode 100644 packages/svelte/messages/compile-errors/parse.md
 delete mode 100644 packages/svelte/messages/compile-errors/runes.md
 create mode 100644 packages/svelte/messages/compile-errors/script.md
 delete mode 100644 packages/svelte/messages/compile-errors/slots.md
 delete mode 100644 packages/svelte/messages/compile-errors/special_elements.md
 rename packages/svelte/messages/compile-errors/{css.md => style.md} (60%)
 create mode 100644 packages/svelte/messages/compile-errors/template.md
 delete mode 100644 packages/svelte/messages/compile-errors/variables.md
 delete mode 100644 packages/svelte/messages/compile-warnings/attributes.md
 delete mode 100644 packages/svelte/messages/compile-warnings/block.md
 delete mode 100644 packages/svelte/messages/compile-warnings/components.md
 delete mode 100644 packages/svelte/messages/compile-warnings/css.md
 delete mode 100644 packages/svelte/messages/compile-warnings/legacy.md
 delete mode 100644 packages/svelte/messages/compile-warnings/misc.md
 delete mode 100644 packages/svelte/messages/compile-warnings/performance.md
 delete mode 100644 packages/svelte/messages/compile-warnings/runes.md
 create mode 100644 packages/svelte/messages/compile-warnings/script.md
 delete mode 100644 packages/svelte/messages/compile-warnings/state.md
 create mode 100644 packages/svelte/messages/compile-warnings/style.md
 create mode 100644 packages/svelte/messages/compile-warnings/template.md
 create mode 100644 packages/svelte/messages/server-errors/lifecycle.md
 create mode 100644 packages/svelte/messages/shared-errors/errors.md
 create mode 100644 packages/svelte/scripts/process-messages/templates/server-errors.js
 create mode 100644 packages/svelte/scripts/process-messages/templates/shared-errors.js
 create mode 100644 packages/svelte/src/internal/server/errors.js
 create mode 100644 packages/svelte/src/internal/shared/errors.js
 create mode 100644 packages/svelte/tests/compiler-errors/samples/runes-bindable-not-called/_config.js
 rename packages/svelte/tests/{validator/samples/runes-bindable-not-called/input.svelte => compiler-errors/samples/runes-bindable-not-called/main.svelte} (100%)
 delete mode 100644 packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js
 delete mode 100644 packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/main.svelte
 create mode 100644 packages/svelte/tests/compiler-errors/samples/runes-props-not-called/_config.js
 rename packages/svelte/tests/{validator/samples/runes-props-not-called/input.svelte => compiler-errors/samples/runes-props-not-called/main.svelte} (100%)
 delete mode 100644 packages/svelte/tests/validator/samples/runes-bindable-not-called/_config.js
 delete mode 100644 packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json
 delete mode 100644 packages/svelte/tests/validator/samples/runes-props-not-called/_config.js
 delete mode 100644 packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json

diff --git a/.prettierignore b/.prettierignore
index 0e08fae5e9..0567f05cd8 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,7 +7,9 @@ packages/svelte/src/compiler/errors.js
 packages/svelte/src/compiler/warnings.js
 packages/svelte/src/internal/client/errors.js
 packages/svelte/src/internal/client/warnings.js
+packages/svelte/src/internal/shared/errors.js
 packages/svelte/src/internal/shared/warnings.js
+packages/svelte/src/internal/server/errors.js
 packages/svelte/tests/**/*.svelte
 packages/svelte/tests/**/_expected*
 packages/svelte/tests/**/_actual*
diff --git a/packages/svelte/messages/client-errors/effects.md b/packages/svelte/messages/client-errors/effects.md
deleted file mode 100644
index 88847ea0d5..0000000000
--- a/packages/svelte/messages/client-errors/effects.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## effect_update_depth_exceeded
-
-> Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops
\ No newline at end of file
diff --git a/packages/svelte/messages/client-errors/errors.md b/packages/svelte/messages/client-errors/errors.md
new file mode 100644
index 0000000000..aeeb133226
--- /dev/null
+++ b/packages/svelte/messages/client-errors/errors.md
@@ -0,0 +1,67 @@
+## bind_invalid_checkbox_value
+
+> Using `bind:value` together with a checkbox input is not allowed. Use `bind:checked` instead
+
+## bind_invalid_export
+
+> Component %component% has an export named `%key%` that a consumer component is trying to access using `bind:%key%`, which is disallowed. Instead, use `bind:this` (e.g. `<%name% bind:this={component} />`) and then access the property on the bound component instance (e.g. `component.%key%`)
+
+## bind_not_bindable
+
+> A component is attempting to bind to a non-bindable property `%key%` belonging to %component% (i.e. `<%name% bind:%key%={...}>`). To mark a property as bindable: `let { %key% = $bindable() } = $props()`
+
+## each_key_duplicate
+
+> Keyed each block has duplicate key at indexes %a% and %b%
+
+> Keyed each block has duplicate key `%value%` at indexes %a% and %b%
+
+## effect_in_teardown
+
+> `%rune%` cannot be used inside an effect cleanup function
+
+## effect_orphan
+
+> `%rune%` can only be used inside an effect (e.g. during component initialisation)
+
+## effect_update_depth_exceeded
+
+> Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops
+
+## hydration_missing_marker_close
+
+> Missing hydration closing marker
+
+## hydration_missing_marker_open
+
+> Missing hydration opening marker
+
+## lifecycle_legacy_only
+
+> `%name%(...)` cannot be used in runes mode
+
+## props_invalid_value
+
+> Cannot do `bind:%key%={undefined}` when `%key%` has a fallback value
+
+## props_rest_readonly
+
+> Rest element properties of `$props()` such as `%property%` are readonly
+
+## rune_outside_svelte
+
+> The `%rune%` rune is only available inside `.svelte` and `.svelte.js/ts` files
+
+## state_prototype_fixed
+
+> Cannot set prototype of `$state` object
+
+## state_unsafe_mutation
+
+> Unsafe mutations during Svelte's render or derived phase are not permitted in runes mode. This can lead to unexpected errors and possibly cause infinite loops.
+>
+> If the object is not meant to be reactive, declare it without `$state`
+
+## svelte_component_invalid_this_value
+
+> The `this={...}` property of a `<svelte:component>` must be a Svelte component, if defined
diff --git a/packages/svelte/messages/client-errors/lifecycle.md b/packages/svelte/messages/client-errors/lifecycle.md
deleted file mode 100644
index 98b644d8ec..0000000000
--- a/packages/svelte/messages/client-errors/lifecycle.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## lifecycle_outside_component
-
-> `%name%(...)` can only be used during component initialisation
-
-## lifecycle_legacy_only
-
-> `%name%(...)` cannot be used in runes mode
\ No newline at end of file
diff --git a/packages/svelte/messages/client-warnings/warnings.md b/packages/svelte/messages/client-warnings/warnings.md
index 865d968144..1f77457f94 100644
--- a/packages/svelte/messages/client-warnings/warnings.md
+++ b/packages/svelte/messages/client-warnings/warnings.md
@@ -1,3 +1,11 @@
+## hydration_attribute_changed
+
+> The `%attribute%` attribute on `%html%` changed its value between server and client renders. The client value, `%value%`, will be ignored in favour of the server value
+
+## hydration_mismatch
+
+> Hydration failed because the initial UI does not match what was rendered on the server
+
 ## lifecycle_double_unmount
 
 > Tried to unmount a component that was not mounted
diff --git a/packages/svelte/messages/compile-errors/attributes.md b/packages/svelte/messages/compile-errors/attributes.md
deleted file mode 100644
index 8e27e74076..0000000000
--- a/packages/svelte/messages/compile-errors/attributes.md
+++ /dev/null
@@ -1,59 +0,0 @@
-## empty_attribute_shorthand
-
-> Attribute shorthand cannot be empty
-
-## duplicate_attribute
-
-> Attributes need to be unique
-
-## invalid_event_attribute_value
-
-> Event attribute must be a JavaScript expression, not a string
-
-## invalid_attribute_name
-
-> '%name%' is not a valid attribute name
-
-## animation_invalid_placement
-
-> An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
-
-## animation_missing_key
-
-> An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
-
-## animation_duplicate
-
-> An element can only have one 'animate' directive
-
-## invalid_event_modifier
-
-> Valid event modifiers are %list%
-
-## invalid_component_event_modifier
-
-> Event modifiers other than 'once' can only be used on DOM elements
-
-## invalid_event_modifier_combination
-
-> The '%modifier1%' and '%modifier2%' modifiers cannot be used together
-
-## transition_duplicate
-
-> Cannot use multiple `%type%:` directives on a single element
-
-## transition_conflict
-
-> Cannot use `%type%:` alongside existing `%existing%:` directive
-
-## invalid_let_directive_placement
-
-> `let:` directive at invalid position
-
-## invalid_style_directive_modifier
-
-> Invalid 'style:' modifier. Valid modifiers are: 'important'
-
-## invalid_sequence_expression
-
-> Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/bindings.md b/packages/svelte/messages/compile-errors/bindings.md
deleted file mode 100644
index 1a7ef806ac..0000000000
--- a/packages/svelte/messages/compile-errors/bindings.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## invalid_binding_expression
-
-> Can only bind to an Identifier or MemberExpression
-
-## invalid_binding_value
-
-> Can only bind to state or props
-
-## bind_invalid_target
-
-> `bind:%name%` can only be used with %elements%
-
-## bind_invalid
-
-> `bind:%name%` is not a valid binding
-
-> `bind:%name%` is not a valid binding. %explanation%
-
-## invalid_type_attribute
-
-> 'type' attribute must be a static text value if input uses two-way binding
-
-## invalid_multiple_attribute
-
-> 'multiple' attribute must be static if select uses two-way binding
-
-## missing_contenteditable_attribute
-
-> 'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
-
-## dynamic_contenteditable_attribute
-
-> 'contenteditable' attribute cannot be dynamic if element uses two-way binding
diff --git a/packages/svelte/messages/compile-errors/compiler_options.md b/packages/svelte/messages/compile-errors/compiler_options.md
deleted file mode 100644
index b2702a1a7e..0000000000
--- a/packages/svelte/messages/compile-errors/compiler_options.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## invalid_compiler_option
-
-> Invalid compiler option: %msg%
-
-## removed_compiler_option
-
-> Invalid compiler option: %msg%
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/components.md b/packages/svelte/messages/compile-errors/components.md
deleted file mode 100644
index 651c80d733..0000000000
--- a/packages/svelte/messages/compile-errors/components.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## invalid_component_directive
-
-> This type of directive is not valid on components
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/const_tag.md b/packages/svelte/messages/compile-errors/const_tag.md
deleted file mode 100644
index 720aba9860..0000000000
--- a/packages/svelte/messages/compile-errors/const_tag.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## invalid_const_placement
-
-> {@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/elements.md b/packages/svelte/messages/compile-errors/elements.md
deleted file mode 100644
index 2686f2370d..0000000000
--- a/packages/svelte/messages/compile-errors/elements.md
+++ /dev/null
@@ -1,27 +0,0 @@
-## invalid_textarea_content
-
-> A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
-
-## invalid_void_content
-
-> Void elements cannot have children or closing tags
-
-## invalid_element_content
-
-> <%name%> cannot have children
-
-## invalid_tag_name
-
-> Expected valid tag name
-
-## invalid_node_placement
-
-> %thing% is invalid inside <%parent%>
-
-## illegal_title_attribute
-
-> `<title>` cannot have attributes nor directives
-
-## invalid_title_content
-
-> `<title>` can only contain text and {tags}
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/legacy_reactivity.md b/packages/svelte/messages/compile-errors/legacy_reactivity.md
deleted file mode 100644
index cc4504b08e..0000000000
--- a/packages/svelte/messages/compile-errors/legacy_reactivity.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## cyclical_reactive_declaration
-
-> Cyclical dependency detected: %cycle%
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/options.md b/packages/svelte/messages/compile-errors/options.md
new file mode 100644
index 0000000000..0709f0d3f6
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/options.md
@@ -0,0 +1,11 @@
+## options_invalid_value
+
+> Invalid compiler option: %details%
+
+## options_removed
+
+> Invalid compiler option: %details%
+
+## options_unrecognised
+
+> Unrecognised compiler option %keypath%
diff --git a/packages/svelte/messages/compile-errors/parse.md b/packages/svelte/messages/compile-errors/parse.md
deleted file mode 100644
index c7270f0d45..0000000000
--- a/packages/svelte/messages/compile-errors/parse.md
+++ /dev/null
@@ -1,147 +0,0 @@
-## unclosed_element
-
-> `<%name%>` was left open
-
-## unclosed_block
-
-> Block was left open
-
-## unexpected_block_close
-
-> Unexpected block closing tag
-
-## unexpected_eof
-
-> Unexpected end of input
-
-## js_parse_error
-
-> %message%
-
-## expected_token
-
-> Expected token %token%
-
-## unexpected_reserved_word
-
-> '%word%' is a reserved word in JavaScript and cannot be used here
-
-## missing_whitespace
-
-> Expected whitespace
-
-## expected_pattern
-
-> Expected identifier or destructure pattern
-
-## invalid_script_context
-
-> If the context attribute is supplied, its value must be "module"
-
-## invalid_elseif
-
-> 'elseif' should be 'else if'
-
-## invalid_continuing_block_placement
-
-> {:...} block is invalid at this position (did you forget to close the preceeding element or block?)
-
-## invalid_block_missing_parent
-
-> %child% block must be a child of %parent%
-
-## duplicate_block_part
-
-> %name% cannot appear more than once within a block
-
-## expected_block_type
-
-> Expected 'if', 'each', 'await', 'key' or 'snippet'
-
-## expected_identifier
-
-> Expected an identifier
-
-## invalid_debug
-
-> {@debug ...} arguments must be identifiers, not arbitrary expressions
-
-## invalid_const
-
-> {@const ...} must be an assignment
-
-## invalid_block_placement
-
-> {#%name% ...} block cannot be %location%
-
-## invalid_tag_placement
-
-> {@%name% ...} tag cannot be %location%
-
-## missing_attribute_value
-
-> Expected attribute value
-
-## unclosed_attribute_value
-
-> Expected closing %delimiter% character
-
-## invalid_directive_value
-
-> Directive value must be a JavaScript expression enclosed in curly braces
-
-## empty_directive_name
-
-> %type% name cannot be empty
-
-## invalid_closing_tag
-
-> </%name%> attempted to close an element that was not open
-
-## invalid_closing_tag_after_autoclose
-
-> </%name%> attempted to close element that was already automatically closed by <%reason%> (cannot nest <%reason%> inside <%name%>)
-
-## invalid_dollar_binding
-
-> The $ name is reserved, and cannot be used for variables and imports
-
-## invalid_dollar_prefix
-
-> The $ prefix is reserved, and cannot be used for variables and imports
-
-## invalid_dollar_global
-
-> The $ name is reserved. To reference a global variable called $, use globalThis.$
-
-## illegal_subscription
-
-> Cannot reference store value inside `<script context="module">`
-
-## duplicate_style_element
-
-> A component can have a single top-level `<style>` element
-
-## duplicate_script_element
-
-> A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
-
-## invalid_render_expression
-
-> {@render ...} tags can only contain call expressions
-
-## invalid_render_arguments
-
-> expected at most one argument
-
-## invalid_render_call
-
-> Calling a snippet function using apply, bind or call is not allowed
-
-## invalid_render_spread_argument
-
-> cannot use spread arguments in {@render ...} tags
-
-## invalid_snippet_rest_parameter
-
-> snippets do not support rest parameters; use an array instead
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/runes.md b/packages/svelte/messages/compile-errors/runes.md
deleted file mode 100644
index 3cb2465754..0000000000
--- a/packages/svelte/messages/compile-errors/runes.md
+++ /dev/null
@@ -1,95 +0,0 @@
-## invalid_legacy_props
-
-> Cannot use `$$props` in runes mode
-
-## invalid_legacy_rest_props
-
-> Cannot use `$$restProps` in runes mode
-
-## invalid_legacy_reactive_statement
-
-> `$:` is not allowed in runes mode, use `$derived` or `$effect` instead
-
-## invalid_legacy_export
-
-> Cannot use `export let` in runes mode — use $props instead
-
-## invalid_rune_usage
-
-> Cannot use %rune% rune in non-runes mode
-
-## invalid_state_export
-
-> Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
-
-## invalid_derived_export
-
-> Cannot export derived state from a module. To expose the current derived value, export a function returning its value
-
-## invalid_props_id
-
-> `$props()` can only be used with an object destructuring pattern
-
-## invalid_props_pattern
-
-> `$props()` assignment must not contain nested properties or computed keys
-
-## invalid_props_location
-
-> `$props()` can only be used at the top level of components as a variable declaration initializer
-
-## invalid_bindable_location
-
-> `$bindable()` can only be used inside a `$props()` declaration
-
-## invalid_state_location
-
-> `%rune%(...)` can only be used as a variable declaration initializer or a class field
-
-## invalid_effect_location
-
-> `$effect()` can only be used as an expression statement
-
-## invalid_host_location
-
-> `$host()` can only be used inside custom element component instances
-
-## invalid_assignment
-
-> Cannot assign to %thing%
-
-## invalid_binding
-
-> Cannot bind to %thing%
-
-## invalid_rune_args
-
-> `%rune%` cannot be called with arguments
-
-## invalid_rune_args_length
-
-> `%rune%` must be called with %args%
-
-## invalid_runes_mode_import
-
-> %name% cannot be used in runes mode
-
-## duplicate_props_rune
-
-> Cannot use `$props()` more than once
-
-## invalid_each_assignment
-
-> Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
-
-## invalid_snippet_assignment
-
-> Cannot reassign or bind to snippet parameter
-
-## invalid_derived_call
-
-> `$derived.call(...)` has been replaced with `$derived.by(...)`
-
-## conflicting_property_name
-
-> Cannot have a property and a component export with the same name
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/script.md b/packages/svelte/messages/compile-errors/script.md
new file mode 100644
index 0000000000..861ac2f56d
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/script.md
@@ -0,0 +1,135 @@
+## bindable_invalid_location
+
+> `$bindable()` can only be used inside a `$props()` declaration
+
+## constant_assignment
+
+> Cannot assign to %thing%
+
+## constant_binding
+
+> Cannot bind to %thing%
+
+## declaration_duplicate
+
+> `%name%` has already been declared
+
+## declaration_duplicate_module_import
+
+> Cannot declare same variable name which is imported inside `<script context="module">`
+
+## derived_invalid_export
+
+> Cannot export derived state from a module. To expose the current derived value, export a function returning its value
+
+## dollar_binding_invalid
+
+> The $ name is reserved, and cannot be used for variables and imports
+
+## dollar_prefix_invalid
+
+> The $ prefix is reserved, and cannot be used for variables and imports
+
+## each_item_invalid_assignment
+
+> Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
+
+## effect_invalid_placement
+
+> `$effect()` can only be used as an expression statement
+
+## global_reference_invalid
+
+> `%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
+
+## host_invalid_placement
+
+> `$host()` can only be used inside custom element component instances
+
+## legacy_export_invalid
+
+> Cannot use `export let` in runes mode — use `$props()` instead
+
+## legacy_props_invalid
+
+> Cannot use `$$props` in runes mode
+
+## legacy_reactive_statement_invalid
+
+> `$:` is not allowed in runes mode, use `$derived` or `$effect` instead
+
+## legacy_rest_props_invalid
+
+> Cannot use `$$restProps` in runes mode
+
+## module_illegal_default_export
+
+> A component cannot have a default export
+
+## props_duplicate
+
+> Cannot use `$props()` more than once
+
+## props_invalid_identifier
+
+> `$props()` can only be used with an object destructuring pattern
+
+## props_invalid_pattern
+
+> `$props()` assignment must not contain nested properties or computed keys
+
+## props_invalid_placement
+
+> `$props()` can only be used at the top level of components as a variable declaration initializer
+
+## reactive_declaration_cycle
+
+> Cyclical dependency detected: %cycle%
+
+## rune_invalid_arguments
+
+> `%rune%` cannot be called with arguments
+
+## rune_invalid_arguments_length
+
+> `%rune%` must be called with %args%
+
+## rune_invalid_computed_property
+
+> Cannot access a computed property of a rune
+
+## rune_invalid_name
+
+> `%name%` is not a valid rune
+
+## rune_invalid_usage
+
+> Cannot use `%rune%` rune in non-runes mode
+
+## rune_missing_parentheses
+
+> Cannot use rune without parentheses
+
+## runes_mode_invalid_import
+
+> %name% cannot be used in runes mode
+
+## snippet_parameter_assignment
+
+> Cannot reassign or bind to snippet parameter
+
+## state_invalid_export
+
+> Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
+
+## state_invalid_placement
+
+> `%rune%(...)` can only be used as a variable declaration initializer or a class field
+
+## store_invalid_scoped_subscription
+
+> Cannot subscribe to stores that are not declared at the top level of the component
+
+## store_invalid_subscription
+
+> Cannot reference store value inside `<script context="module">`
diff --git a/packages/svelte/messages/compile-errors/slots.md b/packages/svelte/messages/compile-errors/slots.md
deleted file mode 100644
index 9f92448847..0000000000
--- a/packages/svelte/messages/compile-errors/slots.md
+++ /dev/null
@@ -1,31 +0,0 @@
-## invalid_slot_element_attribute
-
-> `<slot>` can only receive attributes and (optionally) let directives
-
-## invalid_slot_attribute
-
-> slot attribute must be a static value
-
-## invalid_slot_name_default
-
-> `default` is a reserved word — it cannot be used as a slot name
-
-## invalid_slot_name
-
-> slot attribute must be a static value
-
-## invalid_slot_placement
-
-> Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
-
-## duplicate_slot_name
-
-> Duplicate slot name '%name%' in <%component%>
-
-## invalid_default_slot_content
-
-> Found default slot content alongside an explicit slot="default"
-
-## conflicting_children_snippet
-
-> Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/special_elements.md b/packages/svelte/messages/compile-errors/special_elements.md
deleted file mode 100644
index bf69e59e05..0000000000
--- a/packages/svelte/messages/compile-errors/special_elements.md
+++ /dev/null
@@ -1,99 +0,0 @@
-## invalid_svelte_option_attribute
-
-> `<svelte:options>` can only receive static attributes
-
-## invalid_svelte_option_namespace
-
-> Unsupported `<svelte:option>` value for "namespace". Valid values are "html", "svg" or "foreign"
-
-## tag_option_deprecated
-
-> "tag" option is deprecated — use "customElement" instead
-
-## invalid_svelte_option_runes
-
-> Unsupported `<svelte:option>` value for "runes". Valid values are true or false
-
-## invalid_svelte_option_accessors
-
-> Unsupported `<svelte:option>` value for "accessors". Valid values are true or false
-
-## invalid_svelte_option_preserveWhitespace
-
-> Unsupported `<svelte:option>` value for "preserveWhitespace". Valid values are true or false
-
-## invalid_svelte_option_immutable
-
-> Unsupported `<svelte:option>` value for "immutable". Valid values are true or false
-
-## invalid_tag_property
-
-> Tag name must be two or more words joined by the "-" character
-
-## invalid_svelte_option_customElement
-
-> "customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
-
-## invalid_customElement_props_attribute
-
-> "props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
-
-## invalid_customElement_shadow_attribute
-
-> "shadow" must be either "open" or "none"
-
-## unknown_svelte_option_attribute
-
-> `<svelte:options>` unknown attribute '%name%'
-
-## illegal_svelte_head_attribute
-
-> `<svelte:head>` cannot have attributes nor directives
-
-## invalid_svelte_fragment_attribute
-
-> `<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
-
-## invalid_svelte_fragment_slot
-
-> `<svelte:fragment>` slot attribute must have a static value
-
-## invalid_svelte_fragment_placement
-
-> `<svelte:fragment>` must be the direct child of a component
-
-## invalid_svelte_element_placement
-
-> <%name%> tags cannot be inside elements or blocks
-
-## duplicate_svelte_element
-
-> A component can only have one <%name%> element
-
-## invalid_self_placement
-
-> `<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components
-
-## missing_svelte_element_definition
-
-> `<svelte:element>` must have a 'this' attribute
-
-## missing_svelte_component_definition
-
-> `<svelte:component>` must have a 'this' attribute
-
-## invalid_svelte_element_definition
-
-> Invalid element definition — must be an {expression}
-
-## invalid_svelte_component_definition
-
-> Invalid component definition — must be an {expression}
-
-## invalid_svelte_tag
-
-> Valid `<svelte:...>` tag names are %list%
-
-## conflicting_slot_usage
-
-> Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-errors/css.md b/packages/svelte/messages/compile-errors/style.md
similarity index 60%
rename from packages/svelte/messages/compile-errors/css.md
rename to packages/svelte/messages/compile-errors/style.md
index 9a31300786..c23b6cac76 100644
--- a/packages/svelte/messages/compile-errors/css.md
+++ b/packages/svelte/messages/compile-errors/style.md
@@ -1,51 +1,47 @@
-## invalid_css_empty_declaration
+## css_empty_declaration
 
 > Declaration cannot be empty
 
-## invalid_css_global_block_list
+## css_expected_identifier
 
-> A :global {...} block cannot be part of a selector list with more than one item
-
-## invalid_css_global_block_modifier
-
-> A :global {...} block cannot modify an existing selector
+> Expected a valid CSS identifier
 
-## invalid_css_global_block_combinator
+## css_global_block_invalid_combinator
 
 > A :global {...} block cannot follow a %name% combinator
 
-## invalid_css_global_block_declaration
+## css_global_block_invalid_declaration
 
 > A :global {...} block can only contain rules, not declarations
 
-## invalid_css_global_placement
+## css_global_block_invalid_list
 
-> :global(...) can be at the start or end of a selector sequence, but not in the middle
+> A :global {...} block cannot be part of a selector list with more than one item
 
-## invalid_css_global_selector
+## css_global_block_invalid_modifier
 
-> :global(...) must contain exactly one selector
+> A :global {...} block cannot modify an existing selector
 
-## invalid_css_global_selector_list
+## css_global_invalid_placement
 
-> :global(...) must not contain type or universal selectors when used in a compound selector
+> :global(...) can be at the start or end of a selector sequence, but not in the middle
 
-## invalid_css_type_selector_placement
+## css_global_invalid_selector
 
-> :global(...) must not be followed with a type selector
+> :global(...) must contain exactly one selector
 
-## invalid_css_selector
+## css_global_invalid_selector_list
 
-> Invalid selector
+> :global(...) must not contain type or universal selectors when used in a compound selector
 
-## invalid_css_identifier
+## css_nesting_selector_invalid_placement
 
-> Expected a valid CSS identifier
+> Nesting selectors can only be used inside a rule
 
-## invalid_nesting_selector
+## css_selector_invalid
 
-> Nesting selectors can only be used inside a rule
+> Invalid selector
 
-## invalid_css_declaration
+## css_type_selector_invalid_placement
 
-> Declaration cannot be empty
\ No newline at end of file
+> :global(...) must not be followed with a type selector
diff --git a/packages/svelte/messages/compile-errors/template.md b/packages/svelte/messages/compile-errors/template.md
new file mode 100644
index 0000000000..c1b8c5f3c3
--- /dev/null
+++ b/packages/svelte/messages/compile-errors/template.md
@@ -0,0 +1,365 @@
+## animation_duplicate
+
+> An element can only have one 'animate' directive
+
+## animation_invalid_placement
+
+> An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
+
+## animation_missing_key
+
+> An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
+
+## attribute_contenteditable_dynamic
+
+> 'contenteditable' attribute cannot be dynamic if element uses two-way binding
+
+## attribute_contenteditable_missing
+
+> 'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
+
+## attribute_duplicate
+
+> Attributes need to be unique
+
+## attribute_empty_shorthand
+
+> Attribute shorthand cannot be empty
+
+## attribute_invalid_event_handler
+
+> Event attribute must be a JavaScript expression, not a string
+
+## attribute_invalid_multiple
+
+> 'multiple' attribute must be static if select uses two-way binding
+
+## attribute_invalid_name
+
+> '%name%' is not a valid attribute name
+
+## attribute_invalid_sequence_expression
+
+> Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
+
+## attribute_invalid_type
+
+> 'type' attribute must be a static text value if input uses two-way binding
+
+## bind_invalid_expression
+
+> Can only bind to an Identifier or MemberExpression
+
+## bind_invalid_name
+
+> `bind:%name%` is not a valid binding
+
+> `bind:%name%` is not a valid binding. %explanation%
+
+## bind_invalid_target
+
+> `bind:%name%` can only be used with %elements%
+
+## bind_invalid_value
+
+> Can only bind to state or props
+
+## block_duplicate_clause
+
+> %name% cannot appear more than once within a block
+
+## block_invalid_continuation_placement
+
+> {:...} block is invalid at this position (did you forget to close the preceeding element or block?)
+
+## block_invalid_elseif
+
+> 'elseif' should be 'else if'
+
+## block_invalid_placement
+
+> {#%name% ...} block cannot be %location%
+
+## block_unclosed
+
+> Block was left open
+
+## block_unexpected_close
+
+> Unexpected block closing tag
+
+## component_invalid_directive
+
+> This type of directive is not valid on components
+
+## const_tag_invalid_expression
+
+> {@const ...} must be an assignment
+
+## const_tag_invalid_placement
+
+> `{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>` or `<Component>`
+
+## debug_tag_invalid_arguments
+
+> {@debug ...} arguments must be identifiers, not arbitrary expressions
+
+## directive_invalid_value
+
+> Directive value must be a JavaScript expression enclosed in curly braces
+
+## directive_missing_name
+
+> `%type%` name cannot be empty
+
+## element_invalid_closing_tag
+
+> `</%name%>` attempted to close an element that was not open
+
+## element_invalid_closing_tag_autoclosed
+
+> `</%name%>` attempted to close element that was already automatically closed by `<%reason%>` (cannot nest `<%reason%>` inside `<%name%>`)
+
+## element_invalid_tag_name
+
+> Expected valid tag name
+
+## element_unclosed
+
+> `<%name%>` was left open
+
+## event_handler_invalid_component_modifier
+
+> Event modifiers other than 'once' can only be used on DOM elements
+
+## event_handler_invalid_modifier
+
+> Valid event modifiers are %list%
+
+## event_handler_invalid_modifier_combination
+
+> The '%modifier1%' and '%modifier2%' modifiers cannot be used together
+
+## expected_attribute_value
+
+> Expected attribute value
+
+## expected_block_type
+
+> Expected 'if', 'each', 'await', 'key' or 'snippet'
+
+## expected_identifier
+
+> Expected an identifier
+
+## expected_pattern
+
+> Expected identifier or destructure pattern
+
+## expected_token
+
+> Expected token %token%
+
+## expected_whitespace
+
+> Expected whitespace
+
+## js_parse_error
+
+> %message%
+
+## let_directive_invalid_placement
+
+> `let:` directive at invalid position
+
+## node_invalid_placement
+
+> %thing% is invalid inside <%parent%>
+
+## render_tag_invalid_call_expression
+
+> Calling a snippet function using apply, bind or call is not allowed
+
+## render_tag_invalid_expression
+
+> `{@render ...}` tags can only contain call expressions
+
+## render_tag_invalid_spread_argument
+
+> cannot use spread arguments in `{@render ...}` tags
+
+## script_duplicate
+
+> A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
+
+## script_invalid_context
+
+> If the context attribute is supplied, its value must be "module"
+
+## slot_attribute_duplicate
+
+> Duplicate slot name '%name%' in <%component%>
+
+## slot_attribute_invalid
+
+> slot attribute must be a static value
+
+## slot_attribute_invalid_placement
+
+> Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
+
+## slot_default_duplicate
+
+> Found default slot content alongside an explicit slot="default"
+
+## slot_element_invalid_attribute
+
+> `<slot>` can only receive attributes and (optionally) let directives
+
+## slot_element_invalid_name
+
+> slot attribute must be a static value
+
+## slot_element_invalid_name_default
+
+> `default` is a reserved word — it cannot be used as a slot name
+
+## slot_snippet_conflict
+
+> Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
+
+## snippet_conflict
+
+> Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
+
+## snippet_invalid_rest_parameter
+
+> snippets do not support rest parameters; use an array instead
+
+## style_directive_invalid_modifier
+
+> `style:` directive can only use the `important` modifier
+
+## style_duplicate
+
+> A component can have a single top-level `<style>` element
+
+## svelte_component_invalid_this
+
+> Invalid component definition — must be an `{expression}`
+
+## svelte_component_missing_this
+
+> `<svelte:component>` must have a 'this' attribute
+
+## svelte_element_invalid_this
+
+> Invalid element definition — must be an `{expression}`
+
+## svelte_element_missing_this
+
+> `<svelte:element>` must have a 'this' attribute
+
+## svelte_fragment_invalid_attribute
+
+> `<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
+
+## svelte_fragment_invalid_placement
+
+> `<svelte:fragment>` must be the direct child of a component
+
+## svelte_fragment_invalid_slot
+
+> `<svelte:fragment>` slot attribute must have a static value
+
+## svelte_head_illegal_attribute
+
+> `<svelte:head>` cannot have attributes nor directives
+
+## svelte_meta_duplicate
+
+> A component can only have one `<%name%>` element
+
+## svelte_meta_invalid_content
+
+> <%name%> cannot have children
+
+## svelte_meta_invalid_placement
+
+> `<%name%>` tags cannot be inside elements or blocks
+
+## svelte_meta_invalid_tag
+
+> Valid `<svelte:...>` tag names are %list%
+
+## svelte_options_deprecated_tag
+
+> "tag" option is deprecated — use "customElement" instead
+
+## svelte_options_invalid_attribute
+
+> `<svelte:options>` can only receive static attributes
+
+## svelte_options_invalid_attribute_value
+
+> Valid values are %list%
+
+## svelte_options_invalid_customelement
+
+> "customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
+
+## svelte_options_invalid_customelement_props
+
+> "props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
+
+## svelte_options_invalid_customelement_shadow
+
+> "shadow" must be either "open" or "none"
+
+## svelte_options_invalid_tagname
+
+> Tag name must be two or more words joined by the "-" character
+
+## svelte_options_unknown_attribute
+
+> `<svelte:options>` unknown attribute '%name%'
+
+## svelte_self_invalid_placement
+
+> `<svelte:self>` components can only exist inside `{#if}` blocks, `{#each}` blocks, `{#snippet}` blocks or slots passed to components
+
+## tag_invalid_placement
+
+> {@%name% ...} tag cannot be %location%
+
+## textarea_invalid_content
+
+> A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
+
+## title_illegal_attribute
+
+> `<title>` cannot have attributes nor directives
+
+## title_invalid_content
+
+> `<title>` can only contain text and {tags}
+
+## transition_conflict
+
+> Cannot use `%type%:` alongside existing `%existing%:` directive
+
+## transition_duplicate
+
+> Cannot use multiple `%type%:` directives on a single element
+
+## unexpected_eof
+
+> Unexpected end of input
+
+## unexpected_reserved_word
+
+> '%word%' is a reserved word in JavaScript and cannot be used here
+
+## void_element_invalid_content
+
+> Void elements cannot have children or closing tags
diff --git a/packages/svelte/messages/compile-errors/variables.md b/packages/svelte/messages/compile-errors/variables.md
deleted file mode 100644
index 179393f61c..0000000000
--- a/packages/svelte/messages/compile-errors/variables.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## illegal_global
-
-> `%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
-
-## duplicate_declaration
-
-> `%name%` has already been declared
-
-## default_export
-
-> A component cannot have a default export
-
-## illegal_variable_declaration
-
-> Cannot declare same variable name which is imported inside `<script context="module">`
-
-## illegal_store_subscription
-
-> Cannot subscribe to stores that are not declared at the top level of the component
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/a11y.md b/packages/svelte/messages/compile-warnings/a11y.md
index e520f01aba..f85c17a56a 100644
--- a/packages/svelte/messages/compile-warnings/a11y.md
+++ b/packages/svelte/messages/compile-warnings/a11y.md
@@ -1,167 +1,167 @@
-## a11y_aria_attributes
+## a11y_accesskey
 
-> <%name%> should not have aria-* attributes
+> Avoid using accesskey
 
-## a11y_unknown_aria_attribute
+## a11y_aria_activedescendant_has_tabindex
 
-> Unknown aria attribute 'aria-%attribute%'
+> An element with an aria-activedescendant attribute should have a tabindex value
 
-> Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
+## a11y_aria_attributes
 
-## a11y_hidden
+> `<%name%>` should not have aria-* attributes
 
-> <%name%> element should not be hidden
+## a11y_autocomplete_valid
 
-## a11y_incorrect_aria_attribute_type_boolean
+> '%value%' is an invalid value for 'autocomplete' on `<input type="%type%">`
 
-> The value of '%attribute%' must be either 'true' or 'false'
+## a11y_autofocus
 
-## a11y_incorrect_aria_attribute_type_integer
+> Avoid using autofocus
 
-> The value of '%attribute%' must be an integer
+## a11y_click_events_have_key_events
 
-## a11y_incorrect_aria_attribute_type_id
+> Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type="button">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
 
-> The value of '%attribute%' must be a string that represents a DOM element ID
+## a11y_distracting_elements
 
-## a11y_incorrect_aria_attribute_type_idlist
+> Avoid `<%name%>` elements
 
-> The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
+## a11y_figcaption_index
 
-## a11y_incorrect_aria_attribute_type_tristate
+> `<figcaption>` must be first or last child of `<figure>`
 
-> The value of '%attribute%' must be exactly one of true, false, or mixed
+## a11y_figcaption_parent
 
-## a11y_incorrect_aria_attribute_type_token
+> `<figcaption>` must be an immediate child of `<figure>`
 
-> The value of '%attribute%' must be exactly one of %values%
+## a11y_hidden
 
-## a11y_incorrect_aria_attribute_type_tokenlist
+> `<%name%>` element should not be hidden
 
-> The value of '%attribute%' must be a space-separated list of one or more of %values%
+## a11y_img_redundant_alt
+
+> Screenreaders already announce `<img>` elements as an image.
 
 ## a11y_incorrect_aria_attribute_type
 
 > The value of '%attribute%' must be of type %type%
 
-## a11y_aria_activedescendant_has_tabindex
+## a11y_incorrect_aria_attribute_type_boolean
 
-> Elements with attribute aria-activedescendant should have tabindex value
+> The value of '%attribute%' must be either 'true' or 'false'
 
-## a11y_misplaced_role
+## a11y_incorrect_aria_attribute_type_id
 
-> <%name%> should not have role attribute
+> The value of '%attribute%' must be a string that represents a DOM element ID
 
-## a11y_no_abstract_role
+## a11y_incorrect_aria_attribute_type_idlist
 
-> Abstract role '%role%' is forbidden
+> The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
 
-## a11y_unknown_role
+## a11y_incorrect_aria_attribute_type_integer
 
-> Unknown role '%role%'
+> The value of '%attribute%' must be an integer
 
-> Unknown role '%role%'. Did you mean '%suggestion%'?
+## a11y_incorrect_aria_attribute_type_token
 
-## a11y_no_redundant_roles
+> The value of '%attribute%' must be exactly one of %values%
 
-> Redundant role '%role%'
+## a11y_incorrect_aria_attribute_type_tokenlist
 
-## a11y_role_has_required_aria_props
+> The value of '%attribute%' must be a space-separated list of one or more of %values%
 
-> Elements with the ARIA role "%role%" must have the following attributes defined: %props%
+## a11y_incorrect_aria_attribute_type_tristate
+
+> The value of '%attribute%' must be exactly one of true, false, or mixed
 
 ## a11y_interactive_supports_focus
 
 > Elements with the '%role%' interactive role must have a tabindex value.
 
-## a11y_no_interactive_element_to_noninteractive_role
+## a11y_invalid_attribute
 
-> <%element%> cannot have role '%role%'
+> '%href_value%' is not a valid %href_attribute% attribute
 
-## a11y_no_noninteractive_element_to_interactive_role
+## a11y_label_has_associated_control
 
-> Non-interactive element <%element%> cannot have interactive role '%role%'
+> A form label must be associated with a control.
 
-## a11y_accesskey
+## a11y_media_has_caption
 
-> Avoid using accesskey
+> `<video>` elements must have a `<track kind="captions">`
 
-## a11y_autofocus
+## a11y_misplaced_role
 
-> Avoid using autofocus
+> `<%name%>` should not have role attribute
 
 ## a11y_misplaced_scope
 
-> The scope attribute should only be used with <th> elements
+> The scope attribute should only be used with `<th>` elements
 
-## a11y_positive_tabindex
+## a11y_missing_attribute
 
-> Avoid tabindex values above zero
+> `<%name%>` element should have %article% %sequence% attribute
 
-## a11y_click_events_have_key_events
+## a11y_missing_content
 
-> Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type="button"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
+> `<%name%>` element should have child content
 
-## a11y_no_noninteractive_tabindex
+## a11y_mouse_events_have_key_events
 
-> noninteractive element cannot have nonnegative tabIndex value
+> '%event%' event must be accompanied by '%accompanied_by%' event
 
-## a11y_role_supports_aria_props
+## a11y_no_abstract_role
 
-> The attribute '%attribute%' is not supported by the role '%role%'
+> Abstract role '%role%' is forbidden
 
-## a11y_role_supports_aria_props_implicit
+## a11y_no_interactive_element_to_noninteractive_role
 
-> The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element <%name%>
+> `<%element%>` cannot have role '%role%'
 
 ## a11y_no_noninteractive_element_interactions
 
-> Non-interactive element <%element%> should not be assigned mouse or keyboard event listeners.
-
-## a11y_no_static_element_interactions
-
-> <%element%> with a %handler% handler must have an ARIA role
+> Non-interactive element `<%element%>` should not be assigned mouse or keyboard event listeners.
 
-## a11y_invalid_attribute
+## a11y_no_noninteractive_element_to_interactive_role
 
-> '%href_value%' is not a valid %href_attribute% attribute
+> Non-interactive element `<%element%>` cannot have interactive role '%role%'
 
-## a11y_missing_attribute
+## a11y_no_noninteractive_tabindex
 
-> <%name%> element should have %article% %sequence% attribute
+> noninteractive element cannot have nonnegative tabIndex value
 
-## a11y_autocomplete_valid
+## a11y_no_redundant_roles
 
-> The value '%value%' is not supported by the attribute 'autocomplete' on element <input type="%type%">
+> Redundant role '%role%'
 
-## a11y_img_redundant_alt
+## a11y_no_static_element_interactions
 
-> Screenreaders already announce <img> elements as an image.
+> `<%element%>` with a %handler% handler must have an ARIA role
 
-## a11y_label_has_associated_control
+## a11y_positive_tabindex
 
-> A form label must be associated with a control.
+> Avoid tabindex values above zero
 
-## a11y_media_has_caption
+## a11y_role_has_required_aria_props
 
-> <video> elements must have a <track kind="captions">
+> Elements with the ARIA role "%role%" must have the following attributes defined: %props%
 
-## a11y_distracting_elements
+## a11y_role_supports_aria_props
 
-> Avoid <%name%> elements
+> The attribute '%attribute%' is not supported by the role '%role%'
 
-## a11y_figcaption_parent
+## a11y_role_supports_aria_props_implicit
 
-> `<figcaption>` must be an immediate child of `<figure>`
+> The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element `<%name%>`
 
-## a11y_figcaption_index
+## a11y_unknown_aria_attribute
 
-> `<figcaption>` must be first or last child of `<figure>`
+> Unknown aria attribute 'aria-%attribute%'
 
-## a11y_mouse_events_have_key_events
+> Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
 
-> '%event%' event must be accompanied by '%accompanied_by%' event
+## a11y_unknown_role
 
-## a11y_missing_content
+> Unknown role '%role%'
 
-> <%name%> element should have child content
+> Unknown role '%role%'. Did you mean '%suggestion%'?
diff --git a/packages/svelte/messages/compile-warnings/attributes.md b/packages/svelte/messages/compile-warnings/attributes.md
deleted file mode 100644
index 68227e3285..0000000000
--- a/packages/svelte/messages/compile-warnings/attributes.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## avoid_is
-
-> The "is" attribute is not supported cross-browser and should be avoided
-
-## global_event_reference
-
-> You are referencing globalThis.%name%. Did you forget to declare a variable with that name?
-
-## illegal_attribute_character
-
-> Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
-
-## invalid_html_attribute
-
-> '%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/block.md b/packages/svelte/messages/compile-warnings/block.md
deleted file mode 100644
index 08ab9d57bb..0000000000
--- a/packages/svelte/messages/compile-warnings/block.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## empty_block
-
-> Empty block
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/components.md b/packages/svelte/messages/compile-warnings/components.md
deleted file mode 100644
index 9182299c54..0000000000
--- a/packages/svelte/messages/compile-warnings/components.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## component_name_lowercase
-
-> <%name%> will be treated as an HTML element unless it begins with a capital letter
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/css.md b/packages/svelte/messages/compile-warnings/css.md
deleted file mode 100644
index 733f32f5b5..0000000000
--- a/packages/svelte/messages/compile-warnings/css.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## css_unused_selector
-
-> Unused CSS selector "%name%"
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/legacy.md b/packages/svelte/messages/compile-warnings/legacy.md
deleted file mode 100644
index c0cc85359e..0000000000
--- a/packages/svelte/messages/compile-warnings/legacy.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## no_reactive_declaration
-
-> Reactive declarations only exist at the top level of the instance script
-
-## module_script_reactive_declaration
-
-> All dependencies of the reactive declaration are declared in a module script and will not be reactive
-
-## unused_export_let
-
-> Component has unused export property '%name%'. If it is for external reference only, please consider using `export const %name%`
-
-## deprecated_slot_element
-
-> Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.
-
-## deprecated_event_handler
-
-> Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
diff --git a/packages/svelte/messages/compile-warnings/misc.md b/packages/svelte/messages/compile-warnings/misc.md
deleted file mode 100644
index 8a6f3b68ad..0000000000
--- a/packages/svelte/messages/compile-warnings/misc.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## invalid_self_closing_tag
-
-> Self-closing HTML tags for non-void elements are ambiguous — use <%name% ...></%name%> rather than <%name% ... />
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/options.md b/packages/svelte/messages/compile-warnings/options.md
index 2bd4d7ca7a..7e30c4c727 100644
--- a/packages/svelte/messages/compile-warnings/options.md
+++ b/packages/svelte/messages/compile-warnings/options.md
@@ -10,10 +10,6 @@
 
 > The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?
 
-## options_renamed_ssr_dom
-
-> `generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
-
 ## options_removed_enable_sourcemap
 
 > The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them
@@ -25,3 +21,7 @@
 ## options_removed_loop_guard_timeout
 
 > The `loopGuardTimeout` option has been removed
+
+## options_renamed_ssr_dom
+
+> `generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
diff --git a/packages/svelte/messages/compile-warnings/performance.md b/packages/svelte/messages/compile-warnings/performance.md
deleted file mode 100644
index 0bd8115466..0000000000
--- a/packages/svelte/messages/compile-warnings/performance.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## avoid_inline_class
-
-> Avoid 'new class' — instead, declare the class at the top level scope
-
-## avoid_nested_class
-
-> Avoid declaring classes below the top level scope
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/runes.md b/packages/svelte/messages/compile-warnings/runes.md
deleted file mode 100644
index c3518bea6c..0000000000
--- a/packages/svelte/messages/compile-warnings/runes.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## store_with_rune_name
-
-> It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
-
-## non_state_reference
-
-> `%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
-
-## derived_iife
-
-> Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
-
-## invalid_props_declaration
-
-> Component properties are declared using `$props()` in runes mode. Did you forget to call the function?
-
-## invalid_bindable_declaration
-
-> Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/script.md b/packages/svelte/messages/compile-warnings/script.md
new file mode 100644
index 0000000000..af8b635bb6
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/script.md
@@ -0,0 +1,35 @@
+## derived_iife
+
+> Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
+
+## export_let_unused
+
+> Component has unused export property '%name%'. If it is for external reference only, please consider using `export const %name%`
+
+## non_reactive_update
+
+> `%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
+
+## perf_avoid_inline_class
+
+> Avoid 'new class' — instead, declare the class at the top level scope
+
+## perf_avoid_nested_class
+
+> Avoid declaring classes below the top level scope
+
+## reactive_declaration_invalid_placement
+
+> Reactive declarations only exist at the top level of the instance script
+
+## reactive_declaration_module_script
+
+> All dependencies of the reactive declaration are declared in a module script and will not be reactive
+
+## state_referenced_locally
+
+> State referenced in its own scope will never update. Did you mean to reference it inside a closure?
+
+## store_rune_conflict
+
+> It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
diff --git a/packages/svelte/messages/compile-warnings/state.md b/packages/svelte/messages/compile-warnings/state.md
deleted file mode 100644
index 674d8ebe3d..0000000000
--- a/packages/svelte/messages/compile-warnings/state.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## static_state_reference
-
-> State referenced in its own scope will never update. Did you mean to reference it inside a closure?
-
-## invalid_rest_eachblock_binding
-
-> The rest operator (...) will create a new object and binding '%name%' with the original object will not work
\ No newline at end of file
diff --git a/packages/svelte/messages/compile-warnings/style.md b/packages/svelte/messages/compile-warnings/style.md
new file mode 100644
index 0000000000..6967458cf4
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/style.md
@@ -0,0 +1,3 @@
+## css_unused_selector
+
+> Unused CSS selector "%name%"
diff --git a/packages/svelte/messages/compile-warnings/template.md b/packages/svelte/messages/compile-warnings/template.md
new file mode 100644
index 0000000000..9b27959cb2
--- /dev/null
+++ b/packages/svelte/messages/compile-warnings/template.md
@@ -0,0 +1,39 @@
+## attribute_avoid_is
+
+> The "is" attribute is not supported cross-browser and should be avoided
+
+## attribute_global_event_reference
+
+> You are referencing `globalThis.%name%`. Did you forget to declare a variable with that name?
+
+## attribute_illegal_colon
+
+> Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
+
+## attribute_invalid_property_name
+
+> '%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
+
+## bind_invalid_each_rest
+
+> The rest operator (...) will create a new object and binding '%name%' with the original object will not work
+
+## block_empty
+
+> Empty block
+
+## component_name_lowercase
+
+> `<%name%>` will be treated as an HTML element unless it begins with a capital letter
+
+## element_invalid_self_closing_tag
+
+> Self-closing HTML tags for non-void elements are ambiguous — use `<%name% ...></%name%>` rather than `<%name% ... />`
+
+## event_directive_deprecated
+
+> Using `on:%name%` to listen to the %name% event is deprecated. Use the event attribute `on%name%` instead.
+
+## slot_element_deprecated
+
+> Using `<slot>` to render parent content is deprecated. Use `{@render ...}` tags instead.
diff --git a/packages/svelte/messages/server-errors/lifecycle.md b/packages/svelte/messages/server-errors/lifecycle.md
new file mode 100644
index 0000000000..80830f7903
--- /dev/null
+++ b/packages/svelte/messages/server-errors/lifecycle.md
@@ -0,0 +1,3 @@
+## lifecycle_function_unavailable
+
+> `%name%(...)` is not available on the server
diff --git a/packages/svelte/messages/shared-errors/errors.md b/packages/svelte/messages/shared-errors/errors.md
new file mode 100644
index 0000000000..b7b2e8432f
--- /dev/null
+++ b/packages/svelte/messages/shared-errors/errors.md
@@ -0,0 +1,19 @@
+## lifecycle_outside_component
+
+> `%name%(...)` can only be used during component initialisation
+
+## render_tag_invalid_argument
+
+> The argument to `{@render ...}` must be a snippet function, not a component or some other kind of function. If you want to dynamically render one snippet or another, use `$derived` and pass its result to `{@render ...}`
+
+## snippet_used_as_component
+
+> A snippet must be rendered with `{@render ...}`
+
+## store_invalid_shape
+
+> `%name%` is not a store with a `subscribe` method
+
+## svelte_element_invalid_this_value
+
+> The `this` prop on `<svelte:element>` must be a string, if defined
diff --git a/packages/svelte/messages/shared-warnings/warnings.md b/packages/svelte/messages/shared-warnings/warnings.md
index 0d30a32dc8..8154436843 100644
--- a/packages/svelte/messages/shared-warnings/warnings.md
+++ b/packages/svelte/messages/shared-warnings/warnings.md
@@ -1,3 +1,3 @@
 ## dynamic_void_element_content
 
-> `<svelte:element this="%tag%">` is a void element — it cannot have content
\ No newline at end of file
+> `<svelte:element this="%tag%">` is a void element — it cannot have content
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
index fc4ac6ee20..a9fc519b60 100644
--- a/packages/svelte/scripts/process-messages/index.js
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -18,6 +18,8 @@ for (const category of fs.readdirSync('messages')) {
 			.readFileSync(`messages/${category}/${file}`, 'utf-8')
 			.replace(/\r\n/g, '\n');
 
+		const sorted = [];
+
 		for (const match of markdown.matchAll(/## ([\w]+)\n\n([^]+?)(?=$|\n\n## )/g)) {
 			const [_, code, text] = match;
 
@@ -25,6 +27,8 @@ for (const category of fs.readdirSync('messages')) {
 				throw new Error(`Duplicate message code ${category}/${code}`);
 			}
 
+			sorted.push({ code, _ });
+
 			const sections = text.trim().split('\n\n');
 			let details = null;
 			if (!sections[sections.length - 1].startsWith('> ')) {
@@ -41,6 +45,12 @@ for (const category of fs.readdirSync('messages')) {
 				details
 			};
 		}
+
+		sorted.sort((a, b) => (a.code < b.code ? -1 : 1));
+		fs.writeFileSync(
+			`messages/${category}/${file}`,
+			sorted.map((x) => x._.trim()).join('\n\n') + '\n'
+		);
 	}
 }
 
@@ -289,4 +299,6 @@ transform('compile-warnings', 'src/compiler/warnings.js');
 
 transform('client-warnings', 'src/internal/client/warnings.js');
 transform('client-errors', 'src/internal/client/errors.js');
+transform('server-errors', 'src/internal/server/errors.js');
+transform('shared-errors', 'src/internal/shared/errors.js');
 transform('shared-warnings', 'src/internal/shared/warnings.js');
diff --git a/packages/svelte/scripts/process-messages/templates/server-errors.js b/packages/svelte/scripts/process-messages/templates/server-errors.js
new file mode 100644
index 0000000000..302b0941a1
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/server-errors.js
@@ -0,0 +1,10 @@
+/**
+ * MESSAGE
+ * @param {string} PARAMETER
+ * @returns {never}
+ */
+export function CODE(PARAMETER) {
+	const error = new Error(`${'CODE'}\n${MESSAGE}`);
+	error.name = 'Svelte error';
+	throw error;
+}
diff --git a/packages/svelte/scripts/process-messages/templates/shared-errors.js b/packages/svelte/scripts/process-messages/templates/shared-errors.js
new file mode 100644
index 0000000000..c63a22da96
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/shared-errors.js
@@ -0,0 +1,17 @@
+import { DEV } from 'esm-env';
+
+/**
+ * MESSAGE
+ * @param {string} PARAMETER
+ * @returns {never}
+ */
+export function CODE(PARAMETER) {
+	if (DEV) {
+		const error = new Error(`${'CODE'}\n${MESSAGE}`);
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error('CODE');
+	}
+}
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 810c1582be..a00a2cd593 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -57,368 +57,351 @@ function e(node, code, message) {
 }
 
 /**
- * Attribute shorthand cannot be empty
- * @param {null | number | NodeLike} node
- * @returns {never}
- */
-export function empty_attribute_shorthand(node) {
-	e(node, "empty_attribute_shorthand", "Attribute shorthand cannot be empty");
-}
-
-/**
- * Attributes need to be unique
- * @param {null | number | NodeLike} node
- * @returns {never}
- */
-export function duplicate_attribute(node) {
-	e(node, "duplicate_attribute", "Attributes need to be unique");
-}
-
-/**
- * Event attribute must be a JavaScript expression, not a string
+ * Invalid compiler option: %details%
  * @param {null | number | NodeLike} node
+ * @param {string} details
  * @returns {never}
  */
-export function invalid_event_attribute_value(node) {
-	e(node, "invalid_event_attribute_value", "Event attribute must be a JavaScript expression, not a string");
+export function options_invalid_value(node, details) {
+	e(node, "options_invalid_value", `Invalid compiler option: ${details}`);
 }
 
 /**
- * '%name%' is not a valid attribute name
+ * Invalid compiler option: %details%
  * @param {null | number | NodeLike} node
- * @param {string} name
+ * @param {string} details
  * @returns {never}
  */
-export function invalid_attribute_name(node, name) {
-	e(node, "invalid_attribute_name", `'${name}' is not a valid attribute name`);
+export function options_removed(node, details) {
+	e(node, "options_removed", `Invalid compiler option: ${details}`);
 }
 
 /**
- * An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
+ * Unrecognised compiler option %keypath%
  * @param {null | number | NodeLike} node
+ * @param {string} keypath
  * @returns {never}
  */
-export function animation_invalid_placement(node) {
-	e(node, "animation_invalid_placement", "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block");
+export function options_unrecognised(node, keypath) {
+	e(node, "options_unrecognised", `Unrecognised compiler option ${keypath}`);
 }
 
 /**
- * An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
+ * `$bindable()` can only be used inside a `$props()` declaration
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function animation_missing_key(node) {
-	e(node, "animation_missing_key", "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?");
+export function bindable_invalid_location(node) {
+	e(node, "bindable_invalid_location", "`$bindable()` can only be used inside a `$props()` declaration");
 }
 
 /**
- * An element can only have one 'animate' directive
+ * Cannot assign to %thing%
  * @param {null | number | NodeLike} node
+ * @param {string} thing
  * @returns {never}
  */
-export function animation_duplicate(node) {
-	e(node, "animation_duplicate", "An element can only have one 'animate' directive");
+export function constant_assignment(node, thing) {
+	e(node, "constant_assignment", `Cannot assign to ${thing}`);
 }
 
 /**
- * Valid event modifiers are %list%
+ * Cannot bind to %thing%
  * @param {null | number | NodeLike} node
- * @param {string} list
+ * @param {string} thing
  * @returns {never}
  */
-export function invalid_event_modifier(node, list) {
-	e(node, "invalid_event_modifier", `Valid event modifiers are ${list}`);
+export function constant_binding(node, thing) {
+	e(node, "constant_binding", `Cannot bind to ${thing}`);
 }
 
 /**
- * Event modifiers other than 'once' can only be used on DOM elements
+ * `%name%` has already been declared
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_component_event_modifier(node) {
-	e(node, "invalid_component_event_modifier", "Event modifiers other than 'once' can only be used on DOM elements");
+export function declaration_duplicate(node, name) {
+	e(node, "declaration_duplicate", `\`${name}\` has already been declared`);
 }
 
 /**
- * The '%modifier1%' and '%modifier2%' modifiers cannot be used together
+ * Cannot declare same variable name which is imported inside `<script context="module">`
  * @param {null | number | NodeLike} node
- * @param {string} modifier1
- * @param {string} modifier2
  * @returns {never}
  */
-export function invalid_event_modifier_combination(node, modifier1, modifier2) {
-	e(node, "invalid_event_modifier_combination", `The '${modifier1}' and '${modifier2}' modifiers cannot be used together`);
+export function declaration_duplicate_module_import(node) {
+	e(node, "declaration_duplicate_module_import", "Cannot declare same variable name which is imported inside `<script context=\"module\">`");
 }
 
 /**
- * Cannot use multiple `%type%:` directives on a single element
+ * Cannot export derived state from a module. To expose the current derived value, export a function returning its value
  * @param {null | number | NodeLike} node
- * @param {string} type
  * @returns {never}
  */
-export function transition_duplicate(node, type) {
-	e(node, "transition_duplicate", `Cannot use multiple \`${type}:\` directives on a single element`);
+export function derived_invalid_export(node) {
+	e(node, "derived_invalid_export", "Cannot export derived state from a module. To expose the current derived value, export a function returning its value");
 }
 
 /**
- * Cannot use `%type%:` alongside existing `%existing%:` directive
+ * The $ name is reserved, and cannot be used for variables and imports
  * @param {null | number | NodeLike} node
- * @param {string} type
- * @param {string} existing
  * @returns {never}
  */
-export function transition_conflict(node, type, existing) {
-	e(node, "transition_conflict", `Cannot use \`${type}:\` alongside existing \`${existing}:\` directive`);
+export function dollar_binding_invalid(node) {
+	e(node, "dollar_binding_invalid", "The $ name is reserved, and cannot be used for variables and imports");
 }
 
 /**
- * `let:` directive at invalid position
+ * The $ prefix is reserved, and cannot be used for variables and imports
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_let_directive_placement(node) {
-	e(node, "invalid_let_directive_placement", "`let:` directive at invalid position");
+export function dollar_prefix_invalid(node) {
+	e(node, "dollar_prefix_invalid", "The $ prefix is reserved, and cannot be used for variables and imports");
 }
 
 /**
- * Invalid 'style:' modifier. Valid modifiers are: 'important'
+ * Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_style_directive_modifier(node) {
-	e(node, "invalid_style_directive_modifier", "Invalid 'style:' modifier. Valid modifiers are: 'important'");
+export function each_item_invalid_assignment(node) {
+	e(node, "each_item_invalid_assignment", "Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)");
 }
 
 /**
- * Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
+ * `$effect()` can only be used as an expression statement
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_sequence_expression(node) {
-	e(node, "invalid_sequence_expression", "Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses");
+export function effect_invalid_placement(node) {
+	e(node, "effect_invalid_placement", "`$effect()` can only be used as an expression statement");
 }
 
 /**
- * Can only bind to an Identifier or MemberExpression
+ * `%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_binding_expression(node) {
-	e(node, "invalid_binding_expression", "Can only bind to an Identifier or MemberExpression");
+export function global_reference_invalid(node, name) {
+	e(node, "global_reference_invalid", `\`${name}\` is an illegal variable name. To reference a global variable called \`${name}\`, use \`globalThis.${name}\``);
 }
 
 /**
- * Can only bind to state or props
+ * `$host()` can only be used inside custom element component instances
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_binding_value(node) {
-	e(node, "invalid_binding_value", "Can only bind to state or props");
+export function host_invalid_placement(node) {
+	e(node, "host_invalid_placement", "`$host()` can only be used inside custom element component instances");
 }
 
 /**
- * `bind:%name%` can only be used with %elements%
+ * Cannot use `export let` in runes mode — use `$props()` instead
  * @param {null | number | NodeLike} node
- * @param {string} name
- * @param {string} elements
  * @returns {never}
  */
-export function bind_invalid_target(node, name, elements) {
-	e(node, "bind_invalid_target", `\`bind:${name}\` can only be used with ${elements}`);
+export function legacy_export_invalid(node) {
+	e(node, "legacy_export_invalid", "Cannot use `export let` in runes mode — use `$props()` instead");
 }
 
 /**
- * `bind:%name%` is not a valid binding. %explanation%
+ * Cannot use `$$props` in runes mode
  * @param {null | number | NodeLike} node
- * @param {string} name
- * @param {string | undefined | null} [explanation]
  * @returns {never}
  */
-export function bind_invalid(node, name, explanation) {
-	e(node, "bind_invalid", explanation ? `\`bind:${name}\` is not a valid binding. ${explanation}` : `\`bind:${name}\` is not a valid binding`);
+export function legacy_props_invalid(node) {
+	e(node, "legacy_props_invalid", "Cannot use `$$props` in runes mode");
 }
 
 /**
- * 'type' attribute must be a static text value if input uses two-way binding
+ * `$:` is not allowed in runes mode, use `$derived` or `$effect` instead
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_type_attribute(node) {
-	e(node, "invalid_type_attribute", "'type' attribute must be a static text value if input uses two-way binding");
+export function legacy_reactive_statement_invalid(node) {
+	e(node, "legacy_reactive_statement_invalid", "`$:` is not allowed in runes mode, use `$derived` or `$effect` instead");
 }
 
 /**
- * 'multiple' attribute must be static if select uses two-way binding
+ * Cannot use `$$restProps` in runes mode
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_multiple_attribute(node) {
-	e(node, "invalid_multiple_attribute", "'multiple' attribute must be static if select uses two-way binding");
+export function legacy_rest_props_invalid(node) {
+	e(node, "legacy_rest_props_invalid", "Cannot use `$$restProps` in runes mode");
 }
 
 /**
- * 'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
+ * A component cannot have a default export
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function missing_contenteditable_attribute(node) {
-	e(node, "missing_contenteditable_attribute", "'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings");
+export function module_illegal_default_export(node) {
+	e(node, "module_illegal_default_export", "A component cannot have a default export");
 }
 
 /**
- * 'contenteditable' attribute cannot be dynamic if element uses two-way binding
+ * Cannot use `$props()` more than once
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function dynamic_contenteditable_attribute(node) {
-	e(node, "dynamic_contenteditable_attribute", "'contenteditable' attribute cannot be dynamic if element uses two-way binding");
+export function props_duplicate(node) {
+	e(node, "props_duplicate", "Cannot use `$props()` more than once");
 }
 
 /**
- * Invalid compiler option: %msg%
+ * `$props()` can only be used with an object destructuring pattern
  * @param {null | number | NodeLike} node
- * @param {string} msg
  * @returns {never}
  */
-export function invalid_compiler_option(node, msg) {
-	e(node, "invalid_compiler_option", `Invalid compiler option: ${msg}`);
+export function props_invalid_identifier(node) {
+	e(node, "props_invalid_identifier", "`$props()` can only be used with an object destructuring pattern");
 }
 
 /**
- * Invalid compiler option: %msg%
+ * `$props()` assignment must not contain nested properties or computed keys
  * @param {null | number | NodeLike} node
- * @param {string} msg
  * @returns {never}
  */
-export function removed_compiler_option(node, msg) {
-	e(node, "removed_compiler_option", `Invalid compiler option: ${msg}`);
+export function props_invalid_pattern(node) {
+	e(node, "props_invalid_pattern", "`$props()` assignment must not contain nested properties or computed keys");
 }
 
 /**
- * This type of directive is not valid on components
+ * `$props()` can only be used at the top level of components as a variable declaration initializer
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_component_directive(node) {
-	e(node, "invalid_component_directive", "This type of directive is not valid on components");
+export function props_invalid_placement(node) {
+	e(node, "props_invalid_placement", "`$props()` can only be used at the top level of components as a variable declaration initializer");
 }
 
 /**
- * {@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>
+ * Cyclical dependency detected: %cycle%
  * @param {null | number | NodeLike} node
+ * @param {string} cycle
  * @returns {never}
  */
-export function invalid_const_placement(node) {
-	e(node, "invalid_const_placement", "{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>");
+export function reactive_declaration_cycle(node, cycle) {
+	e(node, "reactive_declaration_cycle", `Cyclical dependency detected: ${cycle}`);
 }
 
 /**
- * Declaration cannot be empty
+ * `%rune%` cannot be called with arguments
  * @param {null | number | NodeLike} node
+ * @param {string} rune
  * @returns {never}
  */
-export function invalid_css_empty_declaration(node) {
-	e(node, "invalid_css_empty_declaration", "Declaration cannot be empty");
+export function rune_invalid_arguments(node, rune) {
+	e(node, "rune_invalid_arguments", `\`${rune}\` cannot be called with arguments`);
 }
 
 /**
- * A :global {...} block cannot be part of a selector list with more than one item
+ * `%rune%` must be called with %args%
  * @param {null | number | NodeLike} node
+ * @param {string} rune
+ * @param {string} args
  * @returns {never}
  */
-export function invalid_css_global_block_list(node) {
-	e(node, "invalid_css_global_block_list", "A :global {...} block cannot be part of a selector list with more than one item");
+export function rune_invalid_arguments_length(node, rune, args) {
+	e(node, "rune_invalid_arguments_length", `\`${rune}\` must be called with ${args}`);
 }
 
 /**
- * A :global {...} block cannot modify an existing selector
+ * Cannot access a computed property of a rune
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_css_global_block_modifier(node) {
-	e(node, "invalid_css_global_block_modifier", "A :global {...} block cannot modify an existing selector");
+export function rune_invalid_computed_property(node) {
+	e(node, "rune_invalid_computed_property", "Cannot access a computed property of a rune");
 }
 
 /**
- * A :global {...} block cannot follow a %name% combinator
+ * `%name%` is not a valid rune
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
  */
-export function invalid_css_global_block_combinator(node, name) {
-	e(node, "invalid_css_global_block_combinator", `A :global {...} block cannot follow a ${name} combinator`);
+export function rune_invalid_name(node, name) {
+	e(node, "rune_invalid_name", `\`${name}\` is not a valid rune`);
 }
 
 /**
- * A :global {...} block can only contain rules, not declarations
+ * Cannot use `%rune%` rune in non-runes mode
  * @param {null | number | NodeLike} node
+ * @param {string} rune
  * @returns {never}
  */
-export function invalid_css_global_block_declaration(node) {
-	e(node, "invalid_css_global_block_declaration", "A :global {...} block can only contain rules, not declarations");
+export function rune_invalid_usage(node, rune) {
+	e(node, "rune_invalid_usage", `Cannot use \`${rune}\` rune in non-runes mode`);
 }
 
 /**
- * :global(...) can be at the start or end of a selector sequence, but not in the middle
+ * Cannot use rune without parentheses
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_css_global_placement(node) {
-	e(node, "invalid_css_global_placement", ":global(...) can be at the start or end of a selector sequence, but not in the middle");
+export function rune_missing_parentheses(node) {
+	e(node, "rune_missing_parentheses", "Cannot use rune without parentheses");
 }
 
 /**
- * :global(...) must contain exactly one selector
+ * %name% cannot be used in runes mode
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_css_global_selector(node) {
-	e(node, "invalid_css_global_selector", ":global(...) must contain exactly one selector");
+export function runes_mode_invalid_import(node, name) {
+	e(node, "runes_mode_invalid_import", `${name} cannot be used in runes mode`);
 }
 
 /**
- * :global(...) must not contain type or universal selectors when used in a compound selector
+ * Cannot reassign or bind to snippet parameter
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_css_global_selector_list(node) {
-	e(node, "invalid_css_global_selector_list", ":global(...) must not contain type or universal selectors when used in a compound selector");
+export function snippet_parameter_assignment(node) {
+	e(node, "snippet_parameter_assignment", "Cannot reassign or bind to snippet parameter");
 }
 
 /**
- * :global(...) must not be followed with a type selector
+ * Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_css_type_selector_placement(node) {
-	e(node, "invalid_css_type_selector_placement", ":global(...) must not be followed with a type selector");
+export function state_invalid_export(node) {
+	e(node, "state_invalid_export", "Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties");
 }
 
 /**
- * Invalid selector
+ * `%rune%(...)` can only be used as a variable declaration initializer or a class field
  * @param {null | number | NodeLike} node
+ * @param {string} rune
  * @returns {never}
  */
-export function invalid_css_selector(node) {
-	e(node, "invalid_css_selector", "Invalid selector");
+export function state_invalid_placement(node, rune) {
+	e(node, "state_invalid_placement", `\`${rune}(...)\` can only be used as a variable declaration initializer or a class field`);
 }
 
 /**
- * Expected a valid CSS identifier
+ * Cannot subscribe to stores that are not declared at the top level of the component
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_css_identifier(node) {
-	e(node, "invalid_css_identifier", "Expected a valid CSS identifier");
+export function store_invalid_scoped_subscription(node) {
+	e(node, "store_invalid_scoped_subscription", "Cannot subscribe to stores that are not declared at the top level of the component");
 }
 
 /**
- * Nesting selectors can only be used inside a rule
+ * Cannot reference store value inside `<script context="module">`
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_nesting_selector(node) {
-	e(node, "invalid_nesting_selector", "Nesting selectors can only be used inside a rule");
+export function store_invalid_subscription(node) {
+	e(node, "store_invalid_subscription", "Cannot reference store value inside `<script context=\"module\">`");
 }
 
 /**
@@ -426,657 +409,607 @@ export function invalid_nesting_selector(node) {
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_css_declaration(node) {
-	e(node, "invalid_css_declaration", "Declaration cannot be empty");
-}
-
-/**
- * A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
- * @param {null | number | NodeLike} node
- * @returns {never}
- */
-export function invalid_textarea_content(node) {
-	e(node, "invalid_textarea_content", "A `<textarea>` can have either a value attribute or (equivalently) child content, but not both");
+export function css_empty_declaration(node) {
+	e(node, "css_empty_declaration", "Declaration cannot be empty");
 }
 
 /**
- * Void elements cannot have children or closing tags
+ * Expected a valid CSS identifier
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_void_content(node) {
-	e(node, "invalid_void_content", "Void elements cannot have children or closing tags");
+export function css_expected_identifier(node) {
+	e(node, "css_expected_identifier", "Expected a valid CSS identifier");
 }
 
 /**
- * <%name%> cannot have children
+ * A :global {...} block cannot follow a %name% combinator
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
  */
-export function invalid_element_content(node, name) {
-	e(node, "invalid_element_content", `<${name}> cannot have children`);
+export function css_global_block_invalid_combinator(node, name) {
+	e(node, "css_global_block_invalid_combinator", `A :global {...} block cannot follow a ${name} combinator`);
 }
 
 /**
- * Expected valid tag name
+ * A :global {...} block can only contain rules, not declarations
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_tag_name(node) {
-	e(node, "invalid_tag_name", "Expected valid tag name");
+export function css_global_block_invalid_declaration(node) {
+	e(node, "css_global_block_invalid_declaration", "A :global {...} block can only contain rules, not declarations");
 }
 
 /**
- * %thing% is invalid inside <%parent%>
+ * A :global {...} block cannot be part of a selector list with more than one item
  * @param {null | number | NodeLike} node
- * @param {string} thing
- * @param {string} parent
  * @returns {never}
  */
-export function invalid_node_placement(node, thing, parent) {
-	e(node, "invalid_node_placement", `${thing} is invalid inside <${parent}>`);
+export function css_global_block_invalid_list(node) {
+	e(node, "css_global_block_invalid_list", "A :global {...} block cannot be part of a selector list with more than one item");
 }
 
 /**
- * `<title>` cannot have attributes nor directives
+ * A :global {...} block cannot modify an existing selector
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function illegal_title_attribute(node) {
-	e(node, "illegal_title_attribute", "`<title>` cannot have attributes nor directives");
+export function css_global_block_invalid_modifier(node) {
+	e(node, "css_global_block_invalid_modifier", "A :global {...} block cannot modify an existing selector");
 }
 
 /**
- * `<title>` can only contain text and {tags}
+ * :global(...) can be at the start or end of a selector sequence, but not in the middle
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_title_content(node) {
-	e(node, "invalid_title_content", "`<title>` can only contain text and {tags}");
+export function css_global_invalid_placement(node) {
+	e(node, "css_global_invalid_placement", ":global(...) can be at the start or end of a selector sequence, but not in the middle");
 }
 
 /**
- * Cyclical dependency detected: %cycle%
+ * :global(...) must contain exactly one selector
  * @param {null | number | NodeLike} node
- * @param {string} cycle
  * @returns {never}
  */
-export function cyclical_reactive_declaration(node, cycle) {
-	e(node, "cyclical_reactive_declaration", `Cyclical dependency detected: ${cycle}`);
+export function css_global_invalid_selector(node) {
+	e(node, "css_global_invalid_selector", ":global(...) must contain exactly one selector");
 }
 
 /**
- * `<%name%>` was left open
+ * :global(...) must not contain type or universal selectors when used in a compound selector
  * @param {null | number | NodeLike} node
- * @param {string} name
  * @returns {never}
  */
-export function unclosed_element(node, name) {
-	e(node, "unclosed_element", `\`<${name}>\` was left open`);
+export function css_global_invalid_selector_list(node) {
+	e(node, "css_global_invalid_selector_list", ":global(...) must not contain type or universal selectors when used in a compound selector");
 }
 
 /**
- * Block was left open
+ * Nesting selectors can only be used inside a rule
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function unclosed_block(node) {
-	e(node, "unclosed_block", "Block was left open");
+export function css_nesting_selector_invalid_placement(node) {
+	e(node, "css_nesting_selector_invalid_placement", "Nesting selectors can only be used inside a rule");
 }
 
 /**
- * Unexpected block closing tag
+ * Invalid selector
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function unexpected_block_close(node) {
-	e(node, "unexpected_block_close", "Unexpected block closing tag");
+export function css_selector_invalid(node) {
+	e(node, "css_selector_invalid", "Invalid selector");
 }
 
 /**
- * Unexpected end of input
+ * :global(...) must not be followed with a type selector
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function unexpected_eof(node) {
-	e(node, "unexpected_eof", "Unexpected end of input");
+export function css_type_selector_invalid_placement(node) {
+	e(node, "css_type_selector_invalid_placement", ":global(...) must not be followed with a type selector");
 }
 
 /**
- * %message%
+ * An element can only have one 'animate' directive
  * @param {null | number | NodeLike} node
- * @param {string} message
  * @returns {never}
  */
-export function js_parse_error(node, message) {
-	e(node, "js_parse_error", `${message}`);
+export function animation_duplicate(node) {
+	e(node, "animation_duplicate", "An element can only have one 'animate' directive");
 }
 
 /**
- * Expected token %token%
+ * An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block
  * @param {null | number | NodeLike} node
- * @param {string} token
  * @returns {never}
  */
-export function expected_token(node, token) {
-	e(node, "expected_token", `Expected token ${token}`);
+export function animation_invalid_placement(node) {
+	e(node, "animation_invalid_placement", "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block");
 }
 
 /**
- * '%word%' is a reserved word in JavaScript and cannot be used here
+ * An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?
  * @param {null | number | NodeLike} node
- * @param {string} word
  * @returns {never}
  */
-export function unexpected_reserved_word(node, word) {
-	e(node, "unexpected_reserved_word", `'${word}' is a reserved word in JavaScript and cannot be used here`);
+export function animation_missing_key(node) {
+	e(node, "animation_missing_key", "An element that uses the `animate:` directive must be the only child of a keyed `{#each ...}` block. Did you forget to add a key to your each block?");
 }
 
 /**
- * Expected whitespace
+ * 'contenteditable' attribute cannot be dynamic if element uses two-way binding
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function missing_whitespace(node) {
-	e(node, "missing_whitespace", "Expected whitespace");
+export function attribute_contenteditable_dynamic(node) {
+	e(node, "attribute_contenteditable_dynamic", "'contenteditable' attribute cannot be dynamic if element uses two-way binding");
 }
 
 /**
- * Expected identifier or destructure pattern
+ * 'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function expected_pattern(node) {
-	e(node, "expected_pattern", "Expected identifier or destructure pattern");
+export function attribute_contenteditable_missing(node) {
+	e(node, "attribute_contenteditable_missing", "'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings");
 }
 
 /**
- * If the context attribute is supplied, its value must be "module"
+ * Attributes need to be unique
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_script_context(node) {
-	e(node, "invalid_script_context", "If the context attribute is supplied, its value must be \"module\"");
+export function attribute_duplicate(node) {
+	e(node, "attribute_duplicate", "Attributes need to be unique");
 }
 
 /**
- * 'elseif' should be 'else if'
+ * Attribute shorthand cannot be empty
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_elseif(node) {
-	e(node, "invalid_elseif", "'elseif' should be 'else if'");
+export function attribute_empty_shorthand(node) {
+	e(node, "attribute_empty_shorthand", "Attribute shorthand cannot be empty");
 }
 
 /**
- * {:...} block is invalid at this position (did you forget to close the preceeding element or block?)
+ * Event attribute must be a JavaScript expression, not a string
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_continuing_block_placement(node) {
-	e(node, "invalid_continuing_block_placement", "{:...} block is invalid at this position (did you forget to close the preceeding element or block?)");
+export function attribute_invalid_event_handler(node) {
+	e(node, "attribute_invalid_event_handler", "Event attribute must be a JavaScript expression, not a string");
 }
 
 /**
- * %child% block must be a child of %parent%
+ * 'multiple' attribute must be static if select uses two-way binding
  * @param {null | number | NodeLike} node
- * @param {string} child
- * @param {string} parent
  * @returns {never}
  */
-export function invalid_block_missing_parent(node, child, parent) {
-	e(node, "invalid_block_missing_parent", `${child} block must be a child of ${parent}`);
+export function attribute_invalid_multiple(node) {
+	e(node, "attribute_invalid_multiple", "'multiple' attribute must be static if select uses two-way binding");
 }
 
 /**
- * %name% cannot appear more than once within a block
+ * '%name%' is not a valid attribute name
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
  */
-export function duplicate_block_part(node, name) {
-	e(node, "duplicate_block_part", `${name} cannot appear more than once within a block`);
+export function attribute_invalid_name(node, name) {
+	e(node, "attribute_invalid_name", `'${name}' is not a valid attribute name`);
 }
 
 /**
- * Expected 'if', 'each', 'await', 'key' or 'snippet'
- * @param {null | number | NodeLike} node
- * @returns {never}
- */
-export function expected_block_type(node) {
-	e(node, "expected_block_type", "Expected 'if', 'each', 'await', 'key' or 'snippet'");
-}
-
-/**
- * Expected an identifier
+ * Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function expected_identifier(node) {
-	e(node, "expected_identifier", "Expected an identifier");
+export function attribute_invalid_sequence_expression(node) {
+	e(node, "attribute_invalid_sequence_expression", "Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses");
 }
 
 /**
- * {@debug ...} arguments must be identifiers, not arbitrary expressions
+ * 'type' attribute must be a static text value if input uses two-way binding
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_debug(node) {
-	e(node, "invalid_debug", "{@debug ...} arguments must be identifiers, not arbitrary expressions");
+export function attribute_invalid_type(node) {
+	e(node, "attribute_invalid_type", "'type' attribute must be a static text value if input uses two-way binding");
 }
 
 /**
- * {@const ...} must be an assignment
+ * Can only bind to an Identifier or MemberExpression
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_const(node) {
-	e(node, "invalid_const", "{@const ...} must be an assignment");
+export function bind_invalid_expression(node) {
+	e(node, "bind_invalid_expression", "Can only bind to an Identifier or MemberExpression");
 }
 
 /**
- * {#%name% ...} block cannot be %location%
+ * `bind:%name%` is not a valid binding. %explanation%
  * @param {null | number | NodeLike} node
  * @param {string} name
- * @param {string} location
+ * @param {string | undefined | null} [explanation]
  * @returns {never}
  */
-export function invalid_block_placement(node, name, location) {
-	e(node, "invalid_block_placement", `{#${name} ...} block cannot be ${location}`);
+export function bind_invalid_name(node, name, explanation) {
+	e(node, "bind_invalid_name", explanation ? `\`bind:${name}\` is not a valid binding. ${explanation}` : `\`bind:${name}\` is not a valid binding`);
 }
 
 /**
- * {@%name% ...} tag cannot be %location%
+ * `bind:%name%` can only be used with %elements%
  * @param {null | number | NodeLike} node
  * @param {string} name
- * @param {string} location
- * @returns {never}
- */
-export function invalid_tag_placement(node, name, location) {
-	e(node, "invalid_tag_placement", `{@${name} ...} tag cannot be ${location}`);
-}
-
-/**
- * Expected attribute value
- * @param {null | number | NodeLike} node
- * @returns {never}
- */
-export function missing_attribute_value(node) {
-	e(node, "missing_attribute_value", "Expected attribute value");
-}
-
-/**
- * Expected closing %delimiter% character
- * @param {null | number | NodeLike} node
- * @param {string} delimiter
- * @returns {never}
- */
-export function unclosed_attribute_value(node, delimiter) {
-	e(node, "unclosed_attribute_value", `Expected closing ${delimiter} character`);
-}
-
-/**
- * Directive value must be a JavaScript expression enclosed in curly braces
- * @param {null | number | NodeLike} node
+ * @param {string} elements
  * @returns {never}
  */
-export function invalid_directive_value(node) {
-	e(node, "invalid_directive_value", "Directive value must be a JavaScript expression enclosed in curly braces");
+export function bind_invalid_target(node, name, elements) {
+	e(node, "bind_invalid_target", `\`bind:${name}\` can only be used with ${elements}`);
 }
 
 /**
- * %type% name cannot be empty
+ * Can only bind to state or props
  * @param {null | number | NodeLike} node
- * @param {string} type
  * @returns {never}
  */
-export function empty_directive_name(node, type) {
-	e(node, "empty_directive_name", `${type} name cannot be empty`);
+export function bind_invalid_value(node) {
+	e(node, "bind_invalid_value", "Can only bind to state or props");
 }
 
 /**
- * </%name%> attempted to close an element that was not open
+ * %name% cannot appear more than once within a block
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
  */
-export function invalid_closing_tag(node, name) {
-	e(node, "invalid_closing_tag", `</${name}> attempted to close an element that was not open`);
+export function block_duplicate_clause(node, name) {
+	e(node, "block_duplicate_clause", `${name} cannot appear more than once within a block`);
 }
 
 /**
- * </%name%> attempted to close element that was already automatically closed by <%reason%> (cannot nest <%reason%> inside <%name%>)
+ * {:...} block is invalid at this position (did you forget to close the preceeding element or block?)
  * @param {null | number | NodeLike} node
- * @param {string} name
- * @param {string} reason
  * @returns {never}
  */
-export function invalid_closing_tag_after_autoclose(node, name, reason) {
-	e(node, "invalid_closing_tag_after_autoclose", `</${name}> attempted to close element that was already automatically closed by <${reason}> (cannot nest <${reason}> inside <${name}>)`);
+export function block_invalid_continuation_placement(node) {
+	e(node, "block_invalid_continuation_placement", "{:...} block is invalid at this position (did you forget to close the preceeding element or block?)");
 }
 
 /**
- * The $ name is reserved, and cannot be used for variables and imports
+ * 'elseif' should be 'else if'
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_dollar_binding(node) {
-	e(node, "invalid_dollar_binding", "The $ name is reserved, and cannot be used for variables and imports");
+export function block_invalid_elseif(node) {
+	e(node, "block_invalid_elseif", "'elseif' should be 'else if'");
 }
 
 /**
- * The $ prefix is reserved, and cannot be used for variables and imports
+ * {#%name% ...} block cannot be %location%
  * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} location
  * @returns {never}
  */
-export function invalid_dollar_prefix(node) {
-	e(node, "invalid_dollar_prefix", "The $ prefix is reserved, and cannot be used for variables and imports");
+export function block_invalid_placement(node, name, location) {
+	e(node, "block_invalid_placement", `{#${name} ...} block cannot be ${location}`);
 }
 
 /**
- * The $ name is reserved. To reference a global variable called $, use globalThis.$
+ * Block was left open
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_dollar_global(node) {
-	e(node, "invalid_dollar_global", "The $ name is reserved. To reference a global variable called $, use globalThis.$");
+export function block_unclosed(node) {
+	e(node, "block_unclosed", "Block was left open");
 }
 
 /**
- * Cannot reference store value inside `<script context="module">`
+ * Unexpected block closing tag
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function illegal_subscription(node) {
-	e(node, "illegal_subscription", "Cannot reference store value inside `<script context=\"module\">`");
+export function block_unexpected_close(node) {
+	e(node, "block_unexpected_close", "Unexpected block closing tag");
 }
 
 /**
- * A component can have a single top-level `<style>` element
+ * This type of directive is not valid on components
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function duplicate_style_element(node) {
-	e(node, "duplicate_style_element", "A component can have a single top-level `<style>` element");
+export function component_invalid_directive(node) {
+	e(node, "component_invalid_directive", "This type of directive is not valid on components");
 }
 
 /**
- * A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
+ * {@const ...} must be an assignment
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function duplicate_script_element(node) {
-	e(node, "duplicate_script_element", "A component can have a single top-level `<script>` element and/or a single top-level `<script context=\"module\">` element");
+export function const_tag_invalid_expression(node) {
+	e(node, "const_tag_invalid_expression", "{@const ...} must be an assignment");
 }
 
 /**
- * {@render ...} tags can only contain call expressions
+ * `{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>` or `<Component>`
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_render_expression(node) {
-	e(node, "invalid_render_expression", "{@render ...} tags can only contain call expressions");
+export function const_tag_invalid_placement(node) {
+	e(node, "const_tag_invalid_placement", "`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>` or `<Component>`");
 }
 
 /**
- * expected at most one argument
+ * {@debug ...} arguments must be identifiers, not arbitrary expressions
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_render_arguments(node) {
-	e(node, "invalid_render_arguments", "expected at most one argument");
+export function debug_tag_invalid_arguments(node) {
+	e(node, "debug_tag_invalid_arguments", "{@debug ...} arguments must be identifiers, not arbitrary expressions");
 }
 
 /**
- * Calling a snippet function using apply, bind or call is not allowed
+ * Directive value must be a JavaScript expression enclosed in curly braces
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_render_call(node) {
-	e(node, "invalid_render_call", "Calling a snippet function using apply, bind or call is not allowed");
+export function directive_invalid_value(node) {
+	e(node, "directive_invalid_value", "Directive value must be a JavaScript expression enclosed in curly braces");
 }
 
 /**
- * cannot use spread arguments in {@render ...} tags
+ * `%type%` name cannot be empty
  * @param {null | number | NodeLike} node
+ * @param {string} type
  * @returns {never}
  */
-export function invalid_render_spread_argument(node) {
-	e(node, "invalid_render_spread_argument", "cannot use spread arguments in {@render ...} tags");
+export function directive_missing_name(node, type) {
+	e(node, "directive_missing_name", `\`${type}\` name cannot be empty`);
 }
 
 /**
- * snippets do not support rest parameters; use an array instead
+ * `</%name%>` attempted to close an element that was not open
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_snippet_rest_parameter(node) {
-	e(node, "invalid_snippet_rest_parameter", "snippets do not support rest parameters; use an array instead");
+export function element_invalid_closing_tag(node, name) {
+	e(node, "element_invalid_closing_tag", `\`</${name}>\` attempted to close an element that was not open`);
 }
 
 /**
- * Cannot use `$$props` in runes mode
+ * `</%name%>` attempted to close element that was already automatically closed by `<%reason%>` (cannot nest `<%reason%>` inside `<%name%>`)
  * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} reason
  * @returns {never}
  */
-export function invalid_legacy_props(node) {
-	e(node, "invalid_legacy_props", "Cannot use `$$props` in runes mode");
+export function element_invalid_closing_tag_autoclosed(node, name, reason) {
+	e(node, "element_invalid_closing_tag_autoclosed", `\`</${name}>\` attempted to close element that was already automatically closed by \`<${reason}>\` (cannot nest \`<${reason}>\` inside \`<${name}>\`)`);
 }
 
 /**
- * Cannot use `$$restProps` in runes mode
+ * Expected valid tag name
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_legacy_rest_props(node) {
-	e(node, "invalid_legacy_rest_props", "Cannot use `$$restProps` in runes mode");
+export function element_invalid_tag_name(node) {
+	e(node, "element_invalid_tag_name", "Expected valid tag name");
 }
 
 /**
- * `$:` is not allowed in runes mode, use `$derived` or `$effect` instead
+ * `<%name%>` was left open
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_legacy_reactive_statement(node) {
-	e(node, "invalid_legacy_reactive_statement", "`$:` is not allowed in runes mode, use `$derived` or `$effect` instead");
+export function element_unclosed(node, name) {
+	e(node, "element_unclosed", `\`<${name}>\` was left open`);
 }
 
 /**
- * Cannot use `export let` in runes mode — use $props instead
+ * Event modifiers other than 'once' can only be used on DOM elements
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_legacy_export(node) {
-	e(node, "invalid_legacy_export", "Cannot use `export let` in runes mode — use $props instead");
+export function event_handler_invalid_component_modifier(node) {
+	e(node, "event_handler_invalid_component_modifier", "Event modifiers other than 'once' can only be used on DOM elements");
 }
 
 /**
- * Cannot use %rune% rune in non-runes mode
+ * Valid event modifiers are %list%
  * @param {null | number | NodeLike} node
- * @param {string} rune
+ * @param {string} list
  * @returns {never}
  */
-export function invalid_rune_usage(node, rune) {
-	e(node, "invalid_rune_usage", `Cannot use ${rune} rune in non-runes mode`);
+export function event_handler_invalid_modifier(node, list) {
+	e(node, "event_handler_invalid_modifier", `Valid event modifiers are ${list}`);
 }
 
 /**
- * Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties
+ * The '%modifier1%' and '%modifier2%' modifiers cannot be used together
  * @param {null | number | NodeLike} node
+ * @param {string} modifier1
+ * @param {string} modifier2
  * @returns {never}
  */
-export function invalid_state_export(node) {
-	e(node, "invalid_state_export", "Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties");
+export function event_handler_invalid_modifier_combination(node, modifier1, modifier2) {
+	e(node, "event_handler_invalid_modifier_combination", `The '${modifier1}' and '${modifier2}' modifiers cannot be used together`);
 }
 
 /**
- * Cannot export derived state from a module. To expose the current derived value, export a function returning its value
+ * Expected attribute value
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_derived_export(node) {
-	e(node, "invalid_derived_export", "Cannot export derived state from a module. To expose the current derived value, export a function returning its value");
+export function expected_attribute_value(node) {
+	e(node, "expected_attribute_value", "Expected attribute value");
 }
 
 /**
- * `$props()` can only be used with an object destructuring pattern
+ * Expected 'if', 'each', 'await', 'key' or 'snippet'
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_props_id(node) {
-	e(node, "invalid_props_id", "`$props()` can only be used with an object destructuring pattern");
+export function expected_block_type(node) {
+	e(node, "expected_block_type", "Expected 'if', 'each', 'await', 'key' or 'snippet'");
 }
 
 /**
- * `$props()` assignment must not contain nested properties or computed keys
+ * Expected an identifier
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_props_pattern(node) {
-	e(node, "invalid_props_pattern", "`$props()` assignment must not contain nested properties or computed keys");
+export function expected_identifier(node) {
+	e(node, "expected_identifier", "Expected an identifier");
 }
 
 /**
- * `$props()` can only be used at the top level of components as a variable declaration initializer
+ * Expected identifier or destructure pattern
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_props_location(node) {
-	e(node, "invalid_props_location", "`$props()` can only be used at the top level of components as a variable declaration initializer");
+export function expected_pattern(node) {
+	e(node, "expected_pattern", "Expected identifier or destructure pattern");
 }
 
 /**
- * `$bindable()` can only be used inside a `$props()` declaration
+ * Expected token %token%
  * @param {null | number | NodeLike} node
+ * @param {string} token
  * @returns {never}
  */
-export function invalid_bindable_location(node) {
-	e(node, "invalid_bindable_location", "`$bindable()` can only be used inside a `$props()` declaration");
+export function expected_token(node, token) {
+	e(node, "expected_token", `Expected token ${token}`);
 }
 
 /**
- * `%rune%(...)` can only be used as a variable declaration initializer or a class field
+ * Expected whitespace
  * @param {null | number | NodeLike} node
- * @param {string} rune
  * @returns {never}
  */
-export function invalid_state_location(node, rune) {
-	e(node, "invalid_state_location", `\`${rune}(...)\` can only be used as a variable declaration initializer or a class field`);
+export function expected_whitespace(node) {
+	e(node, "expected_whitespace", "Expected whitespace");
 }
 
 /**
- * `$effect()` can only be used as an expression statement
+ * %message%
  * @param {null | number | NodeLike} node
+ * @param {string} message
  * @returns {never}
  */
-export function invalid_effect_location(node) {
-	e(node, "invalid_effect_location", "`$effect()` can only be used as an expression statement");
+export function js_parse_error(node, message) {
+	e(node, "js_parse_error", `${message}`);
 }
 
 /**
- * `$host()` can only be used inside custom element component instances
+ * `let:` directive at invalid position
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_host_location(node) {
-	e(node, "invalid_host_location", "`$host()` can only be used inside custom element component instances");
+export function let_directive_invalid_placement(node) {
+	e(node, "let_directive_invalid_placement", "`let:` directive at invalid position");
 }
 
 /**
- * Cannot assign to %thing%
+ * %thing% is invalid inside <%parent%>
  * @param {null | number | NodeLike} node
  * @param {string} thing
+ * @param {string} parent
  * @returns {never}
  */
-export function invalid_assignment(node, thing) {
-	e(node, "invalid_assignment", `Cannot assign to ${thing}`);
+export function node_invalid_placement(node, thing, parent) {
+	e(node, "node_invalid_placement", `${thing} is invalid inside <${parent}>`);
 }
 
 /**
- * Cannot bind to %thing%
+ * Calling a snippet function using apply, bind or call is not allowed
  * @param {null | number | NodeLike} node
- * @param {string} thing
  * @returns {never}
  */
-export function invalid_binding(node, thing) {
-	e(node, "invalid_binding", `Cannot bind to ${thing}`);
+export function render_tag_invalid_call_expression(node) {
+	e(node, "render_tag_invalid_call_expression", "Calling a snippet function using apply, bind or call is not allowed");
 }
 
 /**
- * `%rune%` cannot be called with arguments
+ * `{@render ...}` tags can only contain call expressions
  * @param {null | number | NodeLike} node
- * @param {string} rune
  * @returns {never}
  */
-export function invalid_rune_args(node, rune) {
-	e(node, "invalid_rune_args", `\`${rune}\` cannot be called with arguments`);
+export function render_tag_invalid_expression(node) {
+	e(node, "render_tag_invalid_expression", "`{@render ...}` tags can only contain call expressions");
 }
 
 /**
- * `%rune%` must be called with %args%
+ * cannot use spread arguments in `{@render ...}` tags
  * @param {null | number | NodeLike} node
- * @param {string} rune
- * @param {string} args
  * @returns {never}
  */
-export function invalid_rune_args_length(node, rune, args) {
-	e(node, "invalid_rune_args_length", `\`${rune}\` must be called with ${args}`);
+export function render_tag_invalid_spread_argument(node) {
+	e(node, "render_tag_invalid_spread_argument", "cannot use spread arguments in `{@render ...}` tags");
 }
 
 /**
- * %name% cannot be used in runes mode
+ * A component can have a single top-level `<script>` element and/or a single top-level `<script context="module">` element
  * @param {null | number | NodeLike} node
- * @param {string} name
  * @returns {never}
  */
-export function invalid_runes_mode_import(node, name) {
-	e(node, "invalid_runes_mode_import", `${name} cannot be used in runes mode`);
+export function script_duplicate(node) {
+	e(node, "script_duplicate", "A component can have a single top-level `<script>` element and/or a single top-level `<script context=\"module\">` element");
 }
 
 /**
- * Cannot use `$props()` more than once
+ * If the context attribute is supplied, its value must be "module"
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function duplicate_props_rune(node) {
-	e(node, "duplicate_props_rune", "Cannot use `$props()` more than once");
+export function script_invalid_context(node) {
+	e(node, "script_invalid_context", "If the context attribute is supplied, its value must be \"module\"");
 }
 
 /**
- * Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)
+ * Duplicate slot name '%name%' in <%component%>
  * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} component
  * @returns {never}
  */
-export function invalid_each_assignment(node) {
-	e(node, "invalid_each_assignment", "Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)");
+export function slot_attribute_duplicate(node, name, component) {
+	e(node, "slot_attribute_duplicate", `Duplicate slot name '${name}' in <${component}>`);
 }
 
 /**
- * Cannot reassign or bind to snippet parameter
+ * slot attribute must be a static value
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_snippet_assignment(node) {
-	e(node, "invalid_snippet_assignment", "Cannot reassign or bind to snippet parameter");
+export function slot_attribute_invalid(node) {
+	e(node, "slot_attribute_invalid", "slot attribute must be a static value");
 }
 
 /**
- * `$derived.call(...)` has been replaced with `$derived.by(...)`
+ * Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_derived_call(node) {
-	e(node, "invalid_derived_call", "`$derived.call(...)` has been replaced with `$derived.by(...)`");
+export function slot_attribute_invalid_placement(node) {
+	e(node, "slot_attribute_invalid_placement", "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element");
 }
 
 /**
- * Cannot have a property and a component export with the same name
+ * Found default slot content alongside an explicit slot="default"
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function conflicting_property_name(node) {
-	e(node, "conflicting_property_name", "Cannot have a property and a component export with the same name");
+export function slot_default_duplicate(node) {
+	e(node, "slot_default_duplicate", "Found default slot content alongside an explicit slot=\"default\"");
 }
 
 /**
@@ -1084,8 +1017,8 @@ export function conflicting_property_name(node) {
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_slot_element_attribute(node) {
-	e(node, "invalid_slot_element_attribute", "`<slot>` can only receive attributes and (optionally) let directives");
+export function slot_element_invalid_attribute(node) {
+	e(node, "slot_element_invalid_attribute", "`<slot>` can only receive attributes and (optionally) let directives");
 }
 
 /**
@@ -1093,8 +1026,8 @@ export function invalid_slot_element_attribute(node) {
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_slot_attribute(node) {
-	e(node, "invalid_slot_attribute", "slot attribute must be a static value");
+export function slot_element_invalid_name(node) {
+	e(node, "slot_element_invalid_name", "slot attribute must be a static value");
 }
 
 /**
@@ -1102,329 +1035,333 @@ export function invalid_slot_attribute(node) {
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_slot_name_default(node) {
-	e(node, "invalid_slot_name_default", "`default` is a reserved word — it cannot be used as a slot name");
+export function slot_element_invalid_name_default(node) {
+	e(node, "slot_element_invalid_name_default", "`default` is a reserved word — it cannot be used as a slot name");
 }
 
 /**
- * slot attribute must be a static value
+ * Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_slot_name(node) {
-	e(node, "invalid_slot_name", "slot attribute must be a static value");
+export function slot_snippet_conflict(node) {
+	e(node, "slot_snippet_conflict", "Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.");
 }
 
 /**
- * Element with a slot='...' attribute must be a child of a component or a descendant of a custom element
+ * Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_slot_placement(node) {
-	e(node, "invalid_slot_placement", "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element");
+export function snippet_conflict(node) {
+	e(node, "snippet_conflict", "Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block");
 }
 
 /**
- * Duplicate slot name '%name%' in <%component%>
+ * snippets do not support rest parameters; use an array instead
  * @param {null | number | NodeLike} node
- * @param {string} name
- * @param {string} component
  * @returns {never}
  */
-export function duplicate_slot_name(node, name, component) {
-	e(node, "duplicate_slot_name", `Duplicate slot name '${name}' in <${component}>`);
+export function snippet_invalid_rest_parameter(node) {
+	e(node, "snippet_invalid_rest_parameter", "snippets do not support rest parameters; use an array instead");
 }
 
 /**
- * Found default slot content alongside an explicit slot="default"
+ * `style:` directive can only use the `important` modifier
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_default_slot_content(node) {
-	e(node, "invalid_default_slot_content", "Found default slot content alongside an explicit slot=\"default\"");
+export function style_directive_invalid_modifier(node) {
+	e(node, "style_directive_invalid_modifier", "`style:` directive can only use the `important` modifier");
 }
 
 /**
- * Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block
+ * A component can have a single top-level `<style>` element
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function conflicting_children_snippet(node) {
-	e(node, "conflicting_children_snippet", "Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block");
+export function style_duplicate(node) {
+	e(node, "style_duplicate", "A component can have a single top-level `<style>` element");
 }
 
 /**
- * `<svelte:options>` can only receive static attributes
+ * Invalid component definition — must be an `{expression}`
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_option_attribute(node) {
-	e(node, "invalid_svelte_option_attribute", "`<svelte:options>` can only receive static attributes");
+export function svelte_component_invalid_this(node) {
+	e(node, "svelte_component_invalid_this", "Invalid component definition — must be an `{expression}`");
 }
 
 /**
- * Unsupported `<svelte:option>` value for "namespace". Valid values are "html", "svg" or "foreign"
+ * `<svelte:component>` must have a 'this' attribute
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_option_namespace(node) {
-	e(node, "invalid_svelte_option_namespace", "Unsupported `<svelte:option>` value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\"");
+export function svelte_component_missing_this(node) {
+	e(node, "svelte_component_missing_this", "`<svelte:component>` must have a 'this' attribute");
 }
 
 /**
- * "tag" option is deprecated — use "customElement" instead
+ * Invalid element definition — must be an `{expression}`
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function tag_option_deprecated(node) {
-	e(node, "tag_option_deprecated", "\"tag\" option is deprecated — use \"customElement\" instead");
+export function svelte_element_invalid_this(node) {
+	e(node, "svelte_element_invalid_this", "Invalid element definition — must be an `{expression}`");
 }
 
 /**
- * Unsupported `<svelte:option>` value for "runes". Valid values are true or false
+ * `<svelte:element>` must have a 'this' attribute
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_option_runes(node) {
-	e(node, "invalid_svelte_option_runes", "Unsupported `<svelte:option>` value for \"runes\". Valid values are true or false");
+export function svelte_element_missing_this(node) {
+	e(node, "svelte_element_missing_this", "`<svelte:element>` must have a 'this' attribute");
 }
 
 /**
- * Unsupported `<svelte:option>` value for "accessors". Valid values are true or false
+ * `<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_option_accessors(node) {
-	e(node, "invalid_svelte_option_accessors", "Unsupported `<svelte:option>` value for \"accessors\". Valid values are true or false");
+export function svelte_fragment_invalid_attribute(node) {
+	e(node, "svelte_fragment_invalid_attribute", "`<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive");
 }
 
 /**
- * Unsupported `<svelte:option>` value for "preserveWhitespace". Valid values are true or false
+ * `<svelte:fragment>` must be the direct child of a component
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_option_preserveWhitespace(node) {
-	e(node, "invalid_svelte_option_preserveWhitespace", "Unsupported `<svelte:option>` value for \"preserveWhitespace\". Valid values are true or false");
+export function svelte_fragment_invalid_placement(node) {
+	e(node, "svelte_fragment_invalid_placement", "`<svelte:fragment>` must be the direct child of a component");
 }
 
 /**
- * Unsupported `<svelte:option>` value for "immutable". Valid values are true or false
+ * `<svelte:fragment>` slot attribute must have a static value
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_option_immutable(node) {
-	e(node, "invalid_svelte_option_immutable", "Unsupported `<svelte:option>` value for \"immutable\". Valid values are true or false");
+export function svelte_fragment_invalid_slot(node) {
+	e(node, "svelte_fragment_invalid_slot", "`<svelte:fragment>` slot attribute must have a static value");
 }
 
 /**
- * Tag name must be two or more words joined by the "-" character
+ * `<svelte:head>` cannot have attributes nor directives
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_tag_property(node) {
-	e(node, "invalid_tag_property", "Tag name must be two or more words joined by the \"-\" character");
+export function svelte_head_illegal_attribute(node) {
+	e(node, "svelte_head_illegal_attribute", "`<svelte:head>` cannot have attributes nor directives");
 }
 
 /**
- * "customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
+ * A component can only have one `<%name%>` element
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_svelte_option_customElement(node) {
-	e(node, "invalid_svelte_option_customElement", "\"customElement\" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: \"open\" | \"none\"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }");
+export function svelte_meta_duplicate(node, name) {
+	e(node, "svelte_meta_duplicate", `A component can only have one \`<${name}>\` element`);
 }
 
 /**
- * "props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
+ * <%name%> cannot have children
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_customElement_props_attribute(node) {
-	e(node, "invalid_customElement_props_attribute", "\"props\" must be a statically analyzable object literal of the form \"{ [key: string]: { attribute?: string; reflect?: boolean; type?: \"String\" | \"Boolean\" | \"Number\" | \"Array\" | \"Object\" }\"");
+export function svelte_meta_invalid_content(node, name) {
+	e(node, "svelte_meta_invalid_content", `<${name}> cannot have children`);
 }
 
 /**
- * "shadow" must be either "open" or "none"
+ * `<%name%>` tags cannot be inside elements or blocks
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function invalid_customElement_shadow_attribute(node) {
-	e(node, "invalid_customElement_shadow_attribute", "\"shadow\" must be either \"open\" or \"none\"");
+export function svelte_meta_invalid_placement(node, name) {
+	e(node, "svelte_meta_invalid_placement", `\`<${name}>\` tags cannot be inside elements or blocks`);
 }
 
 /**
- * `<svelte:options>` unknown attribute '%name%'
+ * Valid `<svelte:...>` tag names are %list%
  * @param {null | number | NodeLike} node
- * @param {string} name
+ * @param {string} list
  * @returns {never}
  */
-export function unknown_svelte_option_attribute(node, name) {
-	e(node, "unknown_svelte_option_attribute", `\`<svelte:options>\` unknown attribute '${name}'`);
+export function svelte_meta_invalid_tag(node, list) {
+	e(node, "svelte_meta_invalid_tag", `Valid \`<svelte:...>\` tag names are ${list}`);
 }
 
 /**
- * `<svelte:head>` cannot have attributes nor directives
+ * "tag" option is deprecated — use "customElement" instead
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function illegal_svelte_head_attribute(node) {
-	e(node, "illegal_svelte_head_attribute", "`<svelte:head>` cannot have attributes nor directives");
+export function svelte_options_deprecated_tag(node) {
+	e(node, "svelte_options_deprecated_tag", "\"tag\" option is deprecated — use \"customElement\" instead");
 }
 
 /**
- * `<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive
+ * `<svelte:options>` can only receive static attributes
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_fragment_attribute(node) {
-	e(node, "invalid_svelte_fragment_attribute", "`<svelte:fragment>` can only have a slot attribute and (optionally) a let: directive");
+export function svelte_options_invalid_attribute(node) {
+	e(node, "svelte_options_invalid_attribute", "`<svelte:options>` can only receive static attributes");
 }
 
 /**
- * `<svelte:fragment>` slot attribute must have a static value
+ * Valid values are %list%
  * @param {null | number | NodeLike} node
+ * @param {string} list
  * @returns {never}
  */
-export function invalid_svelte_fragment_slot(node) {
-	e(node, "invalid_svelte_fragment_slot", "`<svelte:fragment>` slot attribute must have a static value");
+export function svelte_options_invalid_attribute_value(node, list) {
+	e(node, "svelte_options_invalid_attribute_value", `Valid values are ${list}`);
 }
 
 /**
- * `<svelte:fragment>` must be the direct child of a component
+ * "customElement" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_fragment_placement(node) {
-	e(node, "invalid_svelte_fragment_placement", "`<svelte:fragment>` must be the direct child of a component");
+export function svelte_options_invalid_customelement(node) {
+	e(node, "svelte_options_invalid_customelement", "\"customElement\" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: \"open\" | \"none\"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }");
 }
 
 /**
- * <%name%> tags cannot be inside elements or blocks
+ * "props" must be a statically analyzable object literal of the form "{ [key: string]: { attribute?: string; reflect?: boolean; type?: "String" | "Boolean" | "Number" | "Array" | "Object" }"
  * @param {null | number | NodeLike} node
- * @param {string} name
  * @returns {never}
  */
-export function invalid_svelte_element_placement(node, name) {
-	e(node, "invalid_svelte_element_placement", `<${name}> tags cannot be inside elements or blocks`);
+export function svelte_options_invalid_customelement_props(node) {
+	e(node, "svelte_options_invalid_customelement_props", "\"props\" must be a statically analyzable object literal of the form \"{ [key: string]: { attribute?: string; reflect?: boolean; type?: \"String\" | \"Boolean\" | \"Number\" | \"Array\" | \"Object\" }\"");
 }
 
 /**
- * A component can only have one <%name%> element
+ * "shadow" must be either "open" or "none"
  * @param {null | number | NodeLike} node
- * @param {string} name
  * @returns {never}
  */
-export function duplicate_svelte_element(node, name) {
-	e(node, "duplicate_svelte_element", `A component can only have one <${name}> element`);
+export function svelte_options_invalid_customelement_shadow(node) {
+	e(node, "svelte_options_invalid_customelement_shadow", "\"shadow\" must be either \"open\" or \"none\"");
 }
 
 /**
- * `<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components
+ * Tag name must be two or more words joined by the "-" character
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_self_placement(node) {
-	e(node, "invalid_self_placement", "`<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components");
+export function svelte_options_invalid_tagname(node) {
+	e(node, "svelte_options_invalid_tagname", "Tag name must be two or more words joined by the \"-\" character");
 }
 
 /**
- * `<svelte:element>` must have a 'this' attribute
+ * `<svelte:options>` unknown attribute '%name%'
  * @param {null | number | NodeLike} node
+ * @param {string} name
  * @returns {never}
  */
-export function missing_svelte_element_definition(node) {
-	e(node, "missing_svelte_element_definition", "`<svelte:element>` must have a 'this' attribute");
+export function svelte_options_unknown_attribute(node, name) {
+	e(node, "svelte_options_unknown_attribute", `\`<svelte:options>\` unknown attribute '${name}'`);
 }
 
 /**
- * `<svelte:component>` must have a 'this' attribute
+ * `<svelte:self>` components can only exist inside `{#if}` blocks, `{#each}` blocks, `{#snippet}` blocks or slots passed to components
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function missing_svelte_component_definition(node) {
-	e(node, "missing_svelte_component_definition", "`<svelte:component>` must have a 'this' attribute");
+export function svelte_self_invalid_placement(node) {
+	e(node, "svelte_self_invalid_placement", "`<svelte:self>` components can only exist inside `{#if}` blocks, `{#each}` blocks, `{#snippet}` blocks or slots passed to components");
 }
 
 /**
- * Invalid element definition — must be an {expression}
+ * {@%name% ...} tag cannot be %location%
  * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @param {string} location
  * @returns {never}
  */
-export function invalid_svelte_element_definition(node) {
-	e(node, "invalid_svelte_element_definition", "Invalid element definition — must be an {expression}");
+export function tag_invalid_placement(node, name, location) {
+	e(node, "tag_invalid_placement", `{@${name} ...} tag cannot be ${location}`);
 }
 
 /**
- * Invalid component definition — must be an {expression}
+ * A `<textarea>` can have either a value attribute or (equivalently) child content, but not both
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function invalid_svelte_component_definition(node) {
-	e(node, "invalid_svelte_component_definition", "Invalid component definition — must be an {expression}");
+export function textarea_invalid_content(node) {
+	e(node, "textarea_invalid_content", "A `<textarea>` can have either a value attribute or (equivalently) child content, but not both");
 }
 
 /**
- * Valid `<svelte:...>` tag names are %list%
+ * `<title>` cannot have attributes nor directives
  * @param {null | number | NodeLike} node
- * @param {string} list
  * @returns {never}
  */
-export function invalid_svelte_tag(node, list) {
-	e(node, "invalid_svelte_tag", `Valid \`<svelte:...>\` tag names are ${list}`);
+export function title_illegal_attribute(node) {
+	e(node, "title_illegal_attribute", "`<title>` cannot have attributes nor directives");
 }
 
 /**
- * Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.
+ * `<title>` can only contain text and {tags}
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function conflicting_slot_usage(node) {
-	e(node, "conflicting_slot_usage", "Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.");
+export function title_invalid_content(node) {
+	e(node, "title_invalid_content", "`<title>` can only contain text and {tags}");
 }
 
 /**
- * `%name%` is an illegal variable name. To reference a global variable called `%name%`, use `globalThis.%name%`
+ * Cannot use `%type%:` alongside existing `%existing%:` directive
  * @param {null | number | NodeLike} node
- * @param {string} name
+ * @param {string} type
+ * @param {string} existing
  * @returns {never}
  */
-export function illegal_global(node, name) {
-	e(node, "illegal_global", `\`${name}\` is an illegal variable name. To reference a global variable called \`${name}\`, use \`globalThis.${name}\``);
+export function transition_conflict(node, type, existing) {
+	e(node, "transition_conflict", `Cannot use \`${type}:\` alongside existing \`${existing}:\` directive`);
 }
 
 /**
- * `%name%` has already been declared
+ * Cannot use multiple `%type%:` directives on a single element
  * @param {null | number | NodeLike} node
- * @param {string} name
+ * @param {string} type
  * @returns {never}
  */
-export function duplicate_declaration(node, name) {
-	e(node, "duplicate_declaration", `\`${name}\` has already been declared`);
+export function transition_duplicate(node, type) {
+	e(node, "transition_duplicate", `Cannot use multiple \`${type}:\` directives on a single element`);
 }
 
 /**
- * A component cannot have a default export
+ * Unexpected end of input
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function default_export(node) {
-	e(node, "default_export", "A component cannot have a default export");
+export function unexpected_eof(node) {
+	e(node, "unexpected_eof", "Unexpected end of input");
 }
 
 /**
- * Cannot declare same variable name which is imported inside `<script context="module">`
+ * '%word%' is a reserved word in JavaScript and cannot be used here
  * @param {null | number | NodeLike} node
+ * @param {string} word
  * @returns {never}
  */
-export function illegal_variable_declaration(node) {
-	e(node, "illegal_variable_declaration", "Cannot declare same variable name which is imported inside `<script context=\"module\">`");
+export function unexpected_reserved_word(node, word) {
+	e(node, "unexpected_reserved_word", `'${word}' is a reserved word in JavaScript and cannot be used here`);
 }
 
 /**
- * Cannot subscribe to stores that are not declared at the top level of the component
+ * Void elements cannot have children or closing tags
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
-export function illegal_store_subscription(node) {
-	e(node, "illegal_store_subscription", "Cannot subscribe to stores that are not declared at the top level of the component");
+export function void_element_invalid_content(node) {
+	e(node, "void_element_invalid_content", "Void elements cannot have children or closing tags");
 }
\ No newline at end of file
diff --git a/packages/svelte/src/compiler/phases/1-parse/index.js b/packages/svelte/src/compiler/phases/1-parse/index.js
index d5f5cda052..69889bfce8 100644
--- a/packages/svelte/src/compiler/phases/1-parse/index.js
+++ b/packages/svelte/src/compiler/phases/1-parse/index.js
@@ -92,10 +92,10 @@ export class Parser {
 
 			if (current.type === 'RegularElement') {
 				current.end = current.start + 1;
-				e.unclosed_element(current, current.name);
+				e.element_unclosed(current, current.name);
 			} else {
 				current.end = current.start + 1;
-				e.unclosed_block(current);
+				e.block_unclosed(current);
 			}
 		}
 
@@ -263,7 +263,7 @@ export class Parser {
 
 	require_whitespace() {
 		if (!regex_whitespace.test(this.template[this.index])) {
-			e.missing_whitespace(this.index);
+			e.expected_whitespace(this.index);
 		}
 
 		this.allow_whitespace();
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/options.js b/packages/svelte/src/compiler/phases/1-parse/read/options.js
index 18264ae9bc..9879d774ef 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/options.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/options.js
@@ -22,18 +22,18 @@ export default function read_options(node) {
 
 	for (const attribute of node.attributes) {
 		if (attribute.type !== 'Attribute') {
-			e.invalid_svelte_option_attribute(attribute);
+			e.svelte_options_invalid_attribute(attribute);
 		}
 
 		const { name } = attribute;
 
 		switch (name) {
 			case 'runes': {
-				component_options.runes = get_boolean_value(attribute, e.invalid_svelte_option_runes);
+				component_options.runes = get_boolean_value(attribute);
 				break;
 			}
 			case 'tag': {
-				e.tag_option_deprecated(attribute);
+				e.svelte_options_deprecated_tag(attribute);
 				break; // eslint doesn't know this is unnecessary
 			}
 			case 'customElement': {
@@ -42,9 +42,9 @@ export default function read_options(node) {
 
 				const { value } = attribute;
 				if (value === true) {
-					e.invalid_svelte_option_customElement(attribute);
+					e.svelte_options_invalid_customelement(attribute);
 				} else if (value[0].type === 'Text') {
-					const tag = get_static_value(attribute, () => e.invalid_tag_property(attribute));
+					const tag = get_static_value(attribute);
 					validate_tag(attribute, tag);
 					ce.tag = tag;
 					component_options.customElement = ce;
@@ -55,7 +55,7 @@ export default function read_options(node) {
 					if (value[0].expression.type === 'Literal' && value[0].expression.value === null) {
 						break;
 					}
-					e.invalid_svelte_option_customElement(attribute);
+					e.svelte_options_invalid_customelement(attribute);
 				}
 
 				/** @type {Array<[string, any]>} */
@@ -66,7 +66,7 @@ export default function read_options(node) {
 						property.computed ||
 						property.key.type !== 'Identifier'
 					) {
-						e.invalid_svelte_option_customElement(attribute);
+						e.svelte_options_invalid_customelement(attribute);
 					}
 					properties.push([property.key.name, property.value]);
 				}
@@ -77,13 +77,13 @@ export default function read_options(node) {
 					validate_tag(tag, tag_value);
 					ce.tag = tag_value;
 				} else {
-					e.invalid_svelte_option_customElement(attribute);
+					e.svelte_options_invalid_customelement(attribute);
 				}
 
 				const props = properties.find(([name]) => name === 'props')?.[1];
 				if (props) {
 					if (props.type !== 'ObjectExpression') {
-						e.invalid_customElement_props_attribute(attribute);
+						e.svelte_options_invalid_customelement_props(attribute);
 					}
 					ce.props = {};
 					for (const property of /** @type {import('estree').ObjectExpression} */ (props)
@@ -94,7 +94,7 @@ export default function read_options(node) {
 							property.key.type !== 'Identifier' ||
 							property.value.type !== 'ObjectExpression'
 						) {
-							e.invalid_customElement_props_attribute(attribute);
+							e.svelte_options_invalid_customelement_props(attribute);
 						}
 						ce.props[property.key.name] = {};
 						for (const prop of property.value.properties) {
@@ -104,7 +104,7 @@ export default function read_options(node) {
 								prop.key.type !== 'Identifier' ||
 								prop.value.type !== 'Literal'
 							) {
-								e.invalid_customElement_props_attribute(attribute);
+								e.svelte_options_invalid_customelement_props(attribute);
 							}
 
 							if (prop.key.name === 'type') {
@@ -113,21 +113,21 @@ export default function read_options(node) {
 										/** @type {string} */ (prop.value.value)
 									) === -1
 								) {
-									e.invalid_customElement_props_attribute(attribute);
+									e.svelte_options_invalid_customelement_props(attribute);
 								}
 								ce.props[property.key.name].type = /** @type {any} */ (prop.value.value);
 							} else if (prop.key.name === 'reflect') {
 								if (typeof prop.value.value !== 'boolean') {
-									e.invalid_customElement_props_attribute(attribute);
+									e.svelte_options_invalid_customelement_props(attribute);
 								}
 								ce.props[property.key.name].reflect = prop.value.value;
 							} else if (prop.key.name === 'attribute') {
 								if (typeof prop.value.value !== 'string') {
-									e.invalid_customElement_props_attribute(attribute);
+									e.svelte_options_invalid_customelement_props(attribute);
 								}
 								ce.props[property.key.name].attribute = prop.value.value;
 							} else {
-								e.invalid_customElement_props_attribute(attribute);
+								e.svelte_options_invalid_customelement_props(attribute);
 							}
 						}
 					}
@@ -137,7 +137,7 @@ export default function read_options(node) {
 				if (shadow) {
 					const shadowdom = shadow?.value;
 					if (shadowdom !== 'open' && shadowdom !== 'none') {
-						e.invalid_customElement_shadow_attribute(shadow);
+						e.svelte_options_invalid_customelement_shadow(shadow);
 					}
 					ce.shadow = shadowdom;
 				}
@@ -151,46 +151,32 @@ export default function read_options(node) {
 				break;
 			}
 			case 'namespace': {
-				const value = get_static_value(attribute, () =>
-					e.invalid_svelte_option_namespace(attribute)
-				);
-				if (typeof value !== 'string') {
-					e.invalid_svelte_option_namespace(attribute);
-				}
+				const value = get_static_value(attribute);
 
 				if (value === namespace_svg) {
 					component_options.namespace = 'svg';
 				} else if (value === 'html' || value === 'svg' || value === 'foreign') {
 					component_options.namespace = value;
 				} else {
-					e.invalid_svelte_option_namespace(attribute);
+					e.svelte_options_invalid_attribute_value(attribute, `"html", "svg" or "foreign"`);
 				}
 
 				break;
 			}
 			case 'immutable': {
-				component_options.immutable = get_boolean_value(
-					attribute,
-					e.invalid_svelte_option_immutable
-				);
+				component_options.immutable = get_boolean_value(attribute);
 				break;
 			}
 			case 'preserveWhitespace': {
-				component_options.preserveWhitespace = get_boolean_value(
-					attribute,
-					e.invalid_svelte_option_preserveWhitespace
-				);
+				component_options.preserveWhitespace = get_boolean_value(attribute);
 				break;
 			}
 			case 'accessors': {
-				component_options.accessors = get_boolean_value(
-					attribute,
-					e.invalid_svelte_option_accessors
-				);
+				component_options.accessors = get_boolean_value(attribute);
 				break;
 			}
 			default:
-				e.unknown_svelte_option_attribute(attribute, name);
+				e.svelte_options_unknown_attribute(attribute, name);
 		}
 	}
 
@@ -199,45 +185,43 @@ export default function read_options(node) {
 
 /**
  * @param {any} attribute
- * @param {(attribute: any) => never} error
  */
-function get_static_value(attribute, error) {
+function get_static_value(attribute) {
 	const { value } = attribute;
 	const chunk = value[0];
 	if (!chunk) return true;
 	if (value.length > 1) {
-		error(attribute);
+		return null;
 	}
 	if (chunk.type === 'Text') return chunk.data;
 	if (chunk.expression.type !== 'Literal') {
-		error(attribute);
+		return null;
 	}
 	return chunk.expression.value;
 }
 
 /**
  * @param {any} attribute
- * @param {(attribute: any) => never} error
  */
-function get_boolean_value(attribute, error) {
-	const value = get_static_value(attribute, () => error(attribute));
+function get_boolean_value(attribute) {
+	const value = get_static_value(attribute);
 	if (typeof value !== 'boolean') {
-		error(attribute);
+		e.svelte_options_invalid_attribute_value(attribute, 'true or false');
 	}
 	return value;
 }
 
 /**
  * @param {any} attribute
- * @param {string} tag
+ * @param {string | null} tag
  * @returns {asserts tag is string}
  */
 function validate_tag(attribute, tag) {
-	if (typeof tag !== 'string' && tag !== null) {
-		e.invalid_tag_property(attribute);
+	if (typeof tag !== 'string') {
+		e.svelte_options_invalid_tagname(attribute);
 	}
 	if (tag && !regex_valid_tag_name.test(tag)) {
-		e.invalid_tag_property(attribute);
+		e.svelte_options_invalid_tagname(attribute);
 	}
 	// TODO do we still need this?
 	// if (tag && !component.compile_options.customElement) {
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/script.js b/packages/svelte/src/compiler/phases/1-parse/read/script.js
index 172e1dddf1..19137fea34 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/script.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/script.js
@@ -16,13 +16,13 @@ function get_context(attributes) {
 	if (!context) return 'default';
 
 	if (context.value.length !== 1 || context.value[0].type !== 'Text') {
-		e.invalid_script_context(context.start);
+		e.script_invalid_context(context.start);
 	}
 
 	const value = context.value[0].data;
 
 	if (value !== 'module') {
-		e.invalid_script_context(context.start);
+		e.script_invalid_context(context.start);
 	}
 
 	return value;
@@ -38,7 +38,7 @@ export function read_script(parser, start, attributes) {
 	const script_start = parser.index;
 	const data = parser.read_until(regex_closing_script_tag);
 	if (parser.index >= parser.template.length) {
-		e.unclosed_element(parser.template.length, 'script');
+		e.element_unclosed(parser.template.length, 'script');
 	}
 
 	const source =
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/style.js b/packages/svelte/src/compiler/phases/1-parse/read/style.js
index de5a457889..358baea77a 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/style.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/style.js
@@ -352,7 +352,7 @@ function read_selector(parser, inside_pseudo_class = false) {
 		if (combinator) {
 			if (relative_selector.selectors.length === 0) {
 				if (!inside_pseudo_class) {
-					e.invalid_css_selector(start);
+					e.css_selector_invalid(start);
 				}
 			} else {
 				relative_selector.end = index;
@@ -365,7 +365,7 @@ function read_selector(parser, inside_pseudo_class = false) {
 			parser.allow_whitespace();
 
 			if (parser.match(',') || (inside_pseudo_class ? parser.match(')') : parser.match('{'))) {
-				e.invalid_css_selector(parser.index);
+				e.css_selector_invalid(parser.index);
 			}
 		}
 	}
@@ -471,12 +471,13 @@ function read_declaration(parser) {
 	const property = parser.read_until(REGEX_WHITESPACE_OR_COLON);
 	parser.allow_whitespace();
 	parser.eat(':');
+	let index = parser.index;
 	parser.allow_whitespace();
 
 	const value = read_value(parser);
 
 	if (!value && !property.startsWith('--')) {
-		e.invalid_css_declaration(parser.index);
+		e.css_empty_declaration({ start, end: index });
 	}
 
 	const end = parser.index;
@@ -577,7 +578,7 @@ function read_identifier(parser) {
 	let identifier = '';
 
 	if (parser.match('--') || parser.match_regex(REGEX_LEADING_HYPHEN_OR_DIGIT)) {
-		e.invalid_css_identifier(start);
+		e.css_expected_identifier(start);
 	}
 
 	let escaped = false;
@@ -602,7 +603,7 @@ function read_identifier(parser) {
 	}
 
 	if (identifier === '') {
-		e.invalid_css_identifier(start);
+		e.css_expected_identifier(start);
 	}
 
 	return identifier;
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/element.js b/packages/svelte/src/compiler/phases/1-parse/state/element.js
index 7696b23a66..80edeca6eb 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -101,18 +101,18 @@ export default function tag(parser) {
 				['svelte:options', 'svelte:window', 'svelte:body', 'svelte:document'].includes(name) &&
 				/** @type {import('#compiler').ElementLike} */ (parent).fragment.nodes.length
 			) {
-				e.invalid_element_content(
+				e.svelte_meta_invalid_content(
 					/** @type {import('#compiler').ElementLike} */ (parent).fragment.nodes[0].start,
 					name
 				);
 			}
 		} else {
 			if (name in parser.meta_tags) {
-				e.duplicate_svelte_element(start, name);
+				e.svelte_meta_duplicate(start, name);
 			}
 
 			if (parent.type !== 'Root') {
-				e.invalid_svelte_element_placement(start, name);
+				e.svelte_meta_invalid_placement(start, name);
 			}
 
 			parser.meta_tags[name] = true;
@@ -164,7 +164,7 @@ export default function tag(parser) {
 
 	if (is_closing_tag) {
 		if (is_void(name)) {
-			e.invalid_void_content(start);
+			e.void_element_invalid_content(start);
 		}
 
 		parser.eat('>', true);
@@ -173,9 +173,9 @@ export default function tag(parser) {
 		while (/** @type {import('#compiler').RegularElement} */ (parent).name !== name) {
 			if (parent.type !== 'RegularElement') {
 				if (parser.last_auto_closed_tag && parser.last_auto_closed_tag.tag === name) {
-					e.invalid_closing_tag_after_autoclose(start, name, parser.last_auto_closed_tag.reason);
+					e.element_invalid_closing_tag_autoclosed(start, name, parser.last_auto_closed_tag.reason);
 				} else {
-					e.invalid_closing_tag(start, name);
+					e.element_invalid_closing_tag(start, name);
 				}
 			}
 
@@ -216,7 +216,7 @@ export default function tag(parser) {
 	while ((attribute = read(parser))) {
 		if (attribute.type === 'Attribute' || attribute.type === 'BindDirective') {
 			if (unique_names.includes(attribute.name)) {
-				e.duplicate_attribute(attribute.start);
+				e.attribute_duplicate(attribute.start);
 				// <svelte:element bind:this this=..> is allowed
 			} else if (attribute.name !== 'this') {
 				unique_names.push(attribute.name);
@@ -233,7 +233,7 @@ export default function tag(parser) {
 			(attr) => attr.type === 'Attribute' && attr.name === 'this'
 		);
 		if (index === -1) {
-			e.missing_svelte_component_definition(start);
+			e.svelte_component_missing_this(start);
 		}
 
 		const definition = /** @type {import('#compiler').Attribute} */ (
@@ -244,7 +244,7 @@ export default function tag(parser) {
 			definition.value.length !== 1 ||
 			definition.value[0].type === 'Text'
 		) {
-			e.invalid_svelte_component_definition(definition.start);
+			e.svelte_component_invalid_this(definition.start);
 		}
 
 		element.expression = definition.value[0].expression;
@@ -256,14 +256,14 @@ export default function tag(parser) {
 			(attr) => attr.type === 'Attribute' && attr.name === 'this'
 		);
 		if (index === -1) {
-			e.missing_svelte_element_definition(start);
+			e.svelte_element_missing_this(start);
 		}
 
 		const definition = /** @type {import('#compiler').Attribute} */ (
 			element.attributes.splice(index, 1)[0]
 		);
 		if (definition.value === true || definition.value.length !== 1) {
-			e.invalid_svelte_element_definition(definition.start);
+			e.svelte_element_invalid_this(definition.start);
 		}
 		const chunk = definition.value[0];
 		element.tag =
@@ -302,17 +302,17 @@ export default function tag(parser) {
 			}
 
 			if (content.context === 'module') {
-				if (current.module) e.duplicate_script_element(start);
+				if (current.module) e.script_duplicate(start);
 				current.module = content;
 			} else {
-				if (current.instance) e.duplicate_script_element(start);
+				if (current.instance) e.script_duplicate(start);
 				current.instance = content;
 			}
 		} else {
 			const content = read_style(parser, start, element.attributes);
 			content.content.comment = prev_comment;
 
-			if (current.css) e.duplicate_style_element(start);
+			if (current.css) e.style_duplicate(start);
 			current.css = content;
 		}
 		return;
@@ -387,7 +387,7 @@ function read_tag_name(parser) {
 		}
 
 		if (!legal) {
-			e.invalid_self_placement(start);
+			e.svelte_self_invalid_placement(start);
 		}
 
 		return 'svelte:self';
@@ -404,11 +404,11 @@ function read_tag_name(parser) {
 
 	if (name.startsWith('svelte:')) {
 		const list = `${valid_meta_tags.slice(0, -1).join(', ')} or ${valid_meta_tags[valid_meta_tags.length - 1]}`;
-		e.invalid_svelte_tag(start, list);
+		e.svelte_meta_invalid_tag(start, list);
 	}
 
 	if (!valid_tag_name.test(name)) {
-		e.invalid_tag_name(start);
+		e.element_invalid_tag_name(start);
 	}
 
 	return name;
@@ -436,7 +436,7 @@ function read_static_attribute(parser) {
 		parser.allow_whitespace();
 		let raw = parser.match_regex(regex_attribute_value);
 		if (!raw) {
-			e.missing_attribute_value(parser.index);
+			e.expected_attribute_value(parser.index);
 		}
 
 		parser.index += raw.length;
@@ -500,7 +500,7 @@ function read_attribute(parser) {
 			const name = parser.read_identifier();
 
 			if (name === null) {
-				e.empty_attribute_shorthand(start);
+				e.attribute_empty_shorthand(start);
 			}
 
 			parser.allow_whitespace();
@@ -552,7 +552,7 @@ function read_attribute(parser) {
 		const [directive_name, ...modifiers] = name.slice(colon_index + 1).split('|');
 
 		if (directive_name === '') {
-			e.empty_directive_name(start + colon_index + 1, type);
+			e.directive_missing_name({ start, end: start + colon_index + 1 }, name);
 		}
 
 		if (type === 'StyleDirective') {
@@ -577,7 +577,7 @@ function read_attribute(parser) {
 			const attribute_contains_text =
 				/** @type {any[]} */ (value).length > 1 || first_value.type === 'Text';
 			if (attribute_contains_text) {
-				e.invalid_directive_value(/** @type {number} */ (first_value.start));
+				e.directive_invalid_value(/** @type {number} */ (first_value.start));
 			} else {
 				expression = first_value.expression;
 			}
@@ -678,14 +678,14 @@ function read_attribute_value(parser) {
 			const pos = error.position?.[0];
 			if (pos !== undefined && parser.template.slice(pos - 1, pos + 1) === '/>') {
 				parser.index = pos;
-				e.unclosed_attribute_value(pos, quote_mark || '}');
+				e.expected_token(pos, quote_mark || '}');
 			}
 		}
 		throw error;
 	}
 
 	if (value.length === 0 && !quote_mark) {
-		e.missing_attribute_value(parser.index);
+		e.expected_attribute_value(parser.index);
 	}
 
 	if (quote_mark) parser.index += 1;
@@ -732,12 +732,12 @@ function read_sequence(parser, done, location) {
 				const index = parser.index - 1;
 				parser.eat('#');
 				const name = parser.read_until(/[^a-z]/);
-				e.invalid_block_placement(index, name, location);
+				e.block_invalid_placement(index, name, location);
 			} else if (parser.match('@')) {
 				const index = parser.index - 1;
 				parser.eat('@');
 				const name = parser.read_until(/[^a-z]/);
-				e.invalid_tag_placement(index, name, location);
+				e.tag_invalid_placement(index, name, location);
 			}
 
 			flush(parser.index - 1);
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/tag.js b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
index 537e0b6b34..bf6adccccf 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/tag.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
@@ -331,7 +331,7 @@ function next(parser) {
 
 	if (block.type === 'IfBlock') {
 		if (!parser.eat('else')) e.expected_token(start, '{:else} or {:else if}');
-		if (parser.eat('if')) e.invalid_elseif(start);
+		if (parser.eat('if')) e.block_invalid_elseif(start);
 
 		parser.allow_whitespace();
 
@@ -389,7 +389,7 @@ function next(parser) {
 	if (block.type === 'AwaitBlock') {
 		if (parser.eat('then')) {
 			if (block.then) {
-				e.duplicate_block_part(start, '{:then}');
+				e.block_duplicate_clause(start, '{:then}');
 			}
 
 			if (!parser.eat('}')) {
@@ -408,7 +408,7 @@ function next(parser) {
 
 		if (parser.eat('catch')) {
 			if (block.catch) {
-				e.duplicate_block_part(start, '{:catch}');
+				e.block_duplicate_clause(start, '{:catch}');
 			}
 
 			if (!parser.eat('}')) {
@@ -428,7 +428,7 @@ function next(parser) {
 		e.expected_token(start, '{:then ...} or {:catch ...}');
 	}
 
-	e.invalid_continuing_block_placement(start);
+	e.block_invalid_continuation_placement(start);
 }
 
 /** @param {import('../index.js').Parser} parser */
@@ -466,11 +466,11 @@ function close(parser) {
 
 		case 'RegularElement':
 			// TODO handle implicitly closed elements
-			e.unexpected_block_close(start);
+			e.block_unexpected_close(start);
 			break;
 
 		default:
-			e.unexpected_block_close(start);
+			e.block_unexpected_close(start);
 	}
 
 	parser.allow_whitespace();
@@ -522,7 +522,7 @@ function special(parser) {
 			identifiers.forEach(
 				/** @param {any} node */ (node) => {
 					if (node.type !== 'Identifier') {
-						e.invalid_debug(/** @type {number} */ (node.start));
+						e.debug_tag_invalid_arguments(/** @type {number} */ (node.start));
 					}
 				}
 			);
@@ -583,7 +583,7 @@ function special(parser) {
 				expression.expression.type !== 'CallExpression' ||
 				!expression.expression.optional)
 		) {
-			e.invalid_render_expression(expression);
+			e.render_tag_invalid_expression(expression);
 		}
 
 		parser.allow_whitespace();
diff --git a/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js b/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js
index 6f933ab55a..dfbdb98ef2 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js
@@ -98,26 +98,26 @@ const validation_visitors = {
 	Rule(node, context) {
 		if (node.metadata.is_global_block) {
 			if (node.prelude.children.length > 1) {
-				e.invalid_css_global_block_list(node.prelude);
+				e.css_global_block_invalid_list(node.prelude);
 			}
 
 			const complex_selector = node.prelude.children[0];
 			const relative_selector = complex_selector.children[complex_selector.children.length - 1];
 
 			if (relative_selector.selectors.length > 1) {
-				e.invalid_css_global_block_modifier(
+				e.css_global_block_invalid_modifier(
 					relative_selector.selectors[relative_selector.selectors.length - 1]
 				);
 			}
 
 			if (relative_selector.combinator && relative_selector.combinator.name !== ' ') {
-				e.invalid_css_global_block_combinator(relative_selector, relative_selector.combinator.name);
+				e.css_global_block_invalid_combinator(relative_selector, relative_selector.combinator.name);
 			}
 
 			const declaration = node.block.children.find((child) => child.type === 'Declaration');
 
 			if (declaration) {
-				e.invalid_css_global_block_declaration(declaration);
+				e.css_global_block_invalid_declaration(declaration);
 			}
 		}
 
@@ -132,7 +132,7 @@ const validation_visitors = {
 			if (a !== b) {
 				for (let i = a; i <= b; i += 1) {
 					if (is_global(node.children[i])) {
-						e.invalid_css_global_placement(node.children[i].selectors[0]);
+						e.css_global_invalid_placement(node.children[i].selectors[0]);
 					}
 				}
 			}
@@ -147,12 +147,12 @@ const validation_visitors = {
 					const child = selector.args?.children[0].children[0];
 					// ensure `:global(element)` to be at the first position in a compound selector
 					if (child?.selectors[0].type === 'TypeSelector' && i !== 0) {
-						e.invalid_css_global_selector_list(selector);
+						e.css_global_invalid_selector_list(selector);
 					}
 
 					// ensure `:global(.class)` is not followed by a type selector, eg: `:global(.class)element`
 					if (relative_selector.selectors[i + 1]?.type === 'TypeSelector') {
-						e.invalid_css_type_selector_placement(relative_selector.selectors[i + 1]);
+						e.css_type_selector_invalid_placement(relative_selector.selectors[i + 1]);
 					}
 
 					// ensure `:global(...)`contains a single selector
@@ -162,7 +162,7 @@ const validation_visitors = {
 						selector.args.children.length > 1 &&
 						(node.children.length > 1 || relative_selector.selectors.length > 1)
 					) {
-						e.invalid_css_global_selector(selector);
+						e.css_global_invalid_selector(selector);
 					}
 				}
 			}
@@ -171,7 +171,7 @@ const validation_visitors = {
 	NestingSelector(node, context) {
 		const rule = /** @type {import('#compiler').Css.Rule} */ (context.state.rule);
 		if (!rule.metadata.parent_rule) {
-			e.invalid_nesting_selector(node);
+			e.css_nesting_selector_invalid_placement(node);
 		}
 	}
 };
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index bac63eab45..5eae33a4d7 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -230,7 +230,7 @@ export function analyze_module(ast, options) {
 	for (const [name, references] of scope.references) {
 		if (name[0] !== '$' || ReservedKeywords.includes(name)) continue;
 		if (name === '$' || name[1] === '$') {
-			e.illegal_global(references[0].node, name);
+			e.global_reference_invalid(references[0].node, name);
 		}
 	}
 
@@ -271,7 +271,7 @@ export function analyze_component(root, source, options) {
 	for (const [name, references] of module.scope.references) {
 		if (name[0] !== '$' || ReservedKeywords.includes(name)) continue;
 		if (name === '$' || name[1] === '$') {
-			e.illegal_global(references[0].node, name);
+			e.global_reference_invalid(references[0].node, name);
 		}
 
 		const store_name = name.slice(1);
@@ -311,16 +311,16 @@ export function analyze_component(root, source, options) {
 			}
 
 			if (is_nested_store_subscription_node) {
-				e.illegal_store_subscription(is_nested_store_subscription_node);
+				e.store_invalid_scoped_subscription(is_nested_store_subscription_node);
 			}
 
 			if (options.runes !== false) {
 				if (declaration === null && /[a-z]/.test(store_name[0])) {
-					e.illegal_global(references[0].node, name);
+					e.global_reference_invalid(references[0].node, name);
 				} else if (declaration !== null && Runes.includes(/** @type {any} */ (name))) {
 					for (const { node, path } of references) {
 						if (path.at(-1)?.type === 'CallExpression') {
-							w.store_with_rune_name(node, store_name);
+							w.store_rune_conflict(node, store_name);
 						}
 					}
 				}
@@ -335,7 +335,7 @@ export function analyze_component(root, source, options) {
 						// const state = $state(0) is valid
 						get_rune(/** @type {import('estree').Node} */ (path.at(-1)), module.scope) === null
 					) {
-						e.illegal_subscription(node);
+						e.store_invalid_subscription(node);
 					}
 				}
 			}
@@ -414,12 +414,12 @@ export function analyze_component(root, source, options) {
 	if (analysis.runes) {
 		const props_refs = module.scope.references.get('$$props');
 		if (props_refs) {
-			e.invalid_legacy_props(props_refs[0].node);
+			e.legacy_props_invalid(props_refs[0].node);
 		}
 
 		const rest_props_refs = module.scope.references.get('$$restProps');
 		if (rest_props_refs) {
-			e.invalid_legacy_rest_props(rest_props_refs[0].node);
+			e.legacy_rest_props_invalid(rest_props_refs[0].node);
 		}
 
 		for (const { ast, scope, scopes } of [module, instance, template]) {
@@ -444,20 +444,6 @@ export function analyze_component(root, source, options) {
 				merge(set_scope(scopes), validation_runes, runes_scope_tweaker, common_visitors)
 			);
 		}
-
-		if (analysis.exports.length > 0) {
-			for (const [_, binding] of instance.scope.declarations) {
-				if (binding.kind === 'prop' || binding.kind === 'bindable_prop') {
-					if (
-						analysis.exports.some(
-							({ alias, name }) => (binding.prop_alias ?? binding.node.name) === (alias ?? name)
-						)
-					) {
-						e.conflicting_property_name(binding.node);
-					}
-				}
-			}
-		}
 	} else {
 		instance.scope.declare(b.id('$$props'), 'bindable_prop', 'synthetic');
 		instance.scope.declare(b.id('$$restProps'), 'rest_prop', 'synthetic');
@@ -498,7 +484,7 @@ export function analyze_component(root, source, options) {
 					(r) => r.node !== binding.node && r.path.at(-1)?.type !== 'ExportSpecifier'
 				);
 				if (!references.length && !instance.scope.declarations.has(`$${name}`)) {
-					w.unused_export_let(binding.node, name);
+					w.export_let_unused(binding.node, name);
 				}
 			}
 		}
@@ -507,7 +493,7 @@ export function analyze_component(root, source, options) {
 	}
 
 	if (analysis.uses_render_tags && (analysis.uses_slots || analysis.slot_names.size > 0)) {
-		e.conflicting_slot_usage(analysis.slot_names.values().next().value);
+		e.slot_snippet_conflict(analysis.slot_names.values().next().value);
 	}
 
 	// warn on any nonstate declarations that are a) reassigned and b) referenced in the template
@@ -538,7 +524,7 @@ export function analyze_component(root, source, options) {
 									type === 'AwaitBlock' ||
 									type === 'KeyBlock'
 								) {
-									w.non_state_reference(binding.node, name);
+									w.non_reactive_update(binding.node, name);
 									continue outer;
 								}
 							}
@@ -546,7 +532,7 @@ export function analyze_component(root, source, options) {
 						}
 					}
 
-					w.non_state_reference(binding.node, name);
+					w.non_reactive_update(binding.node, name);
 					continue outer;
 				}
 			}
@@ -688,7 +674,7 @@ const legacy_scope_tweaker = {
 				(d) => d.scope === state.analysis.module.scope && d.declaration_kind !== 'const'
 			)
 		) {
-			w.module_script_reactive_declaration(node);
+			w.reactive_declaration_module_script(node);
 		}
 
 		if (
@@ -1210,7 +1196,7 @@ const common_visitors = {
 					binding.kind === 'derived') &&
 				context.state.function_depth === binding.scope.function_depth
 			) {
-				w.static_state_reference(node);
+				w.state_referenced_locally(node);
 			}
 		}
 	},
@@ -1493,7 +1479,7 @@ function order_reactive_statements(unsorted_reactive_declarations) {
 	const cycle = check_graph_for_cycles(edges);
 	if (cycle?.length) {
 		const declaration = /** @type {Tuple[]} */ (lookup.get(cycle[0]))[0];
-		e.cyclical_reactive_declaration(declaration[0], cycle.join(' → '));
+		e.reactive_declaration_cycle(declaration[0], cycle.join(' → '));
 	}
 
 	// We use a map and take advantage of the fact that the spec says insertion order is preserved when iterating
diff --git a/packages/svelte/src/compiler/phases/2-analyze/validation.js b/packages/svelte/src/compiler/phases/2-analyze/validation.js
index eaa486cd21..4f68b5f9ed 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/validation.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/validation.js
@@ -1,3 +1,4 @@
+import is_reference from 'is-reference';
 import {
 	disallowed_paragraph_contents,
 	interactive_elements,
@@ -18,6 +19,7 @@ import { binding_properties } from '../bindings.js';
 import {
 	ContentEditableBindings,
 	EventModifiers,
+	Runes,
 	SVGElements,
 	VoidElements
 } from '../constants.js';
@@ -44,14 +46,14 @@ function validate_component(node, context) {
 			attribute.type !== 'OnDirective' &&
 			attribute.type !== 'BindDirective'
 		) {
-			e.invalid_component_directive(attribute);
+			e.component_invalid_directive(attribute);
 		}
 
 		if (
 			attribute.type === 'OnDirective' &&
 			(attribute.modifiers.length > 1 || attribute.modifiers.some((m) => m !== 'once'))
 		) {
-			e.invalid_component_event_modifier(attribute);
+			e.event_handler_invalid_component_modifier(attribute);
 		}
 
 		if (attribute.type === 'Attribute') {
@@ -62,7 +64,7 @@ function validate_component(node, context) {
 					while (--i > 0) {
 						const char = context.state.analysis.source[i];
 						if (char === '(') break; // parenthesized sequence expressions are ok
-						if (char === '{') e.invalid_sequence_expression(expression);
+						if (char === '{') e.attribute_invalid_sequence_expression(expression);
 					}
 				}
 			}
@@ -111,18 +113,18 @@ function validate_element(node, context) {
 					while (--i > 0) {
 						const char = context.state.analysis.source[i];
 						if (char === '(') break; // parenthesized sequence expressions are ok
-						if (char === '{') e.invalid_sequence_expression(expression);
+						if (char === '{') e.attribute_invalid_sequence_expression(expression);
 					}
 				}
 			}
 
 			if (regex_illegal_attribute_character.test(attribute.name)) {
-				e.invalid_attribute_name(attribute, attribute.name);
+				e.attribute_invalid_name(attribute, attribute.name);
 			}
 
 			if (attribute.name.startsWith('on') && attribute.name.length > 2) {
 				if (!is_expression) {
-					e.invalid_event_attribute_value(attribute);
+					e.attribute_invalid_event_handler(attribute);
 				}
 
 				const value = attribute.value[0].expression;
@@ -131,7 +133,7 @@ function validate_element(node, context) {
 					value.name === attribute.name &&
 					!context.state.scope.get(value.name)
 				) {
-					w.global_event_reference(attribute, attribute.name);
+					w.attribute_global_event_reference(attribute, attribute.name);
 				}
 			}
 
@@ -141,12 +143,12 @@ function validate_element(node, context) {
 			}
 
 			if (attribute.name === 'is' && context.state.options.namespace !== 'foreign') {
-				w.avoid_is(attribute);
+				w.attribute_avoid_is(attribute);
 			}
 
 			const correct_name = react_attributes.get(attribute.name);
 			if (correct_name) {
-				w.invalid_html_attribute(attribute, attribute.name, correct_name);
+				w.attribute_invalid_property_name(attribute, attribute.name, correct_name);
 			}
 
 			validate_attribute_name(attribute);
@@ -196,7 +198,7 @@ function validate_element(node, context) {
 			for (const modifier of attribute.modifiers) {
 				if (!EventModifiers.includes(modifier)) {
 					const list = `${EventModifiers.slice(0, -1).join(', ')} or ${EventModifiers.at(-1)}`;
-					e.invalid_event_modifier(attribute, list);
+					e.event_handler_invalid_modifier(attribute, list);
 				}
 				if (modifier === 'passive') {
 					has_passive_modifier = true;
@@ -204,7 +206,11 @@ function validate_element(node, context) {
 					conflicting_passive_modifier = modifier;
 				}
 				if (has_passive_modifier && conflicting_passive_modifier) {
-					e.invalid_event_modifier_combination(attribute, 'passive', conflicting_passive_modifier);
+					e.event_handler_invalid_modifier_combination(
+						attribute,
+						'passive',
+						conflicting_passive_modifier
+					);
 				}
 			}
 		}
@@ -221,7 +227,7 @@ function validate_attribute_name(attribute) {
 		!attribute.name.startsWith('xlink:') &&
 		!attribute.name.startsWith('xml:')
 	) {
-		w.illegal_attribute_character(attribute);
+		w.attribute_illegal_colon(attribute);
 	}
 }
 
@@ -249,7 +255,7 @@ function validate_slot_attribute(context, attribute) {
 
 	if (owner) {
 		if (!is_text_attribute(attribute)) {
-			e.invalid_slot_attribute(attribute);
+			e.slot_attribute_invalid(attribute);
 		}
 
 		if (
@@ -258,13 +264,13 @@ function validate_slot_attribute(context, attribute) {
 			owner.type === 'SvelteSelf'
 		) {
 			if (owner !== context.path.at(-2)) {
-				e.invalid_slot_placement(attribute);
+				e.slot_attribute_invalid_placement(attribute);
 			}
 
 			const name = attribute.value[0].data;
 
 			if (context.state.component_slots.has(name)) {
-				e.duplicate_slot_name(attribute, name, owner.name);
+				e.slot_attribute_duplicate(attribute, name, owner.name);
 			}
 
 			context.state.component_slots.add(name);
@@ -281,12 +287,12 @@ function validate_slot_attribute(context, attribute) {
 						}
 					}
 
-					e.invalid_default_slot_content(node);
+					e.slot_default_duplicate(node);
 				}
 			}
 		}
 	} else {
-		e.invalid_slot_placement(attribute);
+		e.slot_attribute_invalid_placement(attribute);
 	}
 }
 
@@ -299,7 +305,7 @@ function validate_block_not_empty(node, context) {
 	// Assumption: If the block has zero elements, someone's in the middle of typing it out,
 	// so don't warn in that case because it would be distracting.
 	if (node.nodes.length === 1 && node.nodes[0].type === 'Text' && !node.nodes[0].raw.trim()) {
-		w.empty_block(node.nodes[0]);
+		w.block_empty(node.nodes[0]);
 	}
 }
 
@@ -317,7 +323,7 @@ const validation = {
 		const left = object(assignee);
 
 		if (left === null) {
-			e.invalid_binding_expression(node);
+			e.bind_invalid_expression(node);
 		}
 
 		const binding = context.state.scope.get(left.name);
@@ -337,19 +343,19 @@ const validation = {
 					binding.kind !== 'store_sub' &&
 					!binding.mutated)
 			) {
-				e.invalid_binding_value(node.expression);
+				e.bind_invalid_value(node.expression);
 			}
 
 			if (binding.kind === 'derived') {
-				e.invalid_binding(node.expression, 'derived state');
+				e.constant_binding(node.expression, 'derived state');
 			}
 
 			if (context.state.analysis.runes && binding.kind === 'each') {
-				e.invalid_each_assignment(node);
+				e.each_item_invalid_assignment(node);
 			}
 
 			if (binding.kind === 'snippet') {
-				e.invalid_snippet_assignment(node);
+				e.snippet_parameter_assignment(node);
 			}
 		}
 
@@ -360,7 +366,7 @@ const validation = {
 		}
 
 		if (binding?.kind === 'each' && binding.metadata?.inside_rest) {
-			w.invalid_rest_eachblock_binding(binding.node, binding.node.name);
+			w.bind_invalid_each_rest(binding.node, binding.node.name);
 		}
 
 		const parent = context.path.at(-1);
@@ -373,7 +379,7 @@ const validation = {
 			parent?.type === 'SvelteBody'
 		) {
 			if (context.state.options.namespace === 'foreign' && node.name !== 'this') {
-				e.bind_invalid(node, node.name, 'Foreign elements only support `bind:this`');
+				e.bind_invalid_name(node, node.name, 'Foreign elements only support `bind:this`');
 			}
 
 			if (node.name in binding_properties) {
@@ -392,7 +398,7 @@ const validation = {
 					);
 					if (type && !is_text_attribute(type)) {
 						if (node.name !== 'value' || type.value === true) {
-							e.invalid_type_attribute(type);
+							e.attribute_invalid_type(type);
 						}
 						return; // bind:value can handle dynamic `type` attributes
 					}
@@ -415,7 +421,7 @@ const validation = {
 							a.value !== true
 					);
 					if (multiple) {
-						e.invalid_multiple_attribute(multiple);
+						e.attribute_invalid_multiple(multiple);
 					}
 				}
 
@@ -432,9 +438,9 @@ const validation = {
 						parent.attributes.find((a) => a.type === 'Attribute' && a.name === 'contenteditable')
 					);
 					if (!contenteditable) {
-						e.missing_contenteditable_attribute(node);
+						e.attribute_contenteditable_missing(node);
 					} else if (!is_text_attribute(contenteditable) && contenteditable.value !== true) {
-						e.dynamic_contenteditable_attribute(contenteditable);
+						e.attribute_contenteditable_dynamic(contenteditable);
 					}
 				}
 			} else {
@@ -442,15 +448,15 @@ const validation = {
 				if (match) {
 					const property = binding_properties[match];
 					if (!property.valid_elements || property.valid_elements.includes(parent.name)) {
-						e.bind_invalid(node, node.name, `Did you mean '${match}'?`);
+						e.bind_invalid_name(node, node.name, `Did you mean '${match}'?`);
 					}
 				}
-				e.bind_invalid(node, node.name);
+				e.bind_invalid_name(node, node.name);
 			}
 		}
 	},
 	ExportDefaultDeclaration(node) {
-		e.default_export(node);
+		e.module_illegal_default_export(node);
 	},
 	ConstTag(node, context) {
 		const parent = context.path.at(-1);
@@ -467,7 +473,7 @@ const validation = {
 				((grand_parent?.type !== 'RegularElement' && grand_parent?.type !== 'SvelteElement') ||
 					!grand_parent.attributes.some((a) => a.type === 'Attribute' && a.name === 'slot')))
 		) {
-			e.invalid_const_placement(node);
+			e.const_tag_invalid_placement(node);
 		}
 	},
 	ImportDeclaration(node, context) {
@@ -478,7 +484,7 @@ const validation = {
 						specifier.imported.name === 'beforeUpdate' ||
 						specifier.imported.name === 'afterUpdate'
 					) {
-						e.invalid_runes_mode_import(specifier, specifier.imported.name);
+						e.runes_mode_invalid_import(specifier, specifier.imported.name);
 					}
 				}
 			}
@@ -496,14 +502,14 @@ const validation = {
 				parent.type !== 'SvelteSelf' &&
 				parent.type !== 'SvelteFragment')
 		) {
-			e.invalid_let_directive_placement(node);
+			e.let_directive_invalid_placement(node);
 		}
 	},
 	RegularElement(node, context) {
 		if (node.name === 'textarea' && node.fragment.nodes.length > 0) {
 			for (const attribute of node.attributes) {
 				if (attribute.type === 'Attribute' && attribute.name === 'value') {
-					e.invalid_textarea_content(node);
+					e.textarea_invalid_content(node);
 				}
 			}
 		}
@@ -521,7 +527,7 @@ const validation = {
 
 		if (context.state.parent_element) {
 			if (!is_tag_valid_with_parent(node.name, context.state.parent_element)) {
-				e.invalid_node_placement(node, `<${node.name}>`, context.state.parent_element);
+				e.node_invalid_placement(node, `<${node.name}>`, context.state.parent_element);
 			}
 		}
 
@@ -533,7 +539,7 @@ const validation = {
 					parent.name === node.name &&
 					interactive_elements.has(parent.name)
 				) {
-					e.invalid_node_placement(node, `<${node.name}>`, parent.name);
+					e.node_invalid_placement(node, `<${node.name}>`, parent.name);
 				}
 			}
 		}
@@ -542,7 +548,7 @@ const validation = {
 			const path = context.path;
 			for (let parent of path) {
 				if (parent.type === 'RegularElement' && parent.name === 'p') {
-					e.invalid_node_placement(node, `<${node.name}>`, parent.name);
+					e.node_invalid_placement(node, `<${node.name}>`, parent.name);
 				}
 			}
 		}
@@ -553,7 +559,7 @@ const validation = {
 			!VoidElements.includes(node.name) &&
 			!SVGElements.includes(node.name)
 		) {
-			w.invalid_self_closing_tag(node, node.name);
+			w.element_invalid_self_closing_tag(node, node.name);
 		}
 
 		context.next({
@@ -567,7 +573,7 @@ const validation = {
 		const raw_args = unwrap_optional(node.expression).arguments;
 		for (const arg of raw_args) {
 			if (arg.type === 'SpreadElement') {
-				e.invalid_render_spread_argument(arg);
+				e.render_tag_invalid_spread_argument(arg);
 			}
 		}
 
@@ -577,7 +583,7 @@ const validation = {
 			callee.property.type === 'Identifier' &&
 			['bind', 'apply', 'call'].includes(callee.property.name)
 		) {
-			e.invalid_render_call(node);
+			e.render_tag_invalid_call_expression(node);
 		}
 
 		const is_inside_textarea = context.path.find((n) => {
@@ -589,7 +595,7 @@ const validation = {
 			);
 		});
 		if (is_inside_textarea) {
-			e.invalid_tag_placement(
+			e.tag_invalid_placement(
 				node,
 				'inside <textarea> or <svelte:element this="textarea">',
 				'render'
@@ -630,19 +636,19 @@ const validation = {
 					(node) => node.type !== 'SnippetBlock' && (node.type !== 'Text' || node.data.trim())
 				)
 			) {
-				e.conflicting_children_snippet(node);
+				e.snippet_conflict(node);
 			}
 		}
 	},
 	StyleDirective(node) {
 		if (node.modifiers.length > 1 || (node.modifiers.length && node.modifiers[0] !== 'important')) {
-			e.invalid_style_directive_modifier(node);
+			e.style_directive_invalid_modifier(node);
 		}
 	},
 	SvelteHead(node) {
 		const attribute = node.attributes[0];
 		if (attribute) {
-			e.illegal_svelte_head_attribute(attribute);
+			e.svelte_head_illegal_attribute(attribute);
 		}
 	},
 	SvelteElement(node, context) {
@@ -655,7 +661,7 @@ const validation = {
 	SvelteFragment(node, context) {
 		const parent = context.path.at(-2);
 		if (parent?.type !== 'Component' && parent?.type !== 'SvelteComponent') {
-			e.invalid_svelte_fragment_placement(node);
+			e.svelte_fragment_invalid_placement(node);
 		}
 
 		for (const attribute of node.attributes) {
@@ -664,7 +670,7 @@ const validation = {
 					validate_slot_attribute(context, attribute);
 				}
 			} else if (attribute.type !== 'LetDirective') {
-				e.invalid_svelte_fragment_attribute(attribute);
+				e.svelte_fragment_invalid_attribute(attribute);
 			}
 		}
 	},
@@ -673,15 +679,15 @@ const validation = {
 			if (attribute.type === 'Attribute') {
 				if (attribute.name === 'name') {
 					if (!is_text_attribute(attribute)) {
-						e.invalid_slot_name(attribute);
+						e.slot_element_invalid_name(attribute);
 					}
 					const slot_name = attribute.value[0].data;
 					if (slot_name === 'default') {
-						e.invalid_slot_name_default(attribute);
+						e.slot_element_invalid_name_default(attribute);
 					}
 				}
 			} else if (attribute.type !== 'SpreadAttribute' && attribute.type !== 'LetDirective') {
-				e.invalid_slot_element_attribute(attribute);
+				e.slot_element_invalid_attribute(attribute);
 			}
 		}
 	},
@@ -692,19 +698,19 @@ const validation = {
 		if (!node.parent) return;
 		if (context.state.parent_element && regex_not_whitespace.test(node.data)) {
 			if (!is_tag_valid_with_parent('#text', context.state.parent_element)) {
-				e.invalid_node_placement(node, 'Text node', context.state.parent_element);
+				e.node_invalid_placement(node, 'Text node', context.state.parent_element);
 			}
 		}
 	},
 	TitleElement(node) {
 		const attribute = node.attributes[0];
 		if (attribute) {
-			e.illegal_title_attribute(attribute);
+			e.title_illegal_attribute(attribute);
 		}
 
 		const child = node.fragment.nodes.find((n) => n.type !== 'Text' && n.type !== 'ExpressionTag');
 		if (child) {
-			e.invalid_title_content(child);
+			e.title_invalid_content(child);
 		}
 	},
 	UpdateExpression(node, context) {
@@ -714,7 +720,7 @@ const validation = {
 		if (!node.parent) return;
 		if (context.state.parent_element) {
 			if (!is_tag_valid_with_parent('#text', context.state.parent_element)) {
-				e.invalid_node_placement(node, '{expression}', context.state.parent_element);
+				e.node_invalid_placement(node, '{expression}', context.state.parent_element);
 			}
 		}
 	}
@@ -735,7 +741,7 @@ export const validation_legacy = merge(validation, a11y_validators, {
 		}
 
 		if (state.scope.get(callee.name)?.kind !== 'store_sub') {
-			e.invalid_rune_usage(node.init, callee.name);
+			e.rune_invalid_usage(node.init, callee.name);
 		}
 	},
 	AssignmentExpression(node, { state, path }) {
@@ -749,7 +755,7 @@ export const validation_legacy = merge(validation, a11y_validators, {
 			(state.ast_type !== 'instance' ||
 				/** @type {import('#compiler').SvelteNode} */ (path.at(-1)).type !== 'Program')
 		) {
-			w.no_reactive_declaration(node);
+			w.reactive_declaration_invalid_placement(node);
 		}
 	},
 	UpdateExpression(node, { state }) {
@@ -768,11 +774,11 @@ function validate_export(node, scope, name) {
 	if (!binding) return;
 
 	if (binding.kind === 'derived') {
-		e.invalid_derived_export(node);
+		e.derived_invalid_export(node);
 	}
 
 	if ((binding.kind === 'state' || binding.kind === 'frozen_state') && binding.reassigned) {
-		e.invalid_state_export(node);
+		e.state_invalid_export(node);
 	}
 }
 
@@ -790,7 +796,7 @@ function validate_call_expression(node, scope, path) {
 
 	if (rune === '$props') {
 		if (parent.type === 'VariableDeclarator') return;
-		e.invalid_props_location(node);
+		e.props_invalid_placement(node);
 	}
 
 	if (rune === '$bindable') {
@@ -803,7 +809,7 @@ function validate_call_expression(node, scope, path) {
 				return;
 			}
 		}
-		e.invalid_bindable_location(node);
+		e.bindable_invalid_location(node);
 	}
 
 	if (
@@ -814,46 +820,46 @@ function validate_call_expression(node, scope, path) {
 	) {
 		if (parent.type === 'VariableDeclarator') return;
 		if (parent.type === 'PropertyDefinition' && !parent.static && !parent.computed) return;
-		e.invalid_state_location(node, rune);
+		e.state_invalid_placement(node, rune);
 	}
 
 	if (rune === '$effect' || rune === '$effect.pre') {
 		if (parent.type !== 'ExpressionStatement') {
-			e.invalid_effect_location(node);
+			e.effect_invalid_placement(node);
 		}
 
 		if (node.arguments.length !== 1) {
-			e.invalid_rune_args_length(node, rune, 'exactly one argument');
+			e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
 		}
 	}
 
 	if (rune === '$effect.active') {
 		if (node.arguments.length !== 0) {
-			e.invalid_rune_args(node, rune);
+			e.rune_invalid_arguments(node, rune);
 		}
 	}
 
 	if (rune === '$effect.root') {
 		if (node.arguments.length !== 1) {
-			e.invalid_rune_args_length(node, rune, 'exactly one argument');
+			e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
 		}
 	}
 
 	if (rune === '$inspect') {
 		if (node.arguments.length < 1) {
-			e.invalid_rune_args_length(node, rune, 'one or more arguments');
+			e.rune_invalid_arguments_length(node, rune, 'one or more arguments');
 		}
 	}
 
 	if (rune === '$inspect().with') {
 		if (node.arguments.length !== 1) {
-			e.invalid_rune_args_length(node, rune, 'exactly one argument');
+			e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
 		}
 	}
 
 	if (rune === '$state.snapshot') {
 		if (node.arguments.length !== 1) {
-			e.invalid_rune_args_length(node, rune, 'exactly one argument');
+			e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
 		}
 	}
 }
@@ -869,7 +875,7 @@ function ensure_no_module_import_conflict(node, state) {
 			state.scope === state.analysis.instance.scope &&
 			state.analysis.module.scope.get(id.name)?.declaration_kind === 'import'
 		) {
-			e.illegal_variable_declaration(node.id);
+			e.declaration_duplicate_module_import(node.id);
 		}
 	}
 }
@@ -895,7 +901,7 @@ export const validation_runes_js = {
 	},
 	CallExpression(node, { state, path }) {
 		if (get_rune(node, state.scope) === '$host') {
-			e.invalid_host_location(node);
+			e.host_invalid_placement(node);
 		}
 		validate_call_expression(node, state.scope, path);
 	},
@@ -908,13 +914,13 @@ export const validation_runes_js = {
 		const args = /** @type {import('estree').CallExpression} */ (init).arguments;
 
 		if ((rune === '$derived' || rune === '$derived.by') && args.length !== 1) {
-			e.invalid_rune_args_length(node, rune, 'exactly one argument');
+			e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
 		} else if (rune === '$state' && args.length > 1) {
-			e.invalid_rune_args_length(node, rune, 'zero or one arguments');
+			e.rune_invalid_arguments_length(node, rune, 'zero or one arguments');
 		} else if (rune === '$props') {
-			e.invalid_props_location(node);
+			e.props_invalid_placement(node);
 		} else if (rune === '$bindable') {
-			e.invalid_bindable_location(node);
+			e.bindable_invalid_location(node);
 		}
 	},
 	AssignmentExpression(node, { state }) {
@@ -952,12 +958,12 @@ export const validation_runes_js = {
 		const allowed_depth = context.state.ast_type === 'module' ? 0 : 1;
 
 		if (context.state.scope.function_depth > allowed_depth) {
-			w.avoid_nested_class(node);
+			w.perf_avoid_nested_class(node);
 		}
 	},
 	NewExpression(node, context) {
 		if (node.callee.type === 'ClassExpression' && context.state.scope.function_depth > 0) {
-			w.avoid_inline_class(node);
+			w.perf_avoid_inline_class(node);
 		}
 	}
 };
@@ -998,9 +1004,9 @@ function validate_no_const_assignment(node, argument, scope, is_binding) {
 			const thing = 'constant';
 
 			if (is_binding) {
-				e.invalid_binding(node, thing);
+				e.constant_binding(node, thing);
 			} else {
-				e.invalid_assignment(node, thing);
+				e.constant_assignment(node, thing);
 			}
 		}
 	}
@@ -1019,16 +1025,16 @@ function validate_assignment(node, argument, state) {
 
 		if (state.analysis.runes) {
 			if (binding?.kind === 'derived') {
-				e.invalid_assignment(node, 'derived state');
+				e.constant_assignment(node, 'derived state');
 			}
 
 			if (binding?.kind === 'each') {
-				e.invalid_each_assignment(node);
+				e.each_item_invalid_assignment(node);
 			}
 		}
 
 		if (binding?.kind === 'snippet') {
-			e.invalid_snippet_assignment(node);
+			e.snippet_parameter_assignment(node);
 		}
 	}
 
@@ -1044,15 +1050,46 @@ function validate_assignment(node, argument, state) {
 
 	if (object.type === 'ThisExpression' && property?.type === 'PrivateIdentifier') {
 		if (state.private_derived_state.includes(property.name)) {
-			e.invalid_assignment(node, 'derived state');
+			e.constant_assignment(node, 'derived state');
 		}
 	}
 }
 
 export const validation_runes = merge(validation, a11y_validators, {
+	Identifier(node, { path, state }) {
+		let i = path.length;
+		let parent = /** @type {import('estree').Expression} */ (path[--i]);
+
+		if (
+			Runes.includes(/** @type {Runes[number]} */ (node.name)) &&
+			is_reference(node, parent) &&
+			state.scope.get(node.name) === null &&
+			state.scope.get(node.name.slice(1)) === null
+		) {
+			/** @type {import('estree').Expression} */
+			let current = node;
+			let name = node.name;
+
+			while (parent.type === 'MemberExpression') {
+				if (parent.computed) e.rune_invalid_computed_property(parent);
+				name += `.${/** @type {import('estree').Identifier} */ (parent.property).name}`;
+
+				current = parent;
+				parent = /** @type {import('estree').Expression} */ (path[--i]);
+
+				if (!Runes.includes(/** @type {Runes[number]} */ (name))) {
+					e.rune_invalid_name(parent, name);
+				}
+			}
+
+			if (parent.type !== 'CallExpression') {
+				e.rune_missing_parentheses(current);
+			}
+		}
+	},
 	LabeledStatement(node, { path }) {
 		if (node.label.name !== '$' || path.at(-1)?.type !== 'Program') return;
-		e.invalid_legacy_reactive_statement(node);
+		e.legacy_reactive_statement_invalid(node);
 	},
 	ExportNamedDeclaration(node, { state, next }) {
 		if (state.ast_type === 'module') {
@@ -1070,7 +1107,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 			if (node.declaration?.type !== 'VariableDeclaration') return;
 			if (node.declaration.kind !== 'let') return;
 			if (state.analysis.instance.scope !== state.scope) return;
-			e.invalid_legacy_export(node);
+			e.legacy_export_invalid(node);
 		}
 	},
 	ExportSpecifier(node, { state }) {
@@ -1081,12 +1118,12 @@ export const validation_runes = merge(validation, a11y_validators, {
 	CallExpression(node, { state, path }) {
 		const rune = get_rune(node, state.scope);
 		if (rune === '$bindable' && node.arguments.length > 1) {
-			e.invalid_rune_args_length(node, '$bindable', 'zero or one arguments');
+			e.rune_invalid_arguments_length(node, '$bindable', 'zero or one arguments');
 		} else if (rune === '$host') {
 			if (node.arguments.length > 0) {
-				e.invalid_rune_args(node, '$host');
+				e.rune_invalid_arguments(node, '$host');
 			} else if (state.ast_type === 'module' || !state.analysis.custom_element) {
-				e.invalid_host_location(node);
+				e.host_invalid_placement(node);
 			}
 		}
 
@@ -1098,7 +1135,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 			context.type === 'Identifier' &&
 			(context.name === '$state' || context.name === '$derived')
 		) {
-			e.invalid_state_location(node, context.name);
+			e.state_invalid_placement(node, context.name);
 		}
 		next({ ...state });
 	},
@@ -1108,50 +1145,45 @@ export const validation_runes = merge(validation, a11y_validators, {
 		const init = node.init;
 		const rune = get_rune(init, state.scope);
 
-		if (rune === null) {
-			if (init?.type === 'Identifier' && init.name === '$props' && !state.scope.get('props')) {
-				w.invalid_props_declaration(node);
-			}
-			return;
-		}
+		if (rune === null) return;
 
 		const args = /** @type {import('estree').CallExpression} */ (init).arguments;
 
 		// TODO some of this is duplicated with above, seems off
 		if ((rune === '$derived' || rune === '$derived.by') && args.length !== 1) {
-			e.invalid_rune_args_length(node, rune, 'exactly one argument');
+			e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
 		} else if (rune === '$state' && args.length > 1) {
-			e.invalid_rune_args_length(node, rune, 'zero or one arguments');
+			e.rune_invalid_arguments_length(node, rune, 'zero or one arguments');
 		} else if (rune === '$props') {
 			if (state.has_props_rune) {
-				e.duplicate_props_rune(node);
+				e.props_duplicate(node);
 			}
 
 			state.has_props_rune = true;
 
 			if (args.length > 0) {
-				e.invalid_rune_args(node, rune);
+				e.rune_invalid_arguments(node, rune);
 			}
 
 			if (node.id.type !== 'ObjectPattern') {
-				e.invalid_props_id(node);
+				e.props_invalid_identifier(node);
 			}
 
 			if (state.scope !== state.analysis.instance.scope) {
-				e.invalid_props_location(node);
+				e.props_invalid_placement(node);
 			}
 
 			for (const property of node.id.properties) {
 				if (property.type === 'Property') {
 					if (property.computed) {
-						e.invalid_props_pattern(property);
+						e.props_invalid_pattern(property);
 					}
 
 					const value =
 						property.value.type === 'AssignmentPattern' ? property.value.left : property.value;
 
 					if (value.type !== 'Identifier') {
-						e.invalid_props_pattern(property);
+						e.props_invalid_pattern(property);
 					}
 				}
 			}
@@ -1167,25 +1199,16 @@ export const validation_runes = merge(validation, a11y_validators, {
 			}
 		}
 	},
-	AssignmentPattern(node, { state }) {
-		if (
-			node.right.type === 'Identifier' &&
-			node.right.name === '$bindable' &&
-			!state.scope.get('bindable')
-		) {
-			w.invalid_bindable_declaration(node);
-		}
-	},
 	SlotElement(node, { state }) {
 		if (!state.analysis.custom_element) {
-			w.deprecated_slot_element(node);
+			w.slot_element_deprecated(node);
 		}
 	},
 	OnDirective(node, { path }) {
 		const parent_type = path.at(-1)?.type;
 		// Don't warn on component events; these might not be under the author's control so the warning would be unactionable
 		if (parent_type === 'RegularElement' || parent_type === 'SvelteElement') {
-			w.deprecated_event_handler(node, node.name);
+			w.event_directive_deprecated(node, node.name);
 		}
 	},
 	// TODO this is a code smell. need to refactor this stuff
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index d815ff88fd..95161fd6e4 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -70,7 +70,7 @@ export class Scope {
 	 */
 	declare(node, kind, declaration_kind, initial = null) {
 		if (node.name === '$') {
-			e.invalid_dollar_binding(node);
+			e.dollar_binding_invalid(node);
 		}
 
 		if (
@@ -80,7 +80,7 @@ export class Scope {
 			declaration_kind !== 'rest_param' &&
 			this.function_depth <= 1
 		) {
-			e.invalid_dollar_prefix(node);
+			e.dollar_prefix_invalid(node);
 		}
 
 		if (this.parent) {
@@ -95,7 +95,7 @@ export class Scope {
 
 		if (this.declarations.has(node.name)) {
 			// This also errors on var/function types, but that's arguably a good thing
-			e.duplicate_declaration(node, node.name);
+			e.declaration_duplicate(node, node.name);
 		}
 
 		/** @type {import('#compiler').Binding} */
@@ -767,7 +767,6 @@ export function get_rune(node, scope) {
 
 	joined = n.name + joined;
 
-	if (joined === '$derived.call') e.invalid_derived_call(node);
 	if (!Runes.includes(/** @type {any} */ (joined))) return null;
 
 	const binding = scope.get(n.name);
diff --git a/packages/svelte/src/compiler/validate-options.js b/packages/svelte/src/compiler/validate-options.js
index 4d3880c52c..e58b5deff3 100644
--- a/packages/svelte/src/compiler/validate-options.js
+++ b/packages/svelte/src/compiler/validate-options.js
@@ -133,7 +133,7 @@ export const validate_component_options =
 function removed(msg) {
 	return (input) => {
 		if (input !== undefined) {
-			e.removed_compiler_option(null, msg);
+			e.options_removed(null, msg);
 		}
 		return /** @type {any} */ (undefined);
 	};
@@ -191,10 +191,7 @@ function object(children, allow_unknown = false) {
 				if (allow_unknown) {
 					output[key] = input[key];
 				} else {
-					e.invalid_compiler_option(
-						null,
-						`Unexpected option ${keypath ? `${keypath}.${key}` : key}`
-					);
+					e.options_unrecognised(null, `${keypath ? `${keypath}.${key}` : key}`);
 				}
 			}
 		}
@@ -297,5 +294,5 @@ function fun(fallback) {
 
 /** @param {string} msg */
 function throw_error(msg) {
-	e.invalid_compiler_option(null, msg);
+	e.options_invalid_value(null, msg);
 }
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index 1dbfcf9705..6d871bf5c7 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -41,96 +41,96 @@ function w(node, code, message) {
 }
 
 /**
- * <%name%> should not have aria-* attributes
+ * Avoid using accesskey
  * @param {null | NodeLike} node
- * @param {string} name
  */
-export function a11y_aria_attributes(node, name) {
-	w(node, "a11y_aria_attributes", `<${name}> should not have aria-* attributes`);
+export function a11y_accesskey(node) {
+	w(node, "a11y_accesskey", "Avoid using accesskey");
 }
 
 /**
- * Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
+ * An element with an aria-activedescendant attribute should have a tabindex value
  * @param {null | NodeLike} node
- * @param {string} attribute
- * @param {string | undefined | null} [suggestion]
  */
-export function a11y_unknown_aria_attribute(node, attribute, suggestion) {
-	w(node, "a11y_unknown_aria_attribute", suggestion ? `Unknown aria attribute 'aria-${attribute}'. Did you mean '${suggestion}'?` : `Unknown aria attribute 'aria-${attribute}'`);
+export function a11y_aria_activedescendant_has_tabindex(node) {
+	w(node, "a11y_aria_activedescendant_has_tabindex", "An element with an aria-activedescendant attribute should have a tabindex value");
 }
 
 /**
- * <%name%> element should not be hidden
+ * `<%name%>` should not have aria-* attributes
  * @param {null | NodeLike} node
  * @param {string} name
  */
-export function a11y_hidden(node, name) {
-	w(node, "a11y_hidden", `<${name}> element should not be hidden`);
+export function a11y_aria_attributes(node, name) {
+	w(node, "a11y_aria_attributes", `\`<${name}>\` should not have aria-* attributes`);
 }
 
 /**
- * The value of '%attribute%' must be either 'true' or 'false'
+ * '%value%' is an invalid value for 'autocomplete' on `<input type="%type%">`
  * @param {null | NodeLike} node
- * @param {string} attribute
+ * @param {string} value
+ * @param {string} type
  */
-export function a11y_incorrect_aria_attribute_type_boolean(node, attribute) {
-	w(node, "a11y_incorrect_aria_attribute_type_boolean", `The value of '${attribute}' must be either 'true' or 'false'`);
+export function a11y_autocomplete_valid(node, value, type) {
+	w(node, "a11y_autocomplete_valid", `'${value}' is an invalid value for 'autocomplete' on \`<input type="${type}">\``);
 }
 
 /**
- * The value of '%attribute%' must be an integer
+ * Avoid using autofocus
  * @param {null | NodeLike} node
- * @param {string} attribute
  */
-export function a11y_incorrect_aria_attribute_type_integer(node, attribute) {
-	w(node, "a11y_incorrect_aria_attribute_type_integer", `The value of '${attribute}' must be an integer`);
+export function a11y_autofocus(node) {
+	w(node, "a11y_autofocus", "Avoid using autofocus");
 }
 
 /**
- * The value of '%attribute%' must be a string that represents a DOM element ID
+ * Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type="button">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
  * @param {null | NodeLike} node
- * @param {string} attribute
  */
-export function a11y_incorrect_aria_attribute_type_id(node, attribute) {
-	w(node, "a11y_incorrect_aria_attribute_type_id", `The value of '${attribute}' must be a string that represents a DOM element ID`);
+export function a11y_click_events_have_key_events(node) {
+	w(node, "a11y_click_events_have_key_events", "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.");
 }
 
 /**
- * The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
+ * Avoid `<%name%>` elements
  * @param {null | NodeLike} node
- * @param {string} attribute
+ * @param {string} name
  */
-export function a11y_incorrect_aria_attribute_type_idlist(node, attribute) {
-	w(node, "a11y_incorrect_aria_attribute_type_idlist", `The value of '${attribute}' must be a space-separated list of strings that represent DOM element IDs`);
+export function a11y_distracting_elements(node, name) {
+	w(node, "a11y_distracting_elements", `Avoid \`<${name}>\` elements`);
 }
 
 /**
- * The value of '%attribute%' must be exactly one of true, false, or mixed
+ * `<figcaption>` must be first or last child of `<figure>`
  * @param {null | NodeLike} node
- * @param {string} attribute
  */
-export function a11y_incorrect_aria_attribute_type_tristate(node, attribute) {
-	w(node, "a11y_incorrect_aria_attribute_type_tristate", `The value of '${attribute}' must be exactly one of true, false, or mixed`);
+export function a11y_figcaption_index(node) {
+	w(node, "a11y_figcaption_index", "`<figcaption>` must be first or last child of `<figure>`");
 }
 
 /**
- * The value of '%attribute%' must be exactly one of %values%
+ * `<figcaption>` must be an immediate child of `<figure>`
  * @param {null | NodeLike} node
- * @param {string} attribute
- * @param {string} values
  */
-export function a11y_incorrect_aria_attribute_type_token(node, attribute, values) {
-	w(node, "a11y_incorrect_aria_attribute_type_token", `The value of '${attribute}' must be exactly one of ${values}`);
+export function a11y_figcaption_parent(node) {
+	w(node, "a11y_figcaption_parent", "`<figcaption>` must be an immediate child of `<figure>`");
 }
 
 /**
- * The value of '%attribute%' must be a space-separated list of one or more of %values%
+ * `<%name%>` element should not be hidden
  * @param {null | NodeLike} node
- * @param {string} attribute
- * @param {string} values
+ * @param {string} name
  */
-export function a11y_incorrect_aria_attribute_type_tokenlist(node, attribute, values) {
-	w(node, "a11y_incorrect_aria_attribute_type_tokenlist", `The value of '${attribute}' must be a space-separated list of one or more of ${values}`);
+export function a11y_hidden(node, name) {
+	w(node, "a11y_hidden", `\`<${name}>\` element should not be hidden`);
+}
+
+/**
+ * Screenreaders already announce `<img>` elements as an image.
+ * @param {null | NodeLike} node
+ */
+export function a11y_img_redundant_alt(node) {
+	w(node, "a11y_img_redundant_alt", "Screenreaders already announce `<img>` elements as an image.");
 }
 
 /**
@@ -144,58 +144,68 @@ export function a11y_incorrect_aria_attribute_type(node, attribute, type) {
 }
 
 /**
- * Elements with attribute aria-activedescendant should have tabindex value
+ * The value of '%attribute%' must be either 'true' or 'false'
  * @param {null | NodeLike} node
+ * @param {string} attribute
  */
-export function a11y_aria_activedescendant_has_tabindex(node) {
-	w(node, "a11y_aria_activedescendant_has_tabindex", "Elements with attribute aria-activedescendant should have tabindex value");
+export function a11y_incorrect_aria_attribute_type_boolean(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_boolean", `The value of '${attribute}' must be either 'true' or 'false'`);
 }
 
 /**
- * <%name%> should not have role attribute
+ * The value of '%attribute%' must be a string that represents a DOM element ID
  * @param {null | NodeLike} node
- * @param {string} name
+ * @param {string} attribute
  */
-export function a11y_misplaced_role(node, name) {
-	w(node, "a11y_misplaced_role", `<${name}> should not have role attribute`);
+export function a11y_incorrect_aria_attribute_type_id(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_id", `The value of '${attribute}' must be a string that represents a DOM element ID`);
 }
 
 /**
- * Abstract role '%role%' is forbidden
+ * The value of '%attribute%' must be a space-separated list of strings that represent DOM element IDs
  * @param {null | NodeLike} node
- * @param {string} role
+ * @param {string} attribute
  */
-export function a11y_no_abstract_role(node, role) {
-	w(node, "a11y_no_abstract_role", `Abstract role '${role}' is forbidden`);
+export function a11y_incorrect_aria_attribute_type_idlist(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_idlist", `The value of '${attribute}' must be a space-separated list of strings that represent DOM element IDs`);
 }
 
 /**
- * Unknown role '%role%'. Did you mean '%suggestion%'?
+ * The value of '%attribute%' must be an integer
  * @param {null | NodeLike} node
- * @param {string} role
- * @param {string | undefined | null} [suggestion]
+ * @param {string} attribute
  */
-export function a11y_unknown_role(node, role, suggestion) {
-	w(node, "a11y_unknown_role", suggestion ? `Unknown role '${role}'. Did you mean '${suggestion}'?` : `Unknown role '${role}'`);
+export function a11y_incorrect_aria_attribute_type_integer(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_integer", `The value of '${attribute}' must be an integer`);
 }
 
 /**
- * Redundant role '%role%'
+ * The value of '%attribute%' must be exactly one of %values%
  * @param {null | NodeLike} node
- * @param {string} role
+ * @param {string} attribute
+ * @param {string} values
  */
-export function a11y_no_redundant_roles(node, role) {
-	w(node, "a11y_no_redundant_roles", `Redundant role '${role}'`);
+export function a11y_incorrect_aria_attribute_type_token(node, attribute, values) {
+	w(node, "a11y_incorrect_aria_attribute_type_token", `The value of '${attribute}' must be exactly one of ${values}`);
 }
 
 /**
- * Elements with the ARIA role "%role%" must have the following attributes defined: %props%
+ * The value of '%attribute%' must be a space-separated list of one or more of %values%
  * @param {null | NodeLike} node
- * @param {string} role
- * @param {string} props
+ * @param {string} attribute
+ * @param {string} values
  */
-export function a11y_role_has_required_aria_props(node, role, props) {
-	w(node, "a11y_role_has_required_aria_props", `Elements with the ARIA role "${role}" must have the following attributes defined: ${props}`);
+export function a11y_incorrect_aria_attribute_type_tokenlist(node, attribute, values) {
+	w(node, "a11y_incorrect_aria_attribute_type_tokenlist", `The value of '${attribute}' must be a space-separated list of one or more of ${values}`);
+}
+
+/**
+ * The value of '%attribute%' must be exactly one of true, false, or mixed
+ * @param {null | NodeLike} node
+ * @param {string} attribute
+ */
+export function a11y_incorrect_aria_attribute_type_tristate(node, attribute) {
+	w(node, "a11y_incorrect_aria_attribute_type_tristate", `The value of '${attribute}' must be exactly one of true, false, or mixed`);
 }
 
 /**
@@ -208,287 +218,264 @@ export function a11y_interactive_supports_focus(node, role) {
 }
 
 /**
- * <%element%> cannot have role '%role%'
+ * '%href_value%' is not a valid %href_attribute% attribute
  * @param {null | NodeLike} node
- * @param {string} element
- * @param {string} role
+ * @param {string} href_value
+ * @param {string} href_attribute
  */
-export function a11y_no_interactive_element_to_noninteractive_role(node, element, role) {
-	w(node, "a11y_no_interactive_element_to_noninteractive_role", `<${element}> cannot have role '${role}'`);
+export function a11y_invalid_attribute(node, href_value, href_attribute) {
+	w(node, "a11y_invalid_attribute", `'${href_value}' is not a valid ${href_attribute} attribute`);
 }
 
 /**
- * Non-interactive element <%element%> cannot have interactive role '%role%'
+ * A form label must be associated with a control.
  * @param {null | NodeLike} node
- * @param {string} element
- * @param {string} role
  */
-export function a11y_no_noninteractive_element_to_interactive_role(node, element, role) {
-	w(node, "a11y_no_noninteractive_element_to_interactive_role", `Non-interactive element <${element}> cannot have interactive role '${role}'`);
+export function a11y_label_has_associated_control(node) {
+	w(node, "a11y_label_has_associated_control", "A form label must be associated with a control.");
 }
 
 /**
- * Avoid using accesskey
+ * `<video>` elements must have a `<track kind="captions">`
  * @param {null | NodeLike} node
  */
-export function a11y_accesskey(node) {
-	w(node, "a11y_accesskey", "Avoid using accesskey");
+export function a11y_media_has_caption(node) {
+	w(node, "a11y_media_has_caption", "`<video>` elements must have a `<track kind=\"captions\">`");
 }
 
 /**
- * Avoid using autofocus
+ * `<%name%>` should not have role attribute
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function a11y_autofocus(node) {
-	w(node, "a11y_autofocus", "Avoid using autofocus");
+export function a11y_misplaced_role(node, name) {
+	w(node, "a11y_misplaced_role", `\`<${name}>\` should not have role attribute`);
 }
 
 /**
- * The scope attribute should only be used with <th> elements
+ * The scope attribute should only be used with `<th>` elements
  * @param {null | NodeLike} node
  */
 export function a11y_misplaced_scope(node) {
-	w(node, "a11y_misplaced_scope", "The scope attribute should only be used with <th> elements");
+	w(node, "a11y_misplaced_scope", "The scope attribute should only be used with `<th>` elements");
 }
 
 /**
- * Avoid tabindex values above zero
+ * `<%name%>` element should have %article% %sequence% attribute
  * @param {null | NodeLike} node
+ * @param {string} name
+ * @param {string} article
+ * @param {string} sequence
  */
-export function a11y_positive_tabindex(node) {
-	w(node, "a11y_positive_tabindex", "Avoid tabindex values above zero");
+export function a11y_missing_attribute(node, name, article, sequence) {
+	w(node, "a11y_missing_attribute", `\`<${name}>\` element should have ${article} ${sequence} attribute`);
 }
 
 /**
- * Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type="button"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.
+ * `<%name%>` element should have child content
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function a11y_click_events_have_key_events(node) {
-	w(node, "a11y_click_events_have_key_events", "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.");
+export function a11y_missing_content(node, name) {
+	w(node, "a11y_missing_content", `\`<${name}>\` element should have child content`);
 }
 
 /**
- * noninteractive element cannot have nonnegative tabIndex value
+ * '%event%' event must be accompanied by '%accompanied_by%' event
  * @param {null | NodeLike} node
+ * @param {string} event
+ * @param {string} accompanied_by
  */
-export function a11y_no_noninteractive_tabindex(node) {
-	w(node, "a11y_no_noninteractive_tabindex", "noninteractive element cannot have nonnegative tabIndex value");
+export function a11y_mouse_events_have_key_events(node, event, accompanied_by) {
+	w(node, "a11y_mouse_events_have_key_events", `'${event}' event must be accompanied by '${accompanied_by}' event`);
 }
 
 /**
- * The attribute '%attribute%' is not supported by the role '%role%'
+ * Abstract role '%role%' is forbidden
  * @param {null | NodeLike} node
- * @param {string} attribute
  * @param {string} role
  */
-export function a11y_role_supports_aria_props(node, attribute, role) {
-	w(node, "a11y_role_supports_aria_props", `The attribute '${attribute}' is not supported by the role '${role}'`);
+export function a11y_no_abstract_role(node, role) {
+	w(node, "a11y_no_abstract_role", `Abstract role '${role}' is forbidden`);
 }
 
 /**
- * The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element <%name%>
+ * `<%element%>` cannot have role '%role%'
  * @param {null | NodeLike} node
- * @param {string} attribute
+ * @param {string} element
  * @param {string} role
- * @param {string} name
  */
-export function a11y_role_supports_aria_props_implicit(node, attribute, role, name) {
-	w(node, "a11y_role_supports_aria_props_implicit", `The attribute '${attribute}' is not supported by the role '${role}'. This role is implicit on the element <${name}>`);
+export function a11y_no_interactive_element_to_noninteractive_role(node, element, role) {
+	w(node, "a11y_no_interactive_element_to_noninteractive_role", `\`<${element}>\` cannot have role '${role}'`);
 }
 
 /**
- * Non-interactive element <%element%> should not be assigned mouse or keyboard event listeners.
+ * Non-interactive element `<%element%>` should not be assigned mouse or keyboard event listeners.
  * @param {null | NodeLike} node
  * @param {string} element
  */
 export function a11y_no_noninteractive_element_interactions(node, element) {
-	w(node, "a11y_no_noninteractive_element_interactions", `Non-interactive element <${element}> should not be assigned mouse or keyboard event listeners.`);
+	w(node, "a11y_no_noninteractive_element_interactions", `Non-interactive element \`<${element}>\` should not be assigned mouse or keyboard event listeners.`);
 }
 
 /**
- * <%element%> with a %handler% handler must have an ARIA role
+ * Non-interactive element `<%element%>` cannot have interactive role '%role%'
  * @param {null | NodeLike} node
  * @param {string} element
- * @param {string} handler
+ * @param {string} role
  */
-export function a11y_no_static_element_interactions(node, element, handler) {
-	w(node, "a11y_no_static_element_interactions", `<${element}> with a ${handler} handler must have an ARIA role`);
+export function a11y_no_noninteractive_element_to_interactive_role(node, element, role) {
+	w(node, "a11y_no_noninteractive_element_to_interactive_role", `Non-interactive element \`<${element}>\` cannot have interactive role '${role}'`);
 }
 
 /**
- * '%href_value%' is not a valid %href_attribute% attribute
+ * noninteractive element cannot have nonnegative tabIndex value
  * @param {null | NodeLike} node
- * @param {string} href_value
- * @param {string} href_attribute
  */
-export function a11y_invalid_attribute(node, href_value, href_attribute) {
-	w(node, "a11y_invalid_attribute", `'${href_value}' is not a valid ${href_attribute} attribute`);
+export function a11y_no_noninteractive_tabindex(node) {
+	w(node, "a11y_no_noninteractive_tabindex", "noninteractive element cannot have nonnegative tabIndex value");
 }
 
 /**
- * <%name%> element should have %article% %sequence% attribute
+ * Redundant role '%role%'
  * @param {null | NodeLike} node
- * @param {string} name
- * @param {string} article
- * @param {string} sequence
+ * @param {string} role
  */
-export function a11y_missing_attribute(node, name, article, sequence) {
-	w(node, "a11y_missing_attribute", `<${name}> element should have ${article} ${sequence} attribute`);
+export function a11y_no_redundant_roles(node, role) {
+	w(node, "a11y_no_redundant_roles", `Redundant role '${role}'`);
 }
 
 /**
- * The value '%value%' is not supported by the attribute 'autocomplete' on element <input type="%type%">
+ * `<%element%>` with a %handler% handler must have an ARIA role
  * @param {null | NodeLike} node
- * @param {string} value
- * @param {string} type
+ * @param {string} element
+ * @param {string} handler
  */
-export function a11y_autocomplete_valid(node, value, type) {
-	w(node, "a11y_autocomplete_valid", `The value '${value}' is not supported by the attribute 'autocomplete' on element <input type="${type}">`);
+export function a11y_no_static_element_interactions(node, element, handler) {
+	w(node, "a11y_no_static_element_interactions", `\`<${element}>\` with a ${handler} handler must have an ARIA role`);
 }
 
 /**
- * Screenreaders already announce <img> elements as an image.
+ * Avoid tabindex values above zero
  * @param {null | NodeLike} node
  */
-export function a11y_img_redundant_alt(node) {
-	w(node, "a11y_img_redundant_alt", "Screenreaders already announce <img> elements as an image.");
+export function a11y_positive_tabindex(node) {
+	w(node, "a11y_positive_tabindex", "Avoid tabindex values above zero");
 }
 
 /**
- * A form label must be associated with a control.
+ * Elements with the ARIA role "%role%" must have the following attributes defined: %props%
  * @param {null | NodeLike} node
+ * @param {string} role
+ * @param {string} props
  */
-export function a11y_label_has_associated_control(node) {
-	w(node, "a11y_label_has_associated_control", "A form label must be associated with a control.");
+export function a11y_role_has_required_aria_props(node, role, props) {
+	w(node, "a11y_role_has_required_aria_props", `Elements with the ARIA role "${role}" must have the following attributes defined: ${props}`);
 }
 
 /**
- * <video> elements must have a <track kind="captions">
+ * The attribute '%attribute%' is not supported by the role '%role%'
  * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} role
  */
-export function a11y_media_has_caption(node) {
-	w(node, "a11y_media_has_caption", "<video> elements must have a <track kind=\"captions\">");
+export function a11y_role_supports_aria_props(node, attribute, role) {
+	w(node, "a11y_role_supports_aria_props", `The attribute '${attribute}' is not supported by the role '${role}'`);
 }
 
 /**
- * Avoid <%name%> elements
+ * The attribute '%attribute%' is not supported by the role '%role%'. This role is implicit on the element `<%name%>`
  * @param {null | NodeLike} node
+ * @param {string} attribute
+ * @param {string} role
  * @param {string} name
  */
-export function a11y_distracting_elements(node, name) {
-	w(node, "a11y_distracting_elements", `Avoid <${name}> elements`);
-}
-
-/**
- * `<figcaption>` must be an immediate child of `<figure>`
- * @param {null | NodeLike} node
- */
-export function a11y_figcaption_parent(node) {
-	w(node, "a11y_figcaption_parent", "`<figcaption>` must be an immediate child of `<figure>`");
-}
-
-/**
- * `<figcaption>` must be first or last child of `<figure>`
- * @param {null | NodeLike} node
- */
-export function a11y_figcaption_index(node) {
-	w(node, "a11y_figcaption_index", "`<figcaption>` must be first or last child of `<figure>`");
+export function a11y_role_supports_aria_props_implicit(node, attribute, role, name) {
+	w(node, "a11y_role_supports_aria_props_implicit", `The attribute '${attribute}' is not supported by the role '${role}'. This role is implicit on the element \`<${name}>\``);
 }
 
 /**
- * '%event%' event must be accompanied by '%accompanied_by%' event
+ * Unknown aria attribute 'aria-%attribute%'. Did you mean '%suggestion%'?
  * @param {null | NodeLike} node
- * @param {string} event
- * @param {string} accompanied_by
+ * @param {string} attribute
+ * @param {string | undefined | null} [suggestion]
  */
-export function a11y_mouse_events_have_key_events(node, event, accompanied_by) {
-	w(node, "a11y_mouse_events_have_key_events", `'${event}' event must be accompanied by '${accompanied_by}' event`);
+export function a11y_unknown_aria_attribute(node, attribute, suggestion) {
+	w(node, "a11y_unknown_aria_attribute", suggestion ? `Unknown aria attribute 'aria-${attribute}'. Did you mean '${suggestion}'?` : `Unknown aria attribute 'aria-${attribute}'`);
 }
 
 /**
- * <%name%> element should have child content
+ * Unknown role '%role%'. Did you mean '%suggestion%'?
  * @param {null | NodeLike} node
- * @param {string} name
+ * @param {string} role
+ * @param {string | undefined | null} [suggestion]
  */
-export function a11y_missing_content(node, name) {
-	w(node, "a11y_missing_content", `<${name}> element should have child content`);
+export function a11y_unknown_role(node, role, suggestion) {
+	w(node, "a11y_unknown_role", suggestion ? `Unknown role '${role}'. Did you mean '${suggestion}'?` : `Unknown role '${role}'`);
 }
 
 /**
- * The "is" attribute is not supported cross-browser and should be avoided
+ * The `accessors` option has been deprecated. It will have no effect in runes mode
  * @param {null | NodeLike} node
  */
-export function avoid_is(node) {
-	w(node, "avoid_is", "The \"is\" attribute is not supported cross-browser and should be avoided");
+export function options_deprecated_accessors(node) {
+	w(node, "options_deprecated_accessors", "The `accessors` option has been deprecated. It will have no effect in runes mode");
 }
 
 /**
- * You are referencing globalThis.%name%. Did you forget to declare a variable with that name?
+ * The `immutable` option has been deprecated. It will have no effect in runes mode
  * @param {null | NodeLike} node
- * @param {string} name
  */
-export function global_event_reference(node, name) {
-	w(node, "global_event_reference", `You are referencing globalThis.${name}. Did you forget to declare a variable with that name?`);
+export function options_deprecated_immutable(node) {
+	w(node, "options_deprecated_immutable", "The `immutable` option has been deprecated. It will have no effect in runes mode");
 }
 
 /**
- * Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
+ * The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?
  * @param {null | NodeLike} node
  */
-export function illegal_attribute_character(node) {
-	w(node, "illegal_attribute_character", "Attributes should not contain ':' characters to prevent ambiguity with Svelte directives");
-}
-
-/**
- * '%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
- * @param {null | NodeLike} node
- * @param {string} wrong
- * @param {string} right
- */
-export function invalid_html_attribute(node, wrong, right) {
-	w(node, "invalid_html_attribute", `'${wrong}' is not a valid HTML attribute. Did you mean '${right}'?`);
+export function options_missing_custom_element(node) {
+	w(node, "options_missing_custom_element", "The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?");
 }
 
 /**
- * Empty block
+ * The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them
  * @param {null | NodeLike} node
  */
-export function empty_block(node) {
-	w(node, "empty_block", "Empty block");
+export function options_removed_enable_sourcemap(node) {
+	w(node, "options_removed_enable_sourcemap", "The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them");
 }
 
 /**
- * <%name%> will be treated as an HTML element unless it begins with a capital letter
+ * The `hydratable` option has been removed. Svelte components are always hydratable now
  * @param {null | NodeLike} node
- * @param {string} name
  */
-export function component_name_lowercase(node, name) {
-	w(node, "component_name_lowercase", `<${name}> will be treated as an HTML element unless it begins with a capital letter`);
+export function options_removed_hydratable(node) {
+	w(node, "options_removed_hydratable", "The `hydratable` option has been removed. Svelte components are always hydratable now");
 }
 
 /**
- * Unused CSS selector "%name%"
+ * The `loopGuardTimeout` option has been removed
  * @param {null | NodeLike} node
- * @param {string} name
  */
-export function css_unused_selector(node, name) {
-	w(node, "css_unused_selector", `Unused CSS selector "${name}"`);
+export function options_removed_loop_guard_timeout(node) {
+	w(node, "options_removed_loop_guard_timeout", "The `loopGuardTimeout` option has been removed");
 }
 
 /**
- * Reactive declarations only exist at the top level of the instance script
+ * `generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
  * @param {null | NodeLike} node
  */
-export function no_reactive_declaration(node) {
-	w(node, "no_reactive_declaration", "Reactive declarations only exist at the top level of the instance script");
+export function options_renamed_ssr_dom(node) {
+	w(node, "options_renamed_ssr_dom", "`generate: \"dom\"` and `generate: \"ssr\"` options have been renamed to \"client\" and \"server\" respectively");
 }
 
 /**
- * All dependencies of the reactive declaration are declared in a module script and will not be reactive
+ * Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
  * @param {null | NodeLike} node
  */
-export function module_script_reactive_declaration(node) {
-	w(node, "module_script_reactive_declaration", "All dependencies of the reactive declaration are declared in a module script and will not be reactive");
+export function derived_iife(node) {
+	w(node, "derived_iife", "Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`");
 }
 
 /**
@@ -496,163 +483,160 @@ export function module_script_reactive_declaration(node) {
  * @param {null | NodeLike} node
  * @param {string} name
  */
-export function unused_export_let(node, name) {
-	w(node, "unused_export_let", `Component has unused export property '${name}'. If it is for external reference only, please consider using \`export const ${name}\``);
+export function export_let_unused(node, name) {
+	w(node, "export_let_unused", `Component has unused export property '${name}'. If it is for external reference only, please consider using \`export const ${name}\``);
 }
 
 /**
- * Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.
- * @param {null | NodeLike} node
- */
-export function deprecated_slot_element(node) {
-	w(node, "deprecated_slot_element", "Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.");
-}
-
-/**
- * Using on:%name% to listen to the %name% event is is deprecated. Use the event attribute on%name% instead.
+ * `%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
  * @param {null | NodeLike} node
  * @param {string} name
  */
-export function deprecated_event_handler(node, name) {
-	w(node, "deprecated_event_handler", `Using on:${name} to listen to the ${name} event is is deprecated. Use the event attribute on${name} instead.`);
+export function non_reactive_update(node, name) {
+	w(node, "non_reactive_update", `\`${name}\` is updated, but is not declared with \`$state(...)\`. Changing its value will not correctly trigger updates`);
 }
 
 /**
- * Self-closing HTML tags for non-void elements are ambiguous — use <%name% ...></%name%> rather than <%name% ... />
+ * Avoid 'new class' — instead, declare the class at the top level scope
  * @param {null | NodeLike} node
- * @param {string} name
  */
-export function invalid_self_closing_tag(node, name) {
-	w(node, "invalid_self_closing_tag", `Self-closing HTML tags for non-void elements are ambiguous — use <${name} ...></${name}> rather than <${name} ... />`);
+export function perf_avoid_inline_class(node) {
+	w(node, "perf_avoid_inline_class", "Avoid 'new class' — instead, declare the class at the top level scope");
 }
 
 /**
- * The `accessors` option has been deprecated. It will have no effect in runes mode
+ * Avoid declaring classes below the top level scope
  * @param {null | NodeLike} node
  */
-export function options_deprecated_accessors(node) {
-	w(node, "options_deprecated_accessors", "The `accessors` option has been deprecated. It will have no effect in runes mode");
+export function perf_avoid_nested_class(node) {
+	w(node, "perf_avoid_nested_class", "Avoid declaring classes below the top level scope");
 }
 
 /**
- * The `immutable` option has been deprecated. It will have no effect in runes mode
+ * Reactive declarations only exist at the top level of the instance script
  * @param {null | NodeLike} node
  */
-export function options_deprecated_immutable(node) {
-	w(node, "options_deprecated_immutable", "The `immutable` option has been deprecated. It will have no effect in runes mode");
+export function reactive_declaration_invalid_placement(node) {
+	w(node, "reactive_declaration_invalid_placement", "Reactive declarations only exist at the top level of the instance script");
 }
 
 /**
- * The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?
+ * All dependencies of the reactive declaration are declared in a module script and will not be reactive
  * @param {null | NodeLike} node
  */
-export function options_missing_custom_element(node) {
-	w(node, "options_missing_custom_element", "The `customElement` option is used when generating a custom element. Did you forget the `customElement: true` compile option?");
+export function reactive_declaration_module_script(node) {
+	w(node, "reactive_declaration_module_script", "All dependencies of the reactive declaration are declared in a module script and will not be reactive");
 }
 
 /**
- * `generate: "dom"` and `generate: "ssr"` options have been renamed to "client" and "server" respectively
+ * State referenced in its own scope will never update. Did you mean to reference it inside a closure?
  * @param {null | NodeLike} node
  */
-export function options_renamed_ssr_dom(node) {
-	w(node, "options_renamed_ssr_dom", "`generate: \"dom\"` and `generate: \"ssr\"` options have been renamed to \"client\" and \"server\" respectively");
+export function state_referenced_locally(node) {
+	w(node, "state_referenced_locally", "State referenced in its own scope will never update. Did you mean to reference it inside a closure?");
 }
 
 /**
- * The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them
+ * It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function options_removed_enable_sourcemap(node) {
-	w(node, "options_removed_enable_sourcemap", "The `enableSourcemap` option has been removed. Source maps are always generated now, and tooling can choose to ignore them");
+export function store_rune_conflict(node, name) {
+	w(node, "store_rune_conflict", `It looks like you're using the \`$${name}\` rune, but there is a local binding called \`${name}\`. Referencing a local variable with a \`$\` prefix will create a store subscription. Please rename \`${name}\` to avoid the ambiguity`);
 }
 
 /**
- * The `hydratable` option has been removed. Svelte components are always hydratable now
+ * Unused CSS selector "%name%"
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function options_removed_hydratable(node) {
-	w(node, "options_removed_hydratable", "The `hydratable` option has been removed. Svelte components are always hydratable now");
+export function css_unused_selector(node, name) {
+	w(node, "css_unused_selector", `Unused CSS selector "${name}"`);
 }
 
 /**
- * The `loopGuardTimeout` option has been removed
+ * The "is" attribute is not supported cross-browser and should be avoided
  * @param {null | NodeLike} node
  */
-export function options_removed_loop_guard_timeout(node) {
-	w(node, "options_removed_loop_guard_timeout", "The `loopGuardTimeout` option has been removed");
+export function attribute_avoid_is(node) {
+	w(node, "attribute_avoid_is", "The \"is\" attribute is not supported cross-browser and should be avoided");
 }
 
 /**
- * Avoid 'new class' — instead, declare the class at the top level scope
+ * You are referencing `globalThis.%name%`. Did you forget to declare a variable with that name?
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function avoid_inline_class(node) {
-	w(node, "avoid_inline_class", "Avoid 'new class' — instead, declare the class at the top level scope");
+export function attribute_global_event_reference(node, name) {
+	w(node, "attribute_global_event_reference", `You are referencing \`globalThis.${name}\`. Did you forget to declare a variable with that name?`);
 }
 
 /**
- * Avoid declaring classes below the top level scope
+ * Attributes should not contain ':' characters to prevent ambiguity with Svelte directives
  * @param {null | NodeLike} node
  */
-export function avoid_nested_class(node) {
-	w(node, "avoid_nested_class", "Avoid declaring classes below the top level scope");
+export function attribute_illegal_colon(node) {
+	w(node, "attribute_illegal_colon", "Attributes should not contain ':' characters to prevent ambiguity with Svelte directives");
 }
 
 /**
- * It looks like you're using the `$%name%` rune, but there is a local binding called `%name%`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `%name%` to avoid the ambiguity
+ * '%wrong%' is not a valid HTML attribute. Did you mean '%right%'?
  * @param {null | NodeLike} node
- * @param {string} name
+ * @param {string} wrong
+ * @param {string} right
  */
-export function store_with_rune_name(node, name) {
-	w(node, "store_with_rune_name", `It looks like you're using the \`$${name}\` rune, but there is a local binding called \`${name}\`. Referencing a local variable with a \`$\` prefix will create a store subscription. Please rename \`${name}\` to avoid the ambiguity`);
+export function attribute_invalid_property_name(node, wrong, right) {
+	w(node, "attribute_invalid_property_name", `'${wrong}' is not a valid HTML attribute. Did you mean '${right}'?`);
 }
 
 /**
- * `%name%` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates
+ * The rest operator (...) will create a new object and binding '%name%' with the original object will not work
  * @param {null | NodeLike} node
  * @param {string} name
  */
-export function non_state_reference(node, name) {
-	w(node, "non_state_reference", `\`${name}\` is updated, but is not declared with \`$state(...)\`. Changing its value will not correctly trigger updates`);
+export function bind_invalid_each_rest(node, name) {
+	w(node, "bind_invalid_each_rest", `The rest operator (...) will create a new object and binding '${name}' with the original object will not work`);
 }
 
 /**
- * Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`
+ * Empty block
  * @param {null | NodeLike} node
  */
-export function derived_iife(node) {
-	w(node, "derived_iife", "Use `$derived.by(() => {...})` instead of `$derived((() => {...})())`");
+export function block_empty(node) {
+	w(node, "block_empty", "Empty block");
 }
 
 /**
- * Component properties are declared using `$props()` in runes mode. Did you forget to call the function?
+ * `<%name%>` will be treated as an HTML element unless it begins with a capital letter
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function invalid_props_declaration(node) {
-	w(node, "invalid_props_declaration", "Component properties are declared using `$props()` in runes mode. Did you forget to call the function?");
+export function component_name_lowercase(node, name) {
+	w(node, "component_name_lowercase", `\`<${name}>\` will be treated as an HTML element unless it begins with a capital letter`);
 }
 
 /**
- * Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?
+ * Self-closing HTML tags for non-void elements are ambiguous — use `<%name% ...></%name%>` rather than `<%name% ... />`
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function invalid_bindable_declaration(node) {
-	w(node, "invalid_bindable_declaration", "Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?");
+export function element_invalid_self_closing_tag(node, name) {
+	w(node, "element_invalid_self_closing_tag", `Self-closing HTML tags for non-void elements are ambiguous — use \`<${name} ...></${name}>\` rather than \`<${name} ... />\``);
 }
 
 /**
- * State referenced in its own scope will never update. Did you mean to reference it inside a closure?
+ * Using `on:%name%` to listen to the %name% event is deprecated. Use the event attribute `on%name%` instead.
  * @param {null | NodeLike} node
+ * @param {string} name
  */
-export function static_state_reference(node) {
-	w(node, "static_state_reference", "State referenced in its own scope will never update. Did you mean to reference it inside a closure?");
+export function event_directive_deprecated(node, name) {
+	w(node, "event_directive_deprecated", `Using \`on:${name}\` to listen to the ${name} event is deprecated. Use the event attribute \`on${name}\` instead.`);
 }
 
 /**
- * The rest operator (...) will create a new object and binding '%name%' with the original object will not work
+ * Using `<slot>` to render parent content is deprecated. Use `{@render ...}` tags instead.
  * @param {null | NodeLike} node
- * @param {string} name
  */
-export function invalid_rest_eachblock_binding(node, name) {
-	w(node, "invalid_rest_eachblock_binding", `The rest operator (...) will create a new object and binding '${name}' with the original object will not work`);
+export function slot_element_deprecated(node) {
+	w(node, "slot_element_deprecated", "Using `<slot>` to render parent content is deprecated. Use `{@render ...}` tags instead.");
 }
\ No newline at end of file
diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js
index ea909fe4d9..b4f5e9a12b 100644
--- a/packages/svelte/src/index-client.js
+++ b/packages/svelte/src/index-client.js
@@ -2,6 +2,7 @@ import { current_component_context, flush_sync, untrack } from './internal/clien
 import { is_array } from './internal/client/utils.js';
 import { user_effect } from './internal/client/index.js';
 import * as e from './internal/client/errors.js';
+import { lifecycle_outside_component } from './internal/shared/errors.js';
 
 /**
  * The `onMount` function schedules a callback to run as soon as the component has been mounted to the DOM.
@@ -19,7 +20,7 @@ import * as e from './internal/client/errors.js';
  */
 export function onMount(fn) {
 	if (current_component_context === null) {
-		e.lifecycle_outside_component('onMount');
+		lifecycle_outside_component('onMount');
 	}
 
 	if (current_component_context.l !== null) {
@@ -44,7 +45,7 @@ export function onMount(fn) {
  */
 export function onDestroy(fn) {
 	if (current_component_context === null) {
-		e.lifecycle_outside_component('onDestroy');
+		lifecycle_outside_component('onDestroy');
 	}
 
 	onMount(() => () => untrack(fn));
@@ -88,7 +89,7 @@ function create_custom_event(type, detail, { bubbles = false, cancelable = false
 export function createEventDispatcher() {
 	const component_context = current_component_context;
 	if (component_context === null) {
-		e.lifecycle_outside_component('createEventDispatcher');
+		lifecycle_outside_component('createEventDispatcher');
 	}
 
 	return (type, detail, options) => {
@@ -127,11 +128,11 @@ export function createEventDispatcher() {
  */
 export function beforeUpdate(fn) {
 	if (current_component_context === null) {
-		e.lifecycle_outside_component('beforeUpdate');
+		lifecycle_outside_component('beforeUpdate');
 	}
 
 	if (current_component_context.l === null) {
-		throw new Error('beforeUpdate cannot be used in runes mode');
+		e.lifecycle_legacy_only('beforeUpdate');
 	}
 
 	init_update_callbacks(current_component_context).b.push(fn);
@@ -151,7 +152,7 @@ export function beforeUpdate(fn) {
  */
 export function afterUpdate(fn) {
 	if (current_component_context === null) {
-		e.lifecycle_outside_component('afterUpdate');
+		lifecycle_outside_component('afterUpdate');
 	}
 
 	if (current_component_context.l === null) {
diff --git a/packages/svelte/src/index-server.js b/packages/svelte/src/index-server.js
index bf03521c96..5bcb13e5f2 100644
--- a/packages/svelte/src/index-server.js
+++ b/packages/svelte/src/index-server.js
@@ -1,5 +1,6 @@
 import { current_component } from './internal/server/context.js';
 import { noop } from './internal/shared/utils.js';
+import * as e from './internal/server/errors.js';
 
 /** @param {() => void} fn */
 export function onDestroy(fn) {
@@ -20,15 +21,15 @@ export function createEventDispatcher() {
 }
 
 export function mount() {
-	throw new Error('mount(...) is not available on the server');
+	e.lifecycle_function_unavailable('mount');
 }
 
 export function hydrate() {
-	throw new Error('hydrate(...) is not available on the server');
+	e.lifecycle_function_unavailable('hydrate');
 }
 
 export function unmount() {
-	throw new Error('unmount(...) is not available on the server');
+	e.lifecycle_function_unavailable('unmount');
 }
 
 export async function tick() {}
diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index 58519d9baa..05ccba12e0 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -6,6 +6,7 @@ import { delegate } from './events.js';
 import { autofocus } from './misc.js';
 import { effect } from '../../reactivity/effects.js';
 import { run } from '../../../shared/utils.js';
+import * as w from '../../warnings.js';
 
 /**
  * The value/checked attribute in the template actually corresponds to the defaultValue property, so we need
@@ -263,13 +264,10 @@ function check_src_in_dev_hydration(element, attribute, value) {
 	if (attribute === 'srcset' && srcset_url_equal(element, value)) return;
 	if (src_url_equal(element.getAttribute(attribute) ?? '', value ?? '')) return;
 
-	// eslint-disable-next-line no-console
-	console.error(
-		`Detected a ${attribute} attribute value change during hydration. This will not be repaired during hydration, ` +
-			`the ${attribute} value that came from the server will be used. Related element:`,
-		element,
-		' Differing value:',
-		value
+	w.hydration_attribute_changed(
+		attribute,
+		element.outerHTML.replace(element.innerHTML, '...'),
+		String(value)
 	);
 }
 
diff --git a/packages/svelte/src/internal/client/dom/elements/bindings/input.js b/packages/svelte/src/internal/client/dom/elements/bindings/input.js
index 07d369bcca..464479496d 100644
--- a/packages/svelte/src/internal/client/dom/elements/bindings/input.js
+++ b/packages/svelte/src/internal/client/dom/elements/bindings/input.js
@@ -2,6 +2,7 @@ import { DEV } from 'esm-env';
 import { render_effect, effect } from '../../../reactivity/effects.js';
 import { stringify } from '../../../render.js';
 import { listen_to_event_and_reset_event } from './shared.js';
+import * as e from '../../../errors.js';
 
 /**
  * @param {HTMLInputElement} input
@@ -12,9 +13,8 @@ import { listen_to_event_and_reset_event } from './shared.js';
 export function bind_value(input, get_value, update) {
 	listen_to_event_and_reset_event(input, 'input', () => {
 		if (DEV && input.type === 'checkbox') {
-			throw new Error(
-				'Using bind:value together with a checkbox input is not allowed. Use bind:checked instead'
-			);
+			// TODO should this happen in prod too?
+			e.bind_invalid_checkbox_value();
 		}
 
 		update(is_numberlike_input(input) ? to_number(input.value) : input.value);
@@ -22,9 +22,8 @@ export function bind_value(input, get_value, update) {
 
 	render_effect(() => {
 		if (DEV && input.type === 'checkbox') {
-			throw new Error(
-				'Using bind:value together with a checkbox input is not allowed. Use bind:checked instead'
-			);
+			// TODO should this happen in prod too?
+			e.bind_invalid_checkbox_value();
 		}
 
 		var value = get_value();
diff --git a/packages/svelte/src/internal/client/dom/hydration.js b/packages/svelte/src/internal/client/dom/hydration.js
index 5d3c98f2f0..5831baba0e 100644
--- a/packages/svelte/src/internal/client/dom/hydration.js
+++ b/packages/svelte/src/internal/client/dom/hydration.js
@@ -1,4 +1,5 @@
 import { HYDRATION_END, HYDRATION_START } from '../../../constants.js';
+import * as e from '../errors.js';
 
 /**
  * Use this variable to guard everything related to hydration code so it can be treeshaken out
@@ -66,5 +67,5 @@ export function hydrate_anchor(node) {
 		nodes.push(current);
 	}
 
-	throw new Error('Expected a closing hydration marker');
+	e.hydration_missing_marker_close();
 }
diff --git a/packages/svelte/src/internal/client/errors.js b/packages/svelte/src/internal/client/errors.js
index 1666e30ff5..8a319df1ef 100644
--- a/packages/svelte/src/internal/client/errors.js
+++ b/packages/svelte/src/internal/client/errors.js
@@ -2,6 +2,113 @@
 
 import { DEV } from 'esm-env';
 
+/**
+ * Using `bind:value` together with a checkbox input is not allowed. Use `bind:checked` instead
+ * @returns {never}
+ */
+export function bind_invalid_checkbox_value() {
+	if (DEV) {
+		const error = new Error(`${"bind_invalid_checkbox_value"}\n${"Using `bind:value` together with a checkbox input is not allowed. Use `bind:checked` instead"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("bind_invalid_checkbox_value");
+	}
+}
+
+/**
+ * Component %component% has an export named `%key%` that a consumer component is trying to access using `bind:%key%`, which is disallowed. Instead, use `bind:this` (e.g. `<%name% bind:this={component} />`) and then access the property on the bound component instance (e.g. `component.%key%`)
+ * @param {string} component
+ * @param {string} key
+ * @param {string} name
+ * @returns {never}
+ */
+export function bind_invalid_export(component, key, name) {
+	if (DEV) {
+		const error = new Error(`${"bind_invalid_export"}\n${`Component ${component} has an export named \`${key}\` that a consumer component is trying to access using \`bind:${key}\`, which is disallowed. Instead, use \`bind:this\` (e.g. \`<${name} bind:this={component} />\`) and then access the property on the bound component instance (e.g. \`component.${key}\`)`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("bind_invalid_export");
+	}
+}
+
+/**
+ * A component is attempting to bind to a non-bindable property `%key%` belonging to %component% (i.e. `<%name% bind:%key%={...}>`). To mark a property as bindable: `let { %key% = $bindable() } = $props()`
+ * @param {string} key
+ * @param {string} component
+ * @param {string} name
+ * @returns {never}
+ */
+export function bind_not_bindable(key, component, name) {
+	if (DEV) {
+		const error = new Error(`${"bind_not_bindable"}\n${`A component is attempting to bind to a non-bindable property \`${key}\` belonging to ${component} (i.e. \`<${name} bind:${key}={...}>\`). To mark a property as bindable: \`let { ${key} = $bindable() } = $props()\``}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("bind_not_bindable");
+	}
+}
+
+/**
+ * Keyed each block has duplicate key `%value%` at indexes %a% and %b%
+ * @param {string} a
+ * @param {string} b
+ * @param {string | undefined | null} [value]
+ * @returns {never}
+ */
+export function each_key_duplicate(a, b, value) {
+	if (DEV) {
+		const error = new Error(`${"each_key_duplicate"}\n${value ? `Keyed each block has duplicate key \`${value}\` at indexes ${a} and ${b}` : `Keyed each block has duplicate key at indexes ${a} and ${b}`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("each_key_duplicate");
+	}
+}
+
+/**
+ * `%rune%` cannot be used inside an effect cleanup function
+ * @param {string} rune
+ * @returns {never}
+ */
+export function effect_in_teardown(rune) {
+	if (DEV) {
+		const error = new Error(`${"effect_in_teardown"}\n${`\`${rune}\` cannot be used inside an effect cleanup function`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("effect_in_teardown");
+	}
+}
+
+/**
+ * `%rune%` can only be used inside an effect (e.g. during component initialisation)
+ * @param {string} rune
+ * @returns {never}
+ */
+export function effect_orphan(rune) {
+	if (DEV) {
+		const error = new Error(`${"effect_orphan"}\n${`\`${rune}\` can only be used inside an effect (e.g. during component initialisation)`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("effect_orphan");
+	}
+}
+
 /**
  * Maximum update depth exceeded. This can happen when a reactive block or effect repeatedly sets a new value. Svelte limits the number of nested updates to prevent infinite loops
  * @returns {never}
@@ -19,19 +126,34 @@ export function effect_update_depth_exceeded() {
 }
 
 /**
- * `%name%(...)` can only be used during component initialisation
- * @param {string} name
+ * Missing hydration closing marker
  * @returns {never}
  */
-export function lifecycle_outside_component(name) {
+export function hydration_missing_marker_close() {
 	if (DEV) {
-		const error = new Error(`${"lifecycle_outside_component"}\n${`\`${name}(...)\` can only be used during component initialisation`}`);
+		const error = new Error(`${"hydration_missing_marker_close"}\n${"Missing hydration closing marker"}`);
 
 		error.name = 'Svelte error';
 		throw error;
 	} else {
 		// TODO print a link to the documentation
-		throw new Error("lifecycle_outside_component");
+		throw new Error("hydration_missing_marker_close");
+	}
+}
+
+/**
+ * Missing hydration opening marker
+ * @returns {never}
+ */
+export function hydration_missing_marker_open() {
+	if (DEV) {
+		const error = new Error(`${"hydration_missing_marker_open"}\n${"Missing hydration opening marker"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("hydration_missing_marker_open");
 	}
 }
 
@@ -50,4 +172,105 @@ export function lifecycle_legacy_only(name) {
 		// TODO print a link to the documentation
 		throw new Error("lifecycle_legacy_only");
 	}
+}
+
+/**
+ * Cannot do `bind:%key%={undefined}` when `%key%` has a fallback value
+ * @param {string} key
+ * @returns {never}
+ */
+export function props_invalid_value(key) {
+	if (DEV) {
+		const error = new Error(`${"props_invalid_value"}\n${`Cannot do \`bind:${key}={undefined}\` when \`${key}\` has a fallback value`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("props_invalid_value");
+	}
+}
+
+/**
+ * Rest element properties of `$props()` such as `%property%` are readonly
+ * @param {string} property
+ * @returns {never}
+ */
+export function props_rest_readonly(property) {
+	if (DEV) {
+		const error = new Error(`${"props_rest_readonly"}\n${`Rest element properties of \`$props()\` such as \`${property}\` are readonly`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("props_rest_readonly");
+	}
+}
+
+/**
+ * The `%rune%` rune is only available inside `.svelte` and `.svelte.js/ts` files
+ * @param {string} rune
+ * @returns {never}
+ */
+export function rune_outside_svelte(rune) {
+	if (DEV) {
+		const error = new Error(`${"rune_outside_svelte"}\n${`The \`${rune}\` rune is only available inside \`.svelte\` and \`.svelte.js/ts\` files`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("rune_outside_svelte");
+	}
+}
+
+/**
+ * Cannot set prototype of `$state` object
+ * @returns {never}
+ */
+export function state_prototype_fixed() {
+	if (DEV) {
+		const error = new Error(`${"state_prototype_fixed"}\n${"Cannot set prototype of `$state` object"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("state_prototype_fixed");
+	}
+}
+
+/**
+ * Unsafe mutations during Svelte's render or derived phase are not permitted in runes mode. This can lead to unexpected errors and possibly cause infinite loops.
+ * >
+ * If the object is not meant to be reactive, declare it without `$state`
+ * @returns {never}
+ */
+export function state_unsafe_mutation() {
+	if (DEV) {
+		const error = new Error(`${"state_unsafe_mutation"}\n${"Unsafe mutations during Svelte's render or derived phase are not permitted in runes mode. This can lead to unexpected errors and possibly cause infinite loops.\n>\nIf the object is not meant to be reactive, declare it without `$state`"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("state_unsafe_mutation");
+	}
+}
+
+/**
+ * The `this={...}` property of a `<svelte:component>` must be a Svelte component, if defined
+ * @returns {never}
+ */
+export function svelte_component_invalid_this_value() {
+	if (DEV) {
+		const error = new Error(`${"svelte_component_invalid_this_value"}\n${"The `this={...}` property of a `<svelte:component>` must be a Svelte component, if defined"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("svelte_component_invalid_this_value");
+	}
 }
\ No newline at end of file
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 6e6488c001..778215dc41 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -128,8 +128,7 @@ export {
 export {
 	validate_dynamic_component,
 	validate_each_keys,
-	validate_prop_bindings,
-	validate_store
+	validate_prop_bindings
 } from './validate.js';
 export { raf } from './timing.js';
 export { proxy, snapshot } from './proxy.js';
@@ -147,5 +146,6 @@ export {
 	validate_component,
 	validate_dynamic_element_tag,
 	validate_snippet,
+	validate_store,
 	validate_void_dynamic_element
 } from '../shared/validate.js';
diff --git a/packages/svelte/src/internal/client/proxy.js b/packages/svelte/src/internal/client/proxy.js
index 136458c99d..bfd73f4633 100644
--- a/packages/svelte/src/internal/client/proxy.js
+++ b/packages/svelte/src/internal/client/proxy.js
@@ -20,6 +20,7 @@ import { check_ownership, widen_ownership } from './dev/ownership.js';
 import { mutable_source, source, set } from './reactivity/sources.js';
 import { STATE_SYMBOL } from './constants.js';
 import { UNINITIALIZED } from '../../constants.js';
+import * as e from './errors.js';
 
 /**
  * @template T
@@ -334,6 +335,6 @@ const state_proxy_handler = {
 
 if (DEV) {
 	state_proxy_handler.setPrototypeOf = () => {
-		throw new Error('Cannot set prototype of $state object');
+		e.state_prototype_fixed();
 	};
 }
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 2d2ec5e19c..22b2a63a69 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -1,4 +1,3 @@
-import { DEV } from 'esm-env';
 import {
 	check_dirtiness,
 	current_component_context,
@@ -30,6 +29,7 @@ import {
 } from '../constants.js';
 import { set } from './sources.js';
 import { remove } from '../dom/reconciler.js';
+import * as e from '../errors.js';
 
 /**
  * @param {import('#client').Effect | null} effect
@@ -38,19 +38,11 @@ import { remove } from '../dom/reconciler.js';
  */
 export function validate_effect(effect, rune) {
 	if (effect === null) {
-		throw new Error(
-			'ERR_SVELTE_ORPHAN_EFFECT' +
-				(DEV
-					? `: ${rune} can only be used inside an effect (e.g. during component initialisation)`
-					: '')
-		);
+		e.effect_orphan(rune);
 	}
 
 	if (is_destroying_effect) {
-		throw new Error(
-			'ERR_SVELTE_EFFECT_IN_TEARDOWN' +
-				(DEV ? `: ${rune} cannot be used inside an effect cleanup function.` : '')
-		);
+		e.effect_in_teardown(rune);
 	}
 }
 
diff --git a/packages/svelte/src/internal/client/reactivity/props.js b/packages/svelte/src/internal/client/reactivity/props.js
index 053427ddd2..ae5ef9b29b 100644
--- a/packages/svelte/src/internal/client/reactivity/props.js
+++ b/packages/svelte/src/internal/client/reactivity/props.js
@@ -11,6 +11,7 @@ import { derived } from './deriveds.js';
 import { get, is_signals_recorded, untrack } from '../runtime.js';
 import { safe_equals } from './equality.js';
 import { inspect_fn } from '../dev/inspect.js';
+import * as e from '../errors.js';
 
 /**
  * @param {((value?: number) => number)} fn
@@ -46,9 +47,8 @@ const rest_props_handler = {
 	},
 	set(target, key) {
 		if (DEV) {
-			throw new Error(
-				`Rest element properties of $props() such as ${target.name}.${String(key)} are readonly`
-			);
+			// TODO should this happen in prod too?
+			e.props_rest_readonly(`${target.name}.${String(key)}`);
 		}
 
 		return false;
@@ -169,13 +169,7 @@ export function prop(props, key, flags, fallback) {
 
 	if (prop_value === undefined && fallback !== undefined) {
 		if (setter && runes) {
-			// TODO consolidate all these random runtime errors
-			throw new Error(
-				'ERR_SVELTE_BINDING_FALLBACK' +
-					(DEV
-						? `: Cannot pass undefined to bind:${key} because the property contains a fallback value. Pass a different value than undefined to ${key}.`
-						: '')
-			);
+			e.props_invalid_value(key);
 		}
 
 		prop_value = get_fallback();
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 1b955c42dc..9004e02ca3 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -19,6 +19,7 @@ import {
 import { equals, safe_equals } from './equality.js';
 import { CLEAN, DERIVED, DIRTY, BRANCH_EFFECT } from '../constants.js';
 import { UNINITIALIZED } from '../../../constants.js';
+import * as e from '../errors.js';
 
 /**
  * @template V
@@ -91,14 +92,7 @@ export function set(signal, value) {
 		is_runes() &&
 		(current_reaction.f & DERIVED) !== 0
 	) {
-		throw new Error(
-			'ERR_SVELTE_UNSAFE_MUTATION' +
-				(DEV
-					? ": Unsafe mutations during Svelte's render or derived phase are not permitted in runes mode. " +
-						'This can lead to unexpected errors and possibly cause infinite loops.\n\nIf this mutation is not meant ' +
-						'to be reactive do not use the "$state" rune for that declaration.'
-					: '')
-		);
+		e.state_unsafe_mutation();
 	}
 
 	if (!signal.equals(value)) {
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index 17933b3559..c0d449f35b 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -20,6 +20,7 @@ import { array_from } from './utils.js';
 import { handle_event_propagation } from './dom/elements/events.js';
 import { reset_head_anchor } from './dom/blocks/svelte-head.js';
 import * as w from './warnings.js';
+import * as e from './errors.js';
 
 /** @type {Set<string>} */
 export const all_registered_events = new Set();
@@ -143,7 +144,7 @@ export function hydrate(component, options) {
 			}
 
 			if (!node) {
-				throw new Error('Missing hydration marker');
+				e.hydration_missing_marker_open();
 			}
 
 			const anchor = hydrate_anchor(node);
@@ -158,14 +159,7 @@ export function hydrate(component, options) {
 		}, false);
 	} catch (error) {
 		if (!hydrated && options.recover !== false) {
-			// eslint-disable-next-line no-console
-			console.error(
-				'ERR_SVELTE_HYDRATION_MISMATCH' +
-					(DEV
-						? ': Hydration failed because the initial UI does not match what was rendered on the server.'
-						: ''),
-				error
-			);
+			w.hydration_mismatch();
 
 			clear_text_content(target);
 
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index c593f79f09..9e268a3966 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -23,6 +23,7 @@ import { mutate, set, source } from './reactivity/sources.js';
 import { update_derived } from './reactivity/deriveds.js';
 import { inspect_captured_signals, inspect_fn, set_inspect_fn } from './dev/inspect.js';
 import * as e from './errors.js';
+import { lifecycle_outside_component } from '../shared/errors.js';
 
 const FLUSH_MICROTASK = 0;
 const FLUSH_SYNC = 1;
@@ -952,7 +953,7 @@ export function getAllContexts() {
  */
 function get_or_init_context_map(name) {
 	if (current_component_context === null) {
-		e.lifecycle_outside_component(name);
+		lifecycle_outside_component(name);
 	}
 
 	return (current_component_context.c ??= new Map(
@@ -1185,13 +1186,13 @@ if (DEV) {
 			let value; // let's hope noone modifies this global, but belts and braces
 			Object.defineProperty(globalThis, rune, {
 				configurable: true,
+				// eslint-disable-next-line getter-return
 				get: () => {
 					if (value !== undefined) {
 						return value;
 					}
-					throw new Error(
-						`The ${rune} rune is only available inside .svelte and .svelte.js/ts files`
-					);
+
+					e.rune_outside_svelte(rune);
 				},
 				set: (v) => {
 					value = v;
diff --git a/packages/svelte/src/internal/client/validate.js b/packages/svelte/src/internal/client/validate.js
index b2dfee7ab1..2685e0c1ad 100644
--- a/packages/svelte/src/internal/client/validate.js
+++ b/packages/svelte/src/internal/client/validate.js
@@ -1,5 +1,6 @@
 import { untrack } from './runtime.js';
 import { get_descriptor, is_array } from './utils.js';
+import * as e from './errors.js';
 
 /** regex of all html void element names */
 const void_element_names =
@@ -10,35 +11,27 @@ function is_void(tag) {
 	return void_element_names.test(tag) || tag.toLowerCase() === '!doctype';
 }
 
-/**
- * @param {any} store
- * @param {string} name
- */
-export function validate_store(store, name) {
-	if (store != null && typeof store.subscribe !== 'function') {
-		throw new Error(`'${name}' is not a store with a 'subscribe' method`);
-	}
-}
-
 /**
  * @param {() => any} component_fn
  * @returns {any}
  */
 export function validate_dynamic_component(component_fn) {
-	const error_message = 'this={...} of <svelte:component> should specify a Svelte component.';
 	try {
 		const instance = component_fn();
+
 		if (instance !== undefined && typeof instance !== 'object') {
-			throw new Error(error_message);
+			e.svelte_component_invalid_this_value();
 		}
+
 		return instance;
 	} catch (err) {
 		const { message } = /** @type {Error} */ (err);
+
 		if (typeof message === 'string' && message.indexOf('is not a function') !== -1) {
-			throw new Error(error_message);
-		} else {
-			throw err;
+			e.svelte_component_invalid_this_value();
 		}
+
+		throw err;
 	}
 }
 
@@ -59,29 +52,19 @@ export function validate_each_keys(collection, key_fn) {
 	for (let i = 0; i < length; i++) {
 		const key = key_fn(array[i], i);
 		if (keys.has(key)) {
-			throw new Error(
-				`Cannot have duplicate keys in a keyed each: Keys at index ${keys.get(
-					key
-				)} and ${i} with value '${array[i]}' are duplicates`
-			);
+			const a = String(keys.get(key));
+			const b = String(i);
+
+			/** @type {string | null} */
+			let k = String(array[i]);
+			if (k.startsWith('[object ')) k = null;
+
+			e.each_key_duplicate(a, b, k);
 		}
 		keys.set(key, i);
 	}
 }
 
-/**
- * @param {number} timeout
- * @returns {() => void}
- * */
-export function loop_guard(timeout) {
-	const start = Date.now();
-	return () => {
-		if (Date.now() - start > timeout) {
-			throw new Error('Infinite loop detected');
-		}
-	};
-}
-
 /**
  * @param {Record<string, any>} $$props
  * @param {string[]} bindable
@@ -95,17 +78,11 @@ export function validate_prop_bindings($$props, bindable, exports, component) {
 
 		if (setter) {
 			if (exports.includes(key)) {
-				throw new Error(
-					`Component ${component.filename} has an export named ${key} that a consumer component is trying to access using bind:${key}, which is disallowed. ` +
-						`Instead, use bind:this (e.g. <${name} bind:this={component} />) ` +
-						`and then access the property on the bound component instance (e.g. component.${key}).`
-				);
+				e.bind_invalid_export(component.filename, key, name);
 			}
+
 			if (!bindable.includes(key)) {
-				throw new Error(
-					`A component is binding to property ${key} of ${name}.svelte (i.e. <${name} bind:${key} />). This is disallowed because the property was not declared as bindable inside ${component.filename}. ` +
-						`To mark a property as bindable, use the $bindable() rune in ${name}.svelte like this: \`let { ${key} = $bindable() } = $props()\``
-				);
+				e.bind_not_bindable(key, component.filename, name);
 			}
 		}
 	}
diff --git a/packages/svelte/src/internal/client/warnings.js b/packages/svelte/src/internal/client/warnings.js
index eec28ac1c6..1dd532164c 100644
--- a/packages/svelte/src/internal/client/warnings.js
+++ b/packages/svelte/src/internal/client/warnings.js
@@ -5,6 +5,33 @@ import { DEV } from 'esm-env';
 var bold = 'font-weight: bold';
 var normal = 'font-weight: normal';
 
+/**
+ * The `%attribute%` attribute on `%html%` changed its value between server and client renders. The client value, `%value%`, will be ignored in favour of the server value
+ * @param {string} attribute
+ * @param {string} html
+ * @param {string} value
+ */
+export function hydration_attribute_changed(attribute, html, value) {
+	if (DEV) {
+		console.warn(`%c[svelte] ${"hydration_attribute_changed"}\n%c${`The \`${attribute}\` attribute on \`${html}\` changed its value between server and client renders. The client value, \`${value}\`, will be ignored in favour of the server value`}`, bold, normal);
+	} else {
+		// TODO print a link to the documentation
+		console.warn("hydration_attribute_changed");
+	}
+}
+
+/**
+ * Hydration failed because the initial UI does not match what was rendered on the server
+ */
+export function hydration_mismatch() {
+	if (DEV) {
+		console.warn(`%c[svelte] ${"hydration_mismatch"}\n%c${"Hydration failed because the initial UI does not match what was rendered on the server"}`, bold, normal);
+	} else {
+		// TODO print a link to the documentation
+		console.warn("hydration_mismatch");
+	}
+}
+
 /**
  * Tried to unmount a component that was not mounted
  */
diff --git a/packages/svelte/src/internal/server/context.js b/packages/svelte/src/internal/server/context.js
index da9206bab6..efa4be6a77 100644
--- a/packages/svelte/src/internal/server/context.js
+++ b/packages/svelte/src/internal/server/context.js
@@ -1,5 +1,6 @@
 import { DEV } from 'esm-env';
 import { on_destroy } from './index.js';
+import * as e from '../shared/errors.js';
 
 /** @type {import('#server').Component | null} */
 export var current_component = null;
@@ -10,7 +11,7 @@ export var current_component = null;
  * @returns {T}
  */
 export function getContext(key) {
-	const context_map = getAllContexts();
+	const context_map = get_or_init_context_map('getContext');
 	const result = /** @type {T} */ (context_map.get(key));
 
 	return result;
@@ -23,7 +24,7 @@ export function getContext(key) {
  * @returns {T}
  */
 export function setContext(key, context) {
-	getAllContexts().set(key, context);
+	get_or_init_context_map('setContext').set(key, context);
 	return context;
 }
 
@@ -32,21 +33,24 @@ export function setContext(key, context) {
  * @returns {boolean}
  */
 export function hasContext(key) {
-	return getAllContexts().has(key);
+	return get_or_init_context_map('hasContext').has(key);
 }
 
 /** @returns {Map<any, any>} */
 export function getAllContexts() {
-	const context = current_component;
+	return get_or_init_context_map('getAllContexts');
+}
 
-	if (context === null) {
-		throw new Error(
-			'ERR_SVELTE_ORPHAN_CONTEXT' +
-				(DEV ? 'Context can only be used during component initialisation.' : '')
-		);
+/**
+ * @param {string} name
+ * @returns {Map<unknown, unknown>}
+ */
+function get_or_init_context_map(name) {
+	if (current_component === null) {
+		e.lifecycle_outside_component(name);
 	}
 
-	return (context.c ??= new Map(get_parent_context(context) || undefined));
+	return (current_component.c ??= new Map(get_parent_context(current_component) || undefined));
 }
 
 export function push() {
diff --git a/packages/svelte/src/internal/server/errors.js b/packages/svelte/src/internal/server/errors.js
new file mode 100644
index 0000000000..848e2e6e50
--- /dev/null
+++ b/packages/svelte/src/internal/server/errors.js
@@ -0,0 +1,13 @@
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
+
+/**
+ * `%name%(...)` is not available on the server
+ * @param {string} name
+ * @returns {never}
+ */
+export function lifecycle_function_unavailable(name) {
+	const error = new Error(`${"lifecycle_function_unavailable"}\n${`\`${name}(...)\` is not available on the server`}`);
+
+	error.name = 'Svelte error';
+	throw error;
+}
\ No newline at end of file
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 62ec333db9..56c68a9ae8 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -11,6 +11,7 @@ import {
 import { DEV } from 'esm-env';
 import { current_component, pop, push } from './context.js';
 import { BLOCK_CLOSE, BLOCK_OPEN } from './hydration.js';
+import { validate_store } from '../shared/validate.js';
 
 /**
  * @typedef {{
@@ -443,16 +444,6 @@ export function store_get(store_values, store_name, store) {
 	return store_values[store_name][2];
 }
 
-/**
- * @param {any} store
- * @param {string} name
- */
-export function validate_store(store, name) {
-	if (store != null && typeof store.subscribe !== 'function') {
-		throw new Error(`'${name}' is not a store with a 'subscribe' method`);
-	}
-}
-
 /**
  * Sets the new value of a store and returns that value.
  * @template V
@@ -631,19 +622,6 @@ export function ensure_array_like(array_like_or_iterator) {
 		: Array.from(array_like_or_iterator);
 }
 
-/**
- * @param {number} timeout
- * @returns {() => void}
- * */
-export function loop_guard(timeout) {
-	const start = Date.now();
-	return () => {
-		if (Date.now() - start > timeout) {
-			throw new Error('Infinite loop detected');
-		}
-	};
-}
-
 /**
  * @param {any[]} args
  * @param {Function} [inspect]
diff --git a/packages/svelte/src/internal/shared/errors.js b/packages/svelte/src/internal/shared/errors.js
new file mode 100644
index 0000000000..4bfc595fa2
--- /dev/null
+++ b/packages/svelte/src/internal/shared/errors.js
@@ -0,0 +1,85 @@
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
+
+import { DEV } from 'esm-env';
+
+/**
+ * `%name%(...)` can only be used during component initialisation
+ * @param {string} name
+ * @returns {never}
+ */
+export function lifecycle_outside_component(name) {
+	if (DEV) {
+		const error = new Error(`${"lifecycle_outside_component"}\n${`\`${name}(...)\` can only be used during component initialisation`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("lifecycle_outside_component");
+	}
+}
+
+/**
+ * The argument to `{@render ...}` must be a snippet function, not a component or some other kind of function. If you want to dynamically render one snippet or another, use `$derived` and pass its result to `{@render ...}`
+ * @returns {never}
+ */
+export function render_tag_invalid_argument() {
+	if (DEV) {
+		const error = new Error(`${"render_tag_invalid_argument"}\n${"The argument to `{@render ...}` must be a snippet function, not a component or some other kind of function. If you want to dynamically render one snippet or another, use `$derived` and pass its result to `{@render ...}`"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("render_tag_invalid_argument");
+	}
+}
+
+/**
+ * A snippet must be rendered with `{@render ...}`
+ * @returns {never}
+ */
+export function snippet_used_as_component() {
+	if (DEV) {
+		const error = new Error(`${"snippet_used_as_component"}\n${"A snippet must be rendered with `{@render ...}`"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("snippet_used_as_component");
+	}
+}
+
+/**
+ * `%name%` is not a store with a `subscribe` method
+ * @param {string} name
+ * @returns {never}
+ */
+export function store_invalid_shape(name) {
+	if (DEV) {
+		const error = new Error(`${"store_invalid_shape"}\n${`\`${name}\` is not a store with a \`subscribe\` method`}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("store_invalid_shape");
+	}
+}
+
+/**
+ * The `this` prop on `<svelte:element>` must be a string, if defined
+ * @returns {never}
+ */
+export function svelte_element_invalid_this_value() {
+	if (DEV) {
+		const error = new Error(`${"svelte_element_invalid_this_value"}\n${"The `this` prop on `<svelte:element>` must be a string, if defined"}`);
+
+		error.name = 'Svelte error';
+		throw error;
+	} else {
+		// TODO print a link to the documentation
+		throw new Error("svelte_element_invalid_this_value");
+	}
+}
\ No newline at end of file
diff --git a/packages/svelte/src/internal/shared/validate.js b/packages/svelte/src/internal/shared/validate.js
index 65dde3011c..d2178709e6 100644
--- a/packages/svelte/src/internal/shared/validate.js
+++ b/packages/svelte/src/internal/shared/validate.js
@@ -1,5 +1,6 @@
 import { is_void } from '../../compiler/phases/1-parse/utils/names.js';
 import * as w from './warnings.js';
+import * as e from './errors.js';
 
 const snippet_symbol = Symbol.for('svelte.snippet');
 
@@ -17,11 +18,9 @@ export function add_snippet_symbol(fn) {
  */
 export function validate_snippet(snippet_fn) {
 	if (snippet_fn && snippet_fn[snippet_symbol] !== true) {
-		throw new Error(
-			'The argument to `{@render ...}` must be a snippet function, not a component or some other kind of function. ' +
-				'If you want to dynamically render one snippet or another, use `$derived` and pass its result to `{@render ...}`.'
-		);
+		e.render_tag_invalid_argument();
 	}
+
 	return snippet_fn;
 }
 
@@ -31,8 +30,9 @@ export function validate_snippet(snippet_fn) {
  */
 export function validate_component(component_fn) {
 	if (component_fn?.[snippet_symbol] === true) {
-		throw new Error('A snippet must be rendered with `{@render ...}`');
+		e.snippet_used_as_component();
 	}
+
 	return component_fn;
 }
 
@@ -52,6 +52,16 @@ export function validate_dynamic_element_tag(tag_fn) {
 	const tag = tag_fn();
 	const is_string = typeof tag === 'string';
 	if (tag && !is_string) {
-		throw new Error('<svelte:element> expects "this" attribute to be a string.');
+		e.svelte_element_invalid_this_value();
+	}
+}
+
+/**
+ * @param {any} store
+ * @param {string} name
+ */
+export function validate_store(store, name) {
+	if (store != null && typeof store.subscribe !== 'function') {
+		e.store_invalid_shape(name);
 	}
 }
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js
index 9c29f505ee..3e65c3c810 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-empty/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'missing_attribute_value',
+		code: 'expected_attribute_value',
 		message: 'Expected attribute value',
 		position: [12, 12]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js
index e655d40aae..13d7f9c66b 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_sequence_expression',
+		code: 'attribute_invalid_sequence_expression',
 		message:
 			'Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses',
 		position: [124, 131]
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js
index 15549974d3..4fb1680d01 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-sequence-expression/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_sequence_expression',
+		code: 'attribute_invalid_sequence_expression',
 		message:
 			'Sequence expressions are not allowed as attribute/directive values in runes mode, unless wrapped in parentheses',
 		position: [163, 170]
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js
index 5fb31858b7..8995f44a3f 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-unique-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_attribute',
+		code: 'attribute_duplicate',
 		message: 'Attributes need to be unique',
 		position: [17, 17]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js
index 5fb31858b7..8995f44a3f 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-unique-shorthand/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_attribute',
+		code: 'attribute_duplicate',
 		message: 'Attributes need to be unique',
 		position: [17, 17]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js b/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js
index 5fb31858b7..8995f44a3f 100644
--- a/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/attribute-unique/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_attribute',
+		code: 'attribute_duplicate',
 		message: 'Attributes need to be unique',
 		position: [17, 17]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js b/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js
index b24874f1b4..eaca30bd34 100644
--- a/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/catch-without-await/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_continuing_block_placement',
+		code: 'block_invalid_continuation_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [1, 1]
diff --git a/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js b/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js
index d212e197f0..e6551031cc 100644
--- a/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/class-state-field-static/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_state_location',
+		code: 'state_invalid_placement',
 		message:
 			'`$state(...)` can only be used as a variable declaration initializer or a class field',
 		position: [33, 41]
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js
index 2dafcd66b1..7beaff051d 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_slot_name',
+		code: 'slot_attribute_duplicate',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js
index 2dafcd66b1..7beaff051d 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_slot_name',
+		code: 'slot_attribute_duplicate',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js
index 1a8d68c564..acc5890b31 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-4/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_default_slot_content',
+		code: 'slot_default_duplicate',
 		message: 'Found default slot content alongside an explicit slot="default"'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js
index 2dafcd66b1..7beaff051d 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-5/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_slot_name',
+		code: 'slot_attribute_duplicate',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js
index 2dafcd66b1..7beaff051d 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error-6/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_slot_name',
+		code: 'slot_attribute_duplicate',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js
index 2dafcd66b1..7beaff051d 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-duplicate-error/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_slot_name',
+		code: 'slot_attribute_duplicate',
 		message: "Duplicate slot name 'foo' in <Nested>"
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js
index 727e0c8bda..fd6f40aaf6 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_slot_placement',
+		code: 'slot_attribute_invalid_placement',
 		message:
 			"Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js
index 727e0c8bda..fd6f40aaf6 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_slot_placement',
+		code: 'slot_attribute_invalid_placement',
 		message:
 			"Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js
index 727e0c8bda..fd6f40aaf6 100644
--- a/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/component-slot-nested-error/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_slot_placement',
+		code: 'slot_attribute_invalid_placement',
 		message:
 			"Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js
index 77baf5a87e..1014cd34c2 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_css_global_block_combinator',
+		code: 'css_global_block_invalid_combinator',
 		message: 'A :global {...} block cannot follow a > combinator',
 		position: [12, 21]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js
index 5d2a52465f..3f7a82b54c 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_css_global_block_declaration',
+		code: 'css_global_block_invalid_declaration',
 		message: 'A :global {...} block can only contain rules, not declarations',
 		position: [24, 34]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js
index 63b20e7e36..00843fa217 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-modifier/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_css_global_block_modifier',
+		code: 'css_global_block_invalid_modifier',
 		message: 'A :global {...} block cannot modify an existing selector',
 		position: [14, 21]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js
index bb189b05f5..9f06599f7a 100644
--- a/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_css_global_block_list',
+		code: 'css_global_block_invalid_list',
 		message: 'A :global {...} block cannot be part of a selector list with more than one item',
 		position: [9, 31]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/css/_config.js b/packages/svelte/tests/compiler-errors/samples/css/_config.js
index 74ef4c9c6c..3b8d128b50 100644
--- a/packages/svelte/tests/compiler-errors/samples/css/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/css/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_css_identifier',
+		code: 'css_expected_identifier',
 		message: 'Expected a valid CSS identifier',
 		position: [25, 25]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js
index 7141ff1efd..cd7a4ab291 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-declaration/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_dollar_binding',
+		code: 'dollar_binding_invalid',
 		message: 'The $ name is reserved, and cannot be used for variables and imports'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js
index ae86ca8d6b..47b17c52c6 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global-js/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_global',
+		code: 'global_reference_invalid',
 		message:
 			'`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`'
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js
index ae86ca8d6b..47b17c52c6 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-global/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_global',
+		code: 'global_reference_invalid',
 		message:
 			'`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`'
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js b/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js
index 7141ff1efd..cd7a4ab291 100644
--- a/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dollar-binding-import/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_dollar_binding',
+		code: 'dollar_binding_invalid',
 		message: 'The $ name is reserved, and cannot be used for variables and imports'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js b/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js
index c052f05a18..daf005c900 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-before-closing-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_continuing_block_placement',
+		code: 'block_invalid_continuation_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [6, 6]
diff --git a/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js
index 6883152c09..5053be23bd 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-before-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_continuing_block_placement',
+		code: 'block_invalid_continuation_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [18, 18]
diff --git a/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js b/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js
index d2ab9b9090..43839b6723 100644
--- a/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/else-if-before-closing-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_continuing_block_placement',
+		code: 'block_invalid_continuation_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [17, 17]
diff --git a/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js b/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js
index fd20583e57..fbe811a8e2 100644
--- a/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/empty-attribute-shorthand/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'empty_attribute_shorthand',
+		code: 'attribute_empty_shorthand',
 		message: 'Attribute shorthand cannot be empty',
 		position: [6, 6]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js
index 087c2e55d9..73170b03aa 100644
--- a/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/empty-classname-binding/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'empty_directive_name',
-		message: 'ClassDirective name cannot be empty',
-		position: [10, 10]
+		code: 'directive_missing_name',
+		message: '`class:` name cannot be empty',
+		position: [4, 10]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js b/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js
index 22338ec818..de954de2de 100644
--- a/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/empty-directive-name/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'empty_directive_name',
-		message: 'UseDirective name cannot be empty',
-		position: [8, 8]
+		code: 'directive_missing_name',
+		message: '`use:` name cannot be empty',
+		position: [4, 8]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js b/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js
index 9e77a92f52..886a03748f 100644
--- a/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/export-derived-state/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_derived_export',
+		code: 'derived_invalid_export',
 		message:
 			'Cannot export derived state from a module. To expose the current derived value, export a function returning its value',
 		position: [24, 66]
diff --git a/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js b/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js
index 3cc26ce501..088991864a 100644
--- a/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/export-state-module/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_state_export',
+		code: 'state_invalid_export',
 		message:
 			"Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties",
 		position: [76, 114]
diff --git a/packages/svelte/tests/compiler-errors/samples/export-state/_config.js b/packages/svelte/tests/compiler-errors/samples/export-state/_config.js
index 94d31700f2..36d0d301a5 100644
--- a/packages/svelte/tests/compiler-errors/samples/export-state/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/export-state/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_state_export',
+		code: 'state_invalid_export',
 		message:
 			"Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties",
 		position: [46, 86]
diff --git a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js
index b0ee9ddfd4..eaac15d1fb 100644
--- a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_snippet_assignment',
+		code: 'snippet_parameter_assignment',
 		message: 'Cannot reassign or bind to snippet parameter'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js
index b0ee9ddfd4..eaac15d1fb 100644
--- a/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/invalid-snippet-mutation/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_snippet_assignment',
+		code: 'snippet_parameter_assignment',
 		message: 'Cannot reassign or bind to snippet parameter'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js
index 247cc5b09f..30dd732b8d 100644
--- a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js
index 247cc5b09f..30dd732b8d 100644
--- a/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/legacy-no-const-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js b/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js
index f42fd1af86..27ba8aa39b 100644
--- a/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/multiple-styles/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_style_element',
+		code: 'style_duplicate',
 		message: 'A component can have a single top-level `<style>` element',
 		position: [58, 58]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/options-children/_config.js b/packages/svelte/tests/compiler-errors/samples/options-children/_config.js
index 5ec5f02752..1ed4778aa5 100644
--- a/packages/svelte/tests/compiler-errors/samples/options-children/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/options-children/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_element_content',
+		code: 'svelte_meta_invalid_content',
 		message: '<svelte:options> cannot have children',
 		position: [16, 16]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js b/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js
index 06adb4706c..439f0c6b12 100644
--- a/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/raw-mustaches-whitespace/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'missing_whitespace',
+		code: 'expected_whitespace',
 		message: 'Expected whitespace',
 		position: [6, 6]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js b/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js
index f1380710e2..3ae15cdbf2 100644
--- a/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/render-tag-invalid-call/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_render_call',
+		code: 'render_tag_invalid_call_expression',
 		message: 'Calling a snippet function using apply, bind or call is not allowed'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js
index 7b2f863d7c..eaa3dfa8ff 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-before-after-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_runes_mode_import',
+		code: 'runes_mode_invalid_import',
 		message: 'beforeUpdate cannot be used in runes mode'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-bindable-not-called/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-bindable-not-called/_config.js
new file mode 100644
index 0000000000..50a6d6548a
--- /dev/null
+++ b/packages/svelte/tests/compiler-errors/samples/runes-bindable-not-called/_config.js
@@ -0,0 +1,8 @@
+import { test } from '../../test';
+
+export default test({
+	error: {
+		code: 'rune_missing_parentheses',
+		message: 'Cannot use rune without parentheses'
+	}
+});
diff --git a/packages/svelte/tests/validator/samples/runes-bindable-not-called/input.svelte b/packages/svelte/tests/compiler-errors/samples/runes-bindable-not-called/main.svelte
similarity index 100%
rename from packages/svelte/tests/validator/samples/runes-bindable-not-called/input.svelte
rename to packages/svelte/tests/compiler-errors/samples/runes-bindable-not-called/main.svelte
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js
index 9620704d61..4f8f7d08e2 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-duplicate-props/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_props_rune',
+		code: 'props_duplicate',
 		message: 'Cannot use `$props()` more than once'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js
index 50cfed6032..9e6ac2a196 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-export-let/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_legacy_export',
-		message: 'Cannot use `export let` in runes mode — use $props instead'
+		code: 'legacy_export_invalid',
+		message: 'Cannot use `export let` in runes mode — use `$props()` instead'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js
index 22f2f6596a..84487b9b63 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-export-named-state/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_state_export',
+		code: 'state_invalid_export',
 		message:
 			"Cannot export state from a module if it is reassigned. Either export a function returning the state value or only mutate the state value's properties",
 		position: [28, 53]
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js
index e60f4e86e7..524c2f161c 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_each_assignment',
+		code: 'each_item_invalid_assignment',
 		message:
 			'Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)'
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js
index e60f4e86e7..524c2f161c 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-invalid-each-mutation/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_each_assignment',
+		code: 'each_item_invalid_assignment',
 		message:
 			'Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. `array[i] = value` instead of `entry = value`)'
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js
index 247cc5b09f..30dd732b8d 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-const-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js
index 247cc5b09f..30dd732b8d 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-const-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to constant'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js
index 1fae570f91..94985a9939 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js
index b2f418e384..87b88d79cc 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-binding/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_binding',
+		code: 'constant_binding',
 		message: 'Cannot bind to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js
index 1fae570f91..94985a9939 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-assignment/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js
index 1fae570f91..94985a9939 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-state-field-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js
index 1fae570f91..94985a9939 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-derived-update/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_assignment',
+		code: 'constant_assignment',
 		message: 'Cannot assign to derived state'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js
index 00edfe51b3..1185ca6b45 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-no-rune-each/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_state_location',
+		code: 'state_invalid_placement',
 		message: '`$state(...)` can only be used as a variable declaration initializer or a class field'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js
deleted file mode 100644
index cfd4f2cb67..0000000000
--- a/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/_config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { test } from '../../test';
-
-export default test({
-	error: {
-		code: 'conflicting_property_name',
-		message: 'Cannot have a property and a component export with the same name'
-	}
-});
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/main.svelte b/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/main.svelte
deleted file mode 100644
index 0ea9ef8fbb..0000000000
--- a/packages/svelte/tests/compiler-errors/samples/runes-prop-export-conflict/main.svelte
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-	let { x: y } = $props();
-	export function x() {}
-</script>
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-props-not-called/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-props-not-called/_config.js
new file mode 100644
index 0000000000..50a6d6548a
--- /dev/null
+++ b/packages/svelte/tests/compiler-errors/samples/runes-props-not-called/_config.js
@@ -0,0 +1,8 @@
+import { test } from '../../test';
+
+export default test({
+	error: {
+		code: 'rune_missing_parentheses',
+		message: 'Cannot use rune without parentheses'
+	}
+});
diff --git a/packages/svelte/tests/validator/samples/runes-props-not-called/input.svelte b/packages/svelte/tests/compiler-errors/samples/runes-props-not-called/main.svelte
similarity index 100%
rename from packages/svelte/tests/validator/samples/runes-props-not-called/input.svelte
rename to packages/svelte/tests/compiler-errors/samples/runes-props-not-called/main.svelte
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js
index 1024076a6a..048c4ea5f0 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_rune_args_length',
+		code: 'rune_invalid_arguments_length',
 		message: '`$bindable` must be called with zero or one arguments'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js
index 76d48b43be..22cf31ace6 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-bindable-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_bindable_location',
+		code: 'bindable_invalid_location',
 		message: '`$bindable()` can only be used inside a `$props()` declaration'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js
index 4b9ad2c572..203a4bc173 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_rune_args_length',
+		code: 'rune_invalid_arguments_length',
 		message: '`$derived` must be called with exactly one argument'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js
index 5bde7150ec..476d7239a3 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-derived-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_state_location',
+		code: 'state_invalid_placement',
 		message:
 			'`$derived(...)` can only be used as a variable declaration initializer or a class field'
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js
index ed08b7682a..3302a5346e 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_rune_args_length',
+		code: 'rune_invalid_arguments_length',
 		message: '`$effect` must be called with exactly one argument'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js
index b8c4ad0c05..a8b5476786 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-effect-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_effect_location',
+		code: 'effect_invalid_placement',
 		message: '`$effect()` can only be used as an expression statement'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js
index 37c34a7384..8720192f86 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-host-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_host_location',
+		code: 'host_invalid_placement',
 		message: '`$host()` can only be used inside custom element component instances'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js
index eb6bc22ed5..e269f3f090 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_rune_args',
+		code: 'rune_invalid_arguments',
 		message: '`$props` cannot be called with arguments'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js
index ebf5040fff..53ab3c7bcd 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-props-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_props_location',
+		code: 'props_invalid_placement',
 		message:
 			'`$props()` can only be used at the top level of components as a variable declaration initializer'
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js
index 30fd430140..993ca18f47 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_rune_args_length',
+		code: 'rune_invalid_arguments_length',
 		message: '`$state` must be called with zero or one arguments'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js
index 00edfe51b3..1185ca6b45 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-placement/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_state_location',
+		code: 'state_invalid_placement',
 		message: '`$state(...)` can only be used as a variable declaration initializer or a class field'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js
index ab7ce7b201..687d66851a 100644
--- a/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/runes-wrong-state-snapshot-args/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_rune_args_length',
+		code: 'rune_invalid_arguments_length',
 		message: '`$state.snapshot` must be called with exactly one argument'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js b/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js
index 04ec9db510..8092490300 100644
--- a/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/script-unclosed/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed_element',
+		code: 'element_unclosed',
 		message: '`<script>` was left open',
 		position: [32, 32]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js b/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js
index be27484ce6..74e7e4cbe5 100644
--- a/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/self-reference/_config.js
@@ -2,9 +2,9 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_self_placement',
+		code: 'svelte_self_invalid_placement',
 		message:
-			'`<svelte:self>` components can only exist inside {#if} blocks, {#each} blocks, {#snippet} blocks or slots passed to components',
+			'`<svelte:self>` components can only exist inside `{#if}` blocks, `{#each}` blocks, `{#snippet}` blocks or slots passed to components',
 		position: [1, 1]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js b/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js
index d85305d319..c46640e663 100644
--- a/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/slot-conflicting-with-render-tag/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'conflicting_slot_usage',
+		code: 'slot_snippet_conflict',
 		message:
 			'Cannot use `<slot>` syntax and `{@render ...}` tags in the same component. Migrate towards `{@render ...}` tags completely.',
 		position: [71, 84]
diff --git a/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js b/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js
index 747c75ad3a..9f6a56f49c 100644
--- a/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/snippet-children-conflict/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'conflicting_children_snippet',
+		code: 'snippet_conflict',
 		message:
 			'Cannot use explicit children snippet at the same time as implicit children content. Remove either the non-whitespace content or the children snippet block',
 		position: [320, 353]
diff --git a/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js b/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js
index 5f45a792bf..a48923bd4a 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-autosub-context-module/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_subscription',
+		code: 'store_invalid_subscription',
 		message: 'Cannot reference store value inside `<script context="module">`',
 		position: [164, 168]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js b/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js
index 6a49672737..f925c786ea 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-contextual/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_store_subscription',
+		code: 'store_invalid_scoped_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js b/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js
index 649aeffd37..857537f16e 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-global-disallowed/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_global',
+		code: 'global_reference_invalid',
 		message:
 			'`$foo` is an illegal variable name. To reference a global variable called `$foo`, use `globalThis.$foo`'
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js b/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js
index d2ef4fa288..8ee534db2e 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-prevent-user-declarations/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_dollar_prefix',
+		code: 'dollar_prefix_invalid',
 		message: 'The $ prefix is reserved, and cannot be used for variables and imports'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js
index 85112aa728..e35e649a97 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-2/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_store_subscription',
+		code: 'store_invalid_scoped_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component',
 		position: [142, 147]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js
index dea59242b9..d1df04611e 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope-3/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_store_subscription',
+		code: 'store_invalid_scoped_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component',
 		position: [167, 172]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js
index 6a49672737..f925c786ea 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-shadow-scope/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_store_subscription',
+		code: 'store_invalid_scoped_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js b/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js
index 6a49672737..f925c786ea 100644
--- a/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/store-template-expression-scope/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'illegal_store_subscription',
+		code: 'store_invalid_scoped_subscription',
 		message: 'Cannot subscribe to stores that are not declared at the top level of the component'
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js b/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js
index 294867d7f5..94fe6dfd47 100644
--- a/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/style-unclosed/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_css_identifier',
+		code: 'css_expected_identifier',
 		message: 'Expected a valid CSS identifier',
 		position: [9, 9]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js b/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js
index f5ff354027..bc995db523 100644
--- a/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/svelte-selfdestructive/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_svelte_tag',
+		code: 'svelte_meta_invalid_tag',
 		message:
 			'Valid `<svelte:...>` tag names are svelte:head, svelte:options, svelte:window, svelte:document, svelte:body, svelte:element, svelte:component, svelte:self or svelte:fragment',
 		position: [10, 10]
diff --git a/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js
index cef6538067..23c71262d2 100644
--- a/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/then-before-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_continuing_block_placement',
+		code: 'block_invalid_continuation_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [21, 21]
diff --git a/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js b/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js
index b24874f1b4..eaca30bd34 100644
--- a/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/then-without-await/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_continuing_block_placement',
+		code: 'block_invalid_continuation_placement',
 		message:
 			'{:...} block is invalid at this position (did you forget to close the preceeding element or block?)',
 		position: [1, 1]
diff --git a/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js b/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js
index 5a33a0c237..6fb0c03d4e 100644
--- a/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unclosed-attribute-self-close-tag/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed_attribute_value',
-		message: 'Expected closing } character',
+		code: 'expected_token',
+		message: 'Expected token }',
 		position: [19, 19]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js
index 5099013e16..0698403646 100644
--- a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input-d/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed_block',
+		code: 'block_unclosed',
 		message: 'Block was left open',
 		position: [0, 1]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js
index 6ab0c7f716..3bcee17a12 100644
--- a/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unexpected-end-of-input/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'unclosed_element',
+		code: 'element_unclosed',
 		message: '`<div>` was left open',
 		position: [0, 1]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js
index 824db2ae2e..3c6ae0bc24 100644
--- a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose-2/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_closing_tag',
-		message: '</p> attempted to close an element that was not open',
+		code: 'element_invalid_closing_tag',
+		message: '`</p>` attempted to close an element that was not open',
 		position: [38, 38]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js
index bfd76bff4f..c0ce6e2ab0 100644
--- a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag-autoclose/_config.js
@@ -2,9 +2,9 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_closing_tag_after_autoclose',
+		code: 'element_invalid_closing_tag_autoclosed',
 		message:
-			'</p> attempted to close element that was already automatically closed by <pre> (cannot nest <pre> inside <p>)',
+			'`</p>` attempted to close element that was already automatically closed by `<pre>` (cannot nest `<pre>` inside `<p>`)',
 		position: [24, 24]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js
index 6609a11e42..311524bfa2 100644
--- a/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/unmatched-closing-tag/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_closing_tag',
-		message: '</div> attempted to close an element that was not open',
+		code: 'element_invalid_closing_tag',
+		message: '`</div>` attempted to close an element that was not open',
 		position: [0, 0]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js b/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js
index 360fcec971..3d963f95a5 100644
--- a/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/void-closing/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_void_content',
+		code: 'void_element_invalid_content',
 		message: 'Void elements cannot have children or closing tags',
 		position: [23, 23]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/window-children/_config.js b/packages/svelte/tests/compiler-errors/samples/window-children/_config.js
index a788c01ad5..a336cf1cef 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-children/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-children/_config.js
@@ -2,7 +2,7 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_element_content',
+		code: 'svelte_meta_invalid_content',
 		message: '<svelte:window> cannot have children',
 		position: [15, 15]
 	}
diff --git a/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js b/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js
index fed30e9475..bc0ac4065d 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-duplicate/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'duplicate_svelte_element',
-		message: 'A component can only have one <svelte:window> element',
+		code: 'svelte_meta_duplicate',
+		message: 'A component can only have one `<svelte:window>` element',
 		position: [17, 17]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js b/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js
index 36bda11a77..3d5c3560e9 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-inside-block/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_svelte_element_placement',
-		message: '<svelte:window> tags cannot be inside elements or blocks',
+		code: 'svelte_meta_invalid_placement',
+		message: '`<svelte:window>` tags cannot be inside elements or blocks',
 		position: [11, 11]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js b/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js
index 844353ac1b..0c0746d5e2 100644
--- a/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/window-inside-element/_config.js
@@ -2,8 +2,8 @@ import { test } from '../../test';
 
 export default test({
 	error: {
-		code: 'invalid_svelte_element_placement',
-		message: '<svelte:window> tags cannot be inside elements or blocks',
+		code: 'svelte_meta_invalid_placement',
+		message: '`<svelte:window>` tags cannot be inside elements or blocks',
 		position: [7, 7]
 	}
 });
diff --git a/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js b/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js
index 5ebdbb2680..9a7d9cadcf 100644
--- a/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js
+++ b/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js
@@ -14,6 +14,6 @@ export default test({
 	},
 
 	errors: [
-		'Detected a href attribute value change during hydration. This will not be repaired during hydration, the href value that came from the server will be used. Related element:'
+		'The `href` attribute on `<a href="/bar">...</a>` changed its value between server and client renders. The client value, `/foo`, will be ignored in favour of the server value'
 	]
 });
diff --git a/packages/svelte/tests/hydration/test.ts b/packages/svelte/tests/hydration/test.ts
index 9002f56d51..0fcdc6f1b4 100644
--- a/packages/svelte/tests/hydration/test.ts
+++ b/packages/svelte/tests/hydration/test.ts
@@ -65,17 +65,26 @@ const { test, run } = suite<HydrationTest>(async (config, cwd) => {
 	try {
 		const snapshot = config.snapshot ? config.snapshot(target) : {};
 
-		const error = console.error;
+		const warn = console.warn;
 		const errors: any[] = [];
 		let got_hydration_error = false;
-		console.error = (message: any) => {
-			if (typeof message === 'string' && message.startsWith('ERR_SVELTE_HYDRATION_MISMATCH')) {
-				got_hydration_error = true;
-				if (!config.expect_hydration_error) {
-					error(message);
+		console.warn = (...args: any[]) => {
+			if (args[0].startsWith('%c[svelte]')) {
+				// TODO convert this to structured data, for more robust comparison?
+				const text = args[0];
+				const code = text.slice(11, text.indexOf('\n%c', 11));
+				const message = text.slice(text.indexOf('%c', 2) + 2);
+
+				if (typeof message === 'string' && code === 'hydration_mismatch') {
+					got_hydration_error = true;
+					if (!config.expect_hydration_error) {
+						warn(message);
+					}
+				} else {
+					errors.push(message);
 				}
 			} else {
-				errors.push(message);
+				errors.push(...args);
 			}
 		};
 
@@ -86,7 +95,7 @@ const { test, run } = suite<HydrationTest>(async (config, cwd) => {
 			props: config.props
 		});
 
-		console.error = error;
+		console.warn = warn;
 
 		if (config.expect_hydration_error) {
 			assert.ok(got_hydration_error, 'Expected hydration error');
diff --git a/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js b/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js
index dfb291476d..c5dfa8ecc7 100644
--- a/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js
+++ b/packages/svelte/tests/runtime-browser/custom-elements-samples/extended-builtin/_config.js
@@ -4,7 +4,7 @@ const tick = () => Promise.resolve();
 export default test({
 	warnings: [
 		{
-			code: 'avoid_is',
+			code: 'attribute_avoid_is',
 			message: 'The "is" attribute is not supported cross-browser and should be avoided',
 			start: {
 				character: 109,
diff --git a/packages/svelte/tests/runtime-legacy/samples/component-not-constructor-dev/_config.js b/packages/svelte/tests/runtime-legacy/samples/component-not-constructor-dev/_config.js
index db235a0ea1..a84708a774 100644
--- a/packages/svelte/tests/runtime-legacy/samples/component-not-constructor-dev/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/component-not-constructor-dev/_config.js
@@ -7,5 +7,6 @@ export default test({
 		dev: true
 	},
 
-	error: 'this={...} of <svelte:component> should specify a Svelte component.'
+	error:
+		'svelte_component_invalid_this_value\nThe `this={...}` property of a `<svelte:component>` must be a Svelte component, if defined'
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/component-not-constructor2-dev/_config.js b/packages/svelte/tests/runtime-legacy/samples/component-not-constructor2-dev/_config.js
index 9d4013e7da..dc220e4f3d 100644
--- a/packages/svelte/tests/runtime-legacy/samples/component-not-constructor2-dev/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/component-not-constructor2-dev/_config.js
@@ -17,7 +17,7 @@ export default test({
 		} catch (err) {
 			assert.equal(
 				/** @type {Error} */ (err).message,
-				'this={...} of <svelte:component> should specify a Svelte component.'
+				'svelte_component_invalid_this_value\nThe `this={...}` property of a `<svelte:component>` must be a Svelte component, if defined'
 			);
 		}
 	}
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this/_config.js b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this/_config.js
index 608defe96d..357390a029 100644
--- a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this/_config.js
@@ -11,5 +11,7 @@ export default test({
 		return { tag: 123 };
 	},
 
-	error: '<svelte:element> expects "this" attribute to be a string.'
+	error:
+		'svelte_element_invalid_this_value\n' +
+		'The `this` prop on `<svelte:element>` must be a string, if defined'
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-non-prop/_config.js b/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-non-prop/_config.js
index 4561224e72..98c605c5b0 100644
--- a/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-non-prop/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-non-prop/_config.js
@@ -26,9 +26,9 @@ export default test({
 
 		const [p4, p5] = target.querySelectorAll('p');
 
-		assert.ok(!target.contains(p2), '<p> element should be removed');
+		assert.ok(!target.contains(p2), '`<p>` element should be removed');
 
-		assert.equal(p1, p4, 'first <p> element should be retained');
-		assert.equal(p3, p5, 'last <p> element should be retained');
+		assert.equal(p1, p4, 'first `<p>` element should be retained');
+		assert.equal(p3, p5, 'last `<p>` element should be retained');
 	}
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-object-identity/_config.js b/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-object-identity/_config.js
index 2c3e22f270..154554d079 100644
--- a/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-object-identity/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/each-block-keyed-object-identity/_config.js
@@ -27,7 +27,7 @@ export default test({
 
 		const [p3] = target.querySelectorAll('p');
 
-		assert.ok(!target.contains(p1), 'first <p> element should be removed');
-		assert.equal(p2, p3, 'second <p> element should be retained');
+		assert.ok(!target.contains(p1), 'first `<p>` element should be removed');
+		assert.equal(p2, p3, 'second `<p>` element should be retained');
 	}
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/each-block-keyed/_config.js b/packages/svelte/tests/runtime-legacy/samples/each-block-keyed/_config.js
index 229d305ae6..2ffab3334e 100644
--- a/packages/svelte/tests/runtime-legacy/samples/each-block-keyed/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/each-block-keyed/_config.js
@@ -29,7 +29,7 @@ export default test({
 
 		const [p3] = target.querySelectorAll('p');
 
-		assert.ok(!target.contains(p1), 'first <p> element should be removed');
-		assert.equal(p2, p3, 'second <p> element should be retained');
+		assert.ok(!target.contains(p1), 'first `<p>` element should be removed');
+		assert.equal(p2, p3, 'second `<p>` element should be retained');
 	}
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/keyed-each-dev-unique/_config.js b/packages/svelte/tests/runtime-legacy/samples/keyed-each-dev-unique/_config.js
index 8a3e7479b6..6e64245d86 100644
--- a/packages/svelte/tests/runtime-legacy/samples/keyed-each-dev-unique/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/keyed-each-dev-unique/_config.js
@@ -5,6 +5,5 @@ export default test({
 		dev: true
 	},
 
-	error:
-		"Cannot have duplicate keys in a keyed each: Keys at index 0 and 3 with value '1' are duplicates"
+	error: 'each_key_duplicate\nKeyed each block has duplicate key `1` at indexes 0 and 3'
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/store-dev-mode-error/_config.js b/packages/svelte/tests/runtime-legacy/samples/store-dev-mode-error/_config.js
index 3db8de9528..d74e70a74d 100644
--- a/packages/svelte/tests/runtime-legacy/samples/store-dev-mode-error/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/store-dev-mode-error/_config.js
@@ -9,5 +9,5 @@ export default test({
 		return { count: 0 };
 	},
 
-	error: "'count' is not a store with a 'subscribe' method"
+	error: 'store_invalid_shape\n`count` is not a store with a `subscribe` method'
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js b/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js
index 0f64998059..5f02769634 100644
--- a/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/export-binding/_config.js
@@ -5,6 +5,6 @@ export default test({
 		dev: true // to ensure we we catch the error
 	},
 	error:
-		'Component .../export-binding/counter/index.svelte has an export named increment that a consumer component is trying to access using bind:increment, which is disallowed. ' +
-		'Instead, use bind:this (e.g. <Counter bind:this={component} />) and then access the property on the bound component instance (e.g. component.increment).'
+		'bind_invalid_export\n' +
+		'Component .../export-binding/counter/index.svelte has an export named `increment` that a consumer component is trying to access using `bind:increment`, which is disallowed. Instead, use `bind:this` (e.g. `<Counter bind:this={component} />`) and then access the property on the bound component instance (e.g. `component.increment`)'
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/props-bound-fallback/_config.js b/packages/svelte/tests/runtime-runes/samples/props-bound-fallback/_config.js
index f382120e88..3839cb0250 100644
--- a/packages/svelte/tests/runtime-runes/samples/props-bound-fallback/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props-bound-fallback/_config.js
@@ -14,5 +14,5 @@ export default test({
 		assert.htmlEqual(target.innerHTML, `<button>1</button><span>1</span>`);
 	},
 
-	error: `ERR_SVELTE_BINDING_FALLBACK: Cannot pass undefined to bind:count because the property contains a fallback value. Pass a different value than undefined to count.`
+	error: 'props_invalid_value\nCannot do `bind:count={undefined}` when `count` has a fallback value'
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js b/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js
index fc6b46d488..3cc17bd7b3 100644
--- a/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props-not-bindable-spread/_config.js
@@ -4,9 +4,10 @@ export default test({
 	compileOptions: {
 		dev: true
 	},
+
+	html: '0',
+
 	error:
-		'A component is binding to property count of Counter.svelte (i.e. <Counter bind:count />). This is disallowed because the property was ' +
-		'not declared as bindable inside .../samples/props-not-bindable-spread/Counter.svelte. To mark a property as bindable, use the $bindable() rune ' +
-		'in Counter.svelte like this: `let { count = $bindable() } = $props()`',
-	html: `0`
+		'bind_not_bindable\n' +
+		'A component is attempting to bind to a non-bindable property `count` belonging to .../samples/props-not-bindable-spread/Counter.svelte (i.e. `<Counter bind:count={...}>`). To mark a property as bindable: `let { count = $bindable() } = $props()`'
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js b/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js
index b3dcc7f23e..34ab163829 100644
--- a/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/props-not-bindable/_config.js
@@ -4,9 +4,10 @@ export default test({
 	compileOptions: {
 		dev: true
 	},
+
+	html: '0',
+
 	error:
-		'A component is binding to property count of Counter.svelte (i.e. <Counter bind:count />). This is disallowed because the property was ' +
-		'not declared as bindable inside .../samples/props-not-bindable/Counter.svelte. To mark a property as bindable, use the $bindable() rune ' +
-		'in Counter.svelte like this: `let { count = $bindable() } = $props()`',
-	html: `0`
+		'bind_not_bindable\n' +
+		'A component is attempting to bind to a non-bindable property `count` belonging to .../samples/props-not-bindable/Counter.svelte (i.e. `<Counter bind:count={...}>`). To mark a property as bindable: `let { count = $bindable() } = $props()`'
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-1/_config.js b/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-1/_config.js
index 01c2773b32..f99c948dec 100644
--- a/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-1/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-1/_config.js
@@ -5,6 +5,7 @@ export default test({
 		dev: true
 	},
 	error:
+		'render_tag_invalid_argument\n' +
 		'The argument to `{@render ...}` must be a snippet function, not a component or some other kind of function. ' +
-		'If you want to dynamically render one snippet or another, use `$derived` and pass its result to `{@render ...}`.'
+		'If you want to dynamically render one snippet or another, use `$derived` and pass its result to `{@render ...}`'
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-2/_config.js b/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-2/_config.js
index 09bd836b0a..b549144bf5 100644
--- a/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-2/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-validation-error-2/_config.js
@@ -4,5 +4,5 @@ export default test({
 	compileOptions: {
 		dev: true
 	},
-	error: 'A snippet must be rendered with `{@render ...}`'
+	error: 'snippet_used_as_component\nA snippet must be rendered with `{@render ...}`'
 });
diff --git a/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json b/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json
index 8a21f3cfe3..dfdc3174b2 100644
--- a/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-alt-text/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<img> element should have an alt attribute",
+		"message": "`<img>` element should have an alt attribute",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<area> element should have an alt, aria-label or aria-labelledby attribute",
+		"message": "`<area>` element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 4,
 			"column": 1
@@ -25,7 +25,7 @@
 	},
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<object> element should have a title, aria-label or aria-labelledby attribute",
+		"message": "`<object>` element should have a title, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 7,
 			"column": 0
@@ -37,7 +37,7 @@
 	},
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
+		"message": "`<input type=\"image\">` element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 9,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json b/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
index 0227195c21..eff05f1b9a 100644
--- a/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_missing_content",
-		"message": "<a> element should have child content",
+		"message": "`<a>` element should have child content",
 		"start": {
 			"line": 1,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json b/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
index ba46443d65..bb59984bbe 100644
--- a/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<a> element should have an href attribute",
+		"message": "`<a>` element should have an href attribute",
 		"start": {
 			"line": 1,
 			"column": 11
diff --git a/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json b/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json
index 8ecb5cff24..5cb738794b 100644
--- a/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-anchor-is-valid/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<a> element should have an href attribute",
+		"message": "`<a>` element should have an href attribute",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -49,7 +49,7 @@
 	},
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<a> element should have an href attribute",
+		"message": "`<a>` element should have an href attribute",
 		"start": {
 			"line": 5,
 			"column": 0
@@ -61,7 +61,7 @@
 	},
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<a> element should have an href attribute",
+		"message": "`<a>` element should have an href attribute",
 		"start": {
 			"line": 6,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json
index 79532f4723..c317a0c6d0 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-activedescendant/warnings.json
@@ -5,7 +5,7 @@
 			"column": 36,
 			"line": 16
 		},
-		"message": "Elements with attribute aria-activedescendant should have tabindex value",
+		"message": "An element with an aria-activedescendant attribute should have a tabindex value",
 		"start": {
 			"column": 5,
 			"line": 16
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
index bdb7a976a2..94226b2f50 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-props/warnings.json
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
+		"message": "`<input type=\"image\">` element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"column": 0,
 			"line": 1
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json
index 3a56930a12..9016bc03d1 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-unsupported-element/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_aria_attributes",
-		"message": "<meta> should not have aria-* attributes",
+		"message": "`<meta>` should not have aria-* attributes",
 		"start": {
 			"line": 1,
 			"column": 6
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_misplaced_role",
-		"message": "<meta> should not have role attribute",
+		"message": "`<meta>` should not have role attribute",
 		"start": {
 			"line": 2,
 			"column": 6
diff --git a/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json b/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json
index a09a819de1..a4241476e0 100644
--- a/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-autocomplete-valid/warnings.json
@@ -5,7 +5,7 @@
 			"column": 31,
 			"line": 25
 		},
-		"message": "The value 'true' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
+		"message": "'true' is an invalid value for 'autocomplete' on `<input type=\"text\">`",
 		"start": {
 			"column": 19,
 			"line": 25
@@ -17,7 +17,7 @@
 			"column": 43,
 			"line": 26
 		},
-		"message": "The value 'incorrect' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
+		"message": "'incorrect' is an invalid value for 'autocomplete' on `<input type=\"text\">`",
 		"start": {
 			"column": 19,
 			"line": 26
@@ -29,7 +29,7 @@
 			"column": 42,
 			"line": 27
 		},
-		"message": "The value 'webauthn' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
+		"message": "'webauthn' is an invalid value for 'autocomplete' on `<input type=\"text\">`",
 		"start": {
 			"column": 19,
 			"line": 27
diff --git a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
index 49cfc849f1..00adecd2ea 100644
--- a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 13,
 			"column": 0
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 15,
 			"column": 0
@@ -25,7 +25,7 @@
 	},
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 18,
 			"column": 0
@@ -37,7 +37,7 @@
 	},
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 20,
 			"column": 0
@@ -49,7 +49,7 @@
 	},
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 22,
 			"column": 0
@@ -61,7 +61,7 @@
 	},
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 24,
 			"column": 0
@@ -73,7 +73,7 @@
 	},
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 26,
 			"column": 0
@@ -85,7 +85,7 @@
 	},
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"line": 28,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json b/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
index 64604d61a3..296d680777 100644
--- a/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_missing_content",
-		"message": "<h1> element should have child content",
+		"message": "`<h1>` element should have child content",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_hidden",
-		"message": "<h2> element should not be hidden",
+		"message": "`<h2>` element should not be hidden",
 		"start": {
 			"line": 2,
 			"column": 4
diff --git a/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json b/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json
index 85eca6e407..bcfc22aed8 100644
--- a/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-html-has-lang/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<html> element should have a lang attribute",
+		"message": "`<html>` element should have a lang attribute",
 		"start": {
 			"column": 0,
 			"line": 9
diff --git a/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json b/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json
index 2d80b9b502..323fbaf6a9 100644
--- a/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-iframe-has-title/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_missing_attribute",
-		"message": "<iframe> element should have a title attribute",
+		"message": "`<iframe>` element should have a title attribute",
 		"start": {
 			"line": 5,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json b/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json
index b2b0e4f33a..acba9e7318 100644
--- a/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_img_redundant_alt",
-		"message": "Screenreaders already announce <img> elements as an image.",
+		"message": "Screenreaders already announce `<img>` elements as an image.",
 		"end": {
 			"column": 49,
 			"line": 3
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_img_redundant_alt",
-		"message": "Screenreaders already announce <img> elements as an image.",
+		"message": "Screenreaders already announce `<img>` elements as an image.",
 		"end": {
 			"column": 45,
 			"line": 4
@@ -25,7 +25,7 @@
 	},
 	{
 		"code": "a11y_img_redundant_alt",
-		"message": "Screenreaders already announce <img> elements as an image.",
+		"message": "Screenreaders already announce `<img>` elements as an image.",
 		"end": {
 			"column": 52,
 			"line": 5
diff --git a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
index cfefede261..3ef72edc78 100644
--- a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
@@ -5,7 +5,7 @@
 			"column": 15,
 			"line": 2
 		},
-		"message": "<video> elements must have a <track kind=\"captions\">",
+		"message": "`<video>` elements must have a `<track kind=\"captions\">`",
 		"start": {
 			"column": 0,
 			"line": 2
@@ -17,7 +17,7 @@
 			"column": 24,
 			"line": 3
 		},
-		"message": "<video> elements must have a <track kind=\"captions\">",
+		"message": "`<video>` elements must have a `<track kind=\"captions\">`",
 		"start": {
 			"column": 0,
 			"line": 3
@@ -29,7 +29,7 @@
 			"column": 27,
 			"line": 5
 		},
-		"message": "<video> elements must have a <track kind=\"captions\">",
+		"message": "`<video>` elements must have a `<track kind=\"captions\">`",
 		"start": {
 			"column": 0,
 			"line": 5
@@ -41,7 +41,7 @@
 			"column": 35,
 			"line": 6
 		},
-		"message": "<video> elements must have a <track kind=\"captions\">",
+		"message": "`<video>` elements must have a `<track kind=\"captions\">`",
 		"start": {
 			"column": 0,
 			"line": 6
diff --git a/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json
index 1c4e362ec1..6b9a2a0974 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-distracting-elements/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_distracting_elements",
-		"message": "Avoid <marquee> elements",
+		"message": "Avoid `<marquee>` elements",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_distracting_elements",
-		"message": "Avoid <blink> elements",
+		"message": "Avoid `<blink>` elements",
 		"start": {
 			"line": 2,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
index 2cdbde0b9a..319278f3f5 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
@@ -5,7 +5,7 @@
 			"column": 38,
 			"line": 2
 		},
-		"message": "<a> cannot have role 'article'",
+		"message": "`<a>` cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 2
@@ -17,7 +17,7 @@
 			"column": 37,
 			"line": 3
 		},
-		"message": "<a> cannot have role 'banner'",
+		"message": "`<a>` cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 3
@@ -29,7 +29,7 @@
 			"column": 44,
 			"line": 4
 		},
-		"message": "<a> cannot have role 'complementary'",
+		"message": "`<a>` cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 4
@@ -41,7 +41,7 @@
 			"column": 34,
 			"line": 5
 		},
-		"message": "<a> cannot have role 'img'",
+		"message": "`<a>` cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 5
@@ -53,7 +53,7 @@
 			"column": 39,
 			"line": 6
 		},
-		"message": "<a> cannot have role 'listitem'",
+		"message": "`<a>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 6
@@ -65,7 +65,7 @@
 			"column": 35,
 			"line": 7
 		},
-		"message": "<a> cannot have role 'main'",
+		"message": "`<a>` cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 7
@@ -77,7 +77,7 @@
 			"column": 37,
 			"line": 8
 		},
-		"message": "<a> cannot have role 'region'",
+		"message": "`<a>` cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 8
@@ -89,7 +89,7 @@
 			"column": 38,
 			"line": 9
 		},
-		"message": "<a> cannot have role 'tooltip'",
+		"message": "`<a>` cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 9
@@ -101,7 +101,7 @@
 			"column": 38,
 			"line": 13
 		},
-		"message": "<button> cannot have role 'article'",
+		"message": "`<button>` cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 13
@@ -113,7 +113,7 @@
 			"column": 37,
 			"line": 14
 		},
-		"message": "<button> cannot have role 'banner'",
+		"message": "`<button>` cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 14
@@ -125,7 +125,7 @@
 			"column": 44,
 			"line": 15
 		},
-		"message": "<button> cannot have role 'complementary'",
+		"message": "`<button>` cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 15
@@ -137,7 +137,7 @@
 			"column": 34,
 			"line": 16
 		},
-		"message": "<button> cannot have role 'img'",
+		"message": "`<button>` cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 16
@@ -149,7 +149,7 @@
 			"column": 39,
 			"line": 17
 		},
-		"message": "<button> cannot have role 'listitem'",
+		"message": "`<button>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 17
@@ -161,7 +161,7 @@
 			"column": 35,
 			"line": 18
 		},
-		"message": "<button> cannot have role 'main'",
+		"message": "`<button>` cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 18
@@ -173,7 +173,7 @@
 			"column": 37,
 			"line": 19
 		},
-		"message": "<button> cannot have role 'region'",
+		"message": "`<button>` cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 19
@@ -185,7 +185,7 @@
 			"column": 38,
 			"line": 20
 		},
-		"message": "<button> cannot have role 'tooltip'",
+		"message": "`<button>` cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 20
@@ -209,7 +209,7 @@
 			"column": 24,
 			"line": 24
 		},
-		"message": "<input> cannot have role 'article'",
+		"message": "`<input>` cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 24
@@ -221,7 +221,7 @@
 			"column": 23,
 			"line": 25
 		},
-		"message": "<input> cannot have role 'banner'",
+		"message": "`<input>` cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 25
@@ -233,7 +233,7 @@
 			"column": 30,
 			"line": 26
 		},
-		"message": "<input> cannot have role 'complementary'",
+		"message": "`<input>` cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 26
@@ -245,7 +245,7 @@
 			"column": 20,
 			"line": 27
 		},
-		"message": "<input> cannot have role 'img'",
+		"message": "`<input>` cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 27
@@ -257,7 +257,7 @@
 			"column": 25,
 			"line": 28
 		},
-		"message": "<input> cannot have role 'listitem'",
+		"message": "`<input>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 28
@@ -269,7 +269,7 @@
 			"column": 21,
 			"line": 29
 		},
-		"message": "<input> cannot have role 'main'",
+		"message": "`<input>` cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 29
@@ -281,7 +281,7 @@
 			"column": 23,
 			"line": 30
 		},
-		"message": "<input> cannot have role 'region'",
+		"message": "`<input>` cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 30
@@ -293,7 +293,7 @@
 			"column": 24,
 			"line": 31
 		},
-		"message": "<input> cannot have role 'tooltip'",
+		"message": "`<input>` cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 31
@@ -305,7 +305,7 @@
 			"column": 32,
 			"line": 35
 		},
-		"message": "<select> cannot have role 'article'",
+		"message": "`<select>` cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 35
@@ -317,7 +317,7 @@
 			"column": 31,
 			"line": 36
 		},
-		"message": "<select> cannot have role 'banner'",
+		"message": "`<select>` cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 36
@@ -329,7 +329,7 @@
 			"column": 38,
 			"line": 37
 		},
-		"message": "<select> cannot have role 'complementary'",
+		"message": "`<select>` cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 37
@@ -341,7 +341,7 @@
 			"column": 28,
 			"line": 38
 		},
-		"message": "<select> cannot have role 'img'",
+		"message": "`<select>` cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 38
@@ -353,7 +353,7 @@
 			"column": 33,
 			"line": 39
 		},
-		"message": "<select> cannot have role 'listitem'",
+		"message": "`<select>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 39
@@ -365,7 +365,7 @@
 			"column": 29,
 			"line": 40
 		},
-		"message": "<select> cannot have role 'main'",
+		"message": "`<select>` cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 40
@@ -377,7 +377,7 @@
 			"column": 31,
 			"line": 41
 		},
-		"message": "<select> cannot have role 'region'",
+		"message": "`<select>` cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 41
@@ -389,7 +389,7 @@
 			"column": 32,
 			"line": 42
 		},
-		"message": "<select> cannot have role 'tooltip'",
+		"message": "`<select>` cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 42
@@ -401,7 +401,7 @@
 			"column": 36,
 			"line": 46
 		},
-		"message": "<textarea> cannot have role 'article'",
+		"message": "`<textarea>` cannot have role 'article'",
 		"start": {
 			"column": 0,
 			"line": 46
@@ -413,7 +413,7 @@
 			"column": 35,
 			"line": 47
 		},
-		"message": "<textarea> cannot have role 'banner'",
+		"message": "`<textarea>` cannot have role 'banner'",
 		"start": {
 			"column": 0,
 			"line": 47
@@ -425,7 +425,7 @@
 			"column": 42,
 			"line": 48
 		},
-		"message": "<textarea> cannot have role 'complementary'",
+		"message": "`<textarea>` cannot have role 'complementary'",
 		"start": {
 			"column": 0,
 			"line": 48
@@ -437,7 +437,7 @@
 			"column": 32,
 			"line": 49
 		},
-		"message": "<textarea> cannot have role 'img'",
+		"message": "`<textarea>` cannot have role 'img'",
 		"start": {
 			"column": 0,
 			"line": 49
@@ -449,7 +449,7 @@
 			"column": 37,
 			"line": 50
 		},
-		"message": "<textarea> cannot have role 'listitem'",
+		"message": "`<textarea>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 50
@@ -461,7 +461,7 @@
 			"column": 33,
 			"line": 51
 		},
-		"message": "<textarea> cannot have role 'main'",
+		"message": "`<textarea>` cannot have role 'main'",
 		"start": {
 			"column": 0,
 			"line": 51
@@ -473,7 +473,7 @@
 			"column": 35,
 			"line": 52
 		},
-		"message": "<textarea> cannot have role 'region'",
+		"message": "`<textarea>` cannot have role 'region'",
 		"start": {
 			"column": 0,
 			"line": 52
@@ -485,7 +485,7 @@
 			"column": 36,
 			"line": 53
 		},
-		"message": "<textarea> cannot have role 'tooltip'",
+		"message": "`<textarea>` cannot have role 'tooltip'",
 		"start": {
 			"column": 0,
 			"line": 53
@@ -641,7 +641,7 @@
 			"column": 37,
 			"line": 143
 		},
-		"message": "<menuitem> cannot have role 'listitem'",
+		"message": "`<menuitem>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 143
@@ -653,7 +653,7 @@
 			"column": 45,
 			"line": 144
 		},
-		"message": "<option> cannot have role 'listitem'",
+		"message": "`<option>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 144
@@ -665,7 +665,7 @@
 			"column": 45,
 			"line": 145
 		},
-		"message": "<select> cannot have role 'listitem'",
+		"message": "`<select>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 145
@@ -677,7 +677,7 @@
 			"column": 49,
 			"line": 146
 		},
-		"message": "<textarea> cannot have role 'listitem'",
+		"message": "`<textarea>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 146
@@ -689,7 +689,7 @@
 			"column": 25,
 			"line": 147
 		},
-		"message": "<tr> cannot have role 'listitem'",
+		"message": "`<tr>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 147
@@ -701,7 +701,7 @@
 			"column": 35,
 			"line": 148
 		},
-		"message": "<summary> cannot have role 'listitem'",
+		"message": "`<summary>` cannot have role 'listitem'",
 		"start": {
 			"column": 0,
 			"line": 148
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
index df22c49b9f..e9b038c823 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
@@ -5,7 +5,7 @@
 			"column": 51,
 			"line": 10
 		},
-		"message": "Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element `<div>` should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 10
@@ -17,7 +17,7 @@
 			"column": 58,
 			"line": 11
 		},
-		"message": "Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element `<h1>` should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 11
@@ -29,7 +29,7 @@
 			"column": 50,
 			"line": 12
 		},
-		"message": "Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element `<h1>` should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 12
@@ -41,7 +41,7 @@
 			"column": 30,
 			"line": 13
 		},
-		"message": "Non-interactive element <p> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element `<p>` should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 13
@@ -53,7 +53,7 @@
 			"column": 50,
 			"line": 14
 		},
-		"message": "Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
+		"message": "Non-interactive element `<div>` should not be assigned mouse or keyboard event listeners.",
 		"start": {
 			"column": 0,
 			"line": 14
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
index 57eb3d9028..e8d54ee9e5 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <article> cannot have interactive role 'button'",
+		"message": "Non-interactive element `<article>` cannot have interactive role 'button'",
 		"start": {
 			"line": 2,
 			"column": 0
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <aside> cannot have interactive role 'checkbox'",
+		"message": "Non-interactive element `<aside>` cannot have interactive role 'checkbox'",
 		"start": {
 			"line": 3,
 			"column": 0
@@ -25,7 +25,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <blockquote> cannot have interactive role 'columnheader'",
+		"message": "Non-interactive element `<blockquote>` cannot have interactive role 'columnheader'",
 		"start": {
 			"line": 4,
 			"column": 0
@@ -37,7 +37,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <br> cannot have interactive role 'grid'",
+		"message": "Non-interactive element `<br>` cannot have interactive role 'grid'",
 		"start": {
 			"line": 5,
 			"column": 0
@@ -49,7 +49,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <caption> cannot have interactive role 'gridcell'",
+		"message": "Non-interactive element `<caption>` cannot have interactive role 'gridcell'",
 		"start": {
 			"line": 6,
 			"column": 0
@@ -61,7 +61,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <dd> cannot have interactive role 'link'",
+		"message": "Non-interactive element `<dd>` cannot have interactive role 'link'",
 		"start": {
 			"line": 7,
 			"column": 0
@@ -73,7 +73,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <details> cannot have interactive role 'listbox'",
+		"message": "Non-interactive element `<details>` cannot have interactive role 'listbox'",
 		"start": {
 			"line": 8,
 			"column": 0
@@ -85,7 +85,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <dir> cannot have interactive role 'menu'",
+		"message": "Non-interactive element `<dir>` cannot have interactive role 'menu'",
 		"start": {
 			"line": 9,
 			"column": 0
@@ -97,7 +97,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <dl> cannot have interactive role 'menubar'",
+		"message": "Non-interactive element `<dl>` cannot have interactive role 'menubar'",
 		"start": {
 			"line": 10,
 			"column": 0
@@ -109,7 +109,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <dfn> cannot have interactive role 'menuitem'",
+		"message": "Non-interactive element `<dfn>` cannot have interactive role 'menuitem'",
 		"start": {
 			"line": 11,
 			"column": 0
@@ -121,7 +121,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <dt> cannot have interactive role 'menuitemcheckbox'",
+		"message": "Non-interactive element `<dt>` cannot have interactive role 'menuitemcheckbox'",
 		"start": {
 			"line": 12,
 			"column": 0
@@ -133,7 +133,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <fieldset> cannot have interactive role 'menuitemradio'",
+		"message": "Non-interactive element `<fieldset>` cannot have interactive role 'menuitemradio'",
 		"start": {
 			"line": 13,
 			"column": 0
@@ -145,7 +145,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <figcaption> cannot have interactive role 'menuitemradio'",
+		"message": "Non-interactive element `<figcaption>` cannot have interactive role 'menuitemradio'",
 		"start": {
 			"line": 15,
 			"column": 1
@@ -157,7 +157,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <figure> cannot have interactive role 'option'",
+		"message": "Non-interactive element `<figure>` cannot have interactive role 'option'",
 		"start": {
 			"line": 17,
 			"column": 0
@@ -169,7 +169,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <footer> cannot have interactive role 'radio'",
+		"message": "Non-interactive element `<footer>` cannot have interactive role 'radio'",
 		"start": {
 			"line": 18,
 			"column": 0
@@ -181,7 +181,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <form> cannot have interactive role 'radiogroup'",
+		"message": "Non-interactive element `<form>` cannot have interactive role 'radiogroup'",
 		"start": {
 			"line": 19,
 			"column": 0
@@ -193,7 +193,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <h1> cannot have interactive role 'rowheader'",
+		"message": "Non-interactive element `<h1>` cannot have interactive role 'rowheader'",
 		"start": {
 			"line": 20,
 			"column": 0
@@ -205,7 +205,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <h2> cannot have interactive role 'scrollbar'",
+		"message": "Non-interactive element `<h2>` cannot have interactive role 'scrollbar'",
 		"start": {
 			"line": 21,
 			"column": 0
@@ -217,7 +217,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <h3> cannot have interactive role 'searchbox'",
+		"message": "Non-interactive element `<h3>` cannot have interactive role 'searchbox'",
 		"start": {
 			"line": 22,
 			"column": 0
@@ -229,7 +229,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <h4> cannot have interactive role 'slider'",
+		"message": "Non-interactive element `<h4>` cannot have interactive role 'slider'",
 		"start": {
 			"line": 23,
 			"column": 0
@@ -241,7 +241,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <h5> cannot have interactive role 'spinbutton'",
+		"message": "Non-interactive element `<h5>` cannot have interactive role 'spinbutton'",
 		"start": {
 			"line": 24,
 			"column": 0
@@ -253,7 +253,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <h6> cannot have interactive role 'switch'",
+		"message": "Non-interactive element `<h6>` cannot have interactive role 'switch'",
 		"start": {
 			"line": 25,
 			"column": 0
@@ -265,7 +265,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <hr> cannot have interactive role 'tab'",
+		"message": "Non-interactive element `<hr>` cannot have interactive role 'tab'",
 		"start": {
 			"line": 26,
 			"column": 0
@@ -277,7 +277,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <img> cannot have interactive role 'tabpanel'",
+		"message": "Non-interactive element `<img>` cannot have interactive role 'tabpanel'",
 		"start": {
 			"line": 27,
 			"column": 0
@@ -289,7 +289,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <label> cannot have interactive role 'textbox'",
+		"message": "Non-interactive element `<label>` cannot have interactive role 'textbox'",
 		"start": {
 			"line": 28,
 			"column": 0
@@ -313,7 +313,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <legend> cannot have interactive role 'toolbar'",
+		"message": "Non-interactive element `<legend>` cannot have interactive role 'toolbar'",
 		"start": {
 			"line": 29,
 			"column": 0
@@ -325,7 +325,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <li> cannot have interactive role 'tree'",
+		"message": "Non-interactive element `<li>` cannot have interactive role 'tree'",
 		"start": {
 			"line": 30,
 			"column": 0
@@ -337,7 +337,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <main> cannot have interactive role 'treegrid'",
+		"message": "Non-interactive element `<main>` cannot have interactive role 'treegrid'",
 		"start": {
 			"line": 31,
 			"column": 0
@@ -349,7 +349,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <mark> cannot have interactive role 'treeitem'",
+		"message": "Non-interactive element `<mark>` cannot have interactive role 'treeitem'",
 		"start": {
 			"line": 32,
 			"column": 0
@@ -361,7 +361,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <marquee> cannot have interactive role 'doc-backlink'",
+		"message": "Non-interactive element `<marquee>` cannot have interactive role 'doc-backlink'",
 		"start": {
 			"line": 33,
 			"column": 0
@@ -373,7 +373,7 @@
 	},
 	{
 		"code": "a11y_distracting_elements",
-		"message": "Avoid <marquee> elements",
+		"message": "Avoid `<marquee>` elements",
 		"start": {
 			"line": 33,
 			"column": 0
@@ -385,7 +385,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <menu> cannot have interactive role 'doc-biblioref'",
+		"message": "Non-interactive element `<menu>` cannot have interactive role 'doc-biblioref'",
 		"start": {
 			"line": 34,
 			"column": 0
@@ -397,7 +397,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <meter> cannot have interactive role 'doc-glossref'",
+		"message": "Non-interactive element `<meter>` cannot have interactive role 'doc-glossref'",
 		"start": {
 			"line": 35,
 			"column": 0
@@ -409,7 +409,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <nav> cannot have interactive role 'doc-noteref'",
+		"message": "Non-interactive element `<nav>` cannot have interactive role 'doc-noteref'",
 		"start": {
 			"line": 36,
 			"column": 0
@@ -421,7 +421,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <ol> cannot have interactive role 'button'",
+		"message": "Non-interactive element `<ol>` cannot have interactive role 'button'",
 		"start": {
 			"line": 37,
 			"column": 0
@@ -433,7 +433,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <optgroup> cannot have interactive role 'treeitem'",
+		"message": "Non-interactive element `<optgroup>` cannot have interactive role 'treeitem'",
 		"start": {
 			"line": 38,
 			"column": 0
@@ -445,7 +445,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <output> cannot have interactive role 'treegrid'",
+		"message": "Non-interactive element `<output>` cannot have interactive role 'treegrid'",
 		"start": {
 			"line": 39,
 			"column": 0
@@ -457,7 +457,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <p> cannot have interactive role 'columnheader'",
+		"message": "Non-interactive element `<p>` cannot have interactive role 'columnheader'",
 		"start": {
 			"line": 40,
 			"column": 0
@@ -469,7 +469,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <pre> cannot have interactive role 'tree'",
+		"message": "Non-interactive element `<pre>` cannot have interactive role 'tree'",
 		"start": {
 			"line": 41,
 			"column": 0
@@ -481,7 +481,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <progress> cannot have interactive role 'combobox'",
+		"message": "Non-interactive element `<progress>` cannot have interactive role 'combobox'",
 		"start": {
 			"line": 42,
 			"column": 0
@@ -493,7 +493,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <ruby> cannot have interactive role 'toolbar'",
+		"message": "Non-interactive element `<ruby>` cannot have interactive role 'toolbar'",
 		"start": {
 			"line": 43,
 			"column": 0
@@ -505,7 +505,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <section> cannot have interactive role 'radio'",
+		"message": "Non-interactive element `<section>` cannot have interactive role 'radio'",
 		"start": {
 			"line": 44,
 			"column": 0
@@ -517,7 +517,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <table> cannot have interactive role 'menu'",
+		"message": "Non-interactive element `<table>` cannot have interactive role 'menu'",
 		"start": {
 			"line": 45,
 			"column": 0
@@ -529,7 +529,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <tbody> cannot have interactive role 'searchbox'",
+		"message": "Non-interactive element `<tbody>` cannot have interactive role 'searchbox'",
 		"start": {
 			"line": 46,
 			"column": 0
@@ -541,7 +541,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <tfoot> cannot have interactive role 'listbox'",
+		"message": "Non-interactive element `<tfoot>` cannot have interactive role 'listbox'",
 		"start": {
 			"line": 47,
 			"column": 0
@@ -553,7 +553,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <thead> cannot have interactive role 'slider'",
+		"message": "Non-interactive element `<thead>` cannot have interactive role 'slider'",
 		"start": {
 			"line": 48,
 			"column": 0
@@ -565,7 +565,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <time> cannot have interactive role 'doc-backlink'",
+		"message": "Non-interactive element `<time>` cannot have interactive role 'doc-backlink'",
 		"start": {
 			"line": 49,
 			"column": 0
@@ -577,7 +577,7 @@
 	},
 	{
 		"code": "a11y_no_noninteractive_element_to_interactive_role",
-		"message": "Non-interactive element <ul> cannot have interactive role 'spinbutton'",
+		"message": "Non-interactive element `<ul>` cannot have interactive role 'spinbutton'",
 		"start": {
 			"line": 50,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
index 93602ff618..ab4b58a839 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
@@ -5,7 +5,7 @@
 			"column": 33,
 			"line": 17
 		},
-		"message": "<div> with a keydown handler must have an ARIA role",
+		"message": "`<div>` with a keydown handler must have an ARIA role",
 		"start": {
 			"column": 0,
 			"line": 17
@@ -17,7 +17,7 @@
 			"column": 76,
 			"line": 19
 		},
-		"message": "<a> with a mousedown or mouseup handler must have an ARIA role",
+		"message": "`<a>` with a mousedown or mouseup handler must have an ARIA role",
 		"start": {
 			"column": 0,
 			"line": 19
diff --git a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
index 176f15711b..15b0cf1ac0 100644
--- a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
@@ -5,7 +5,7 @@
 			"column": 19,
 			"line": 2
 		},
-		"message": "The attribute 'aria-setsize' is not supported by the role 'link'. This role is implicit on the element <a>",
+		"message": "The attribute 'aria-setsize' is not supported by the role 'link'. This role is implicit on the element `<a>`",
 		"start": {
 			"column": 3,
 			"line": 2
@@ -17,7 +17,7 @@
 			"column": 18,
 			"line": 3
 		},
-		"message": "The attribute 'aria-pressed' is not supported by the role 'link'. This role is implicit on the element <area>",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'link'. This role is implicit on the element `<area>`",
 		"start": {
 			"column": 6,
 			"line": 3
@@ -29,7 +29,7 @@
 			"column": 35,
 			"line": 4
 		},
-		"message": "The attribute 'aria-autocomplete' is not supported by the role 'article'. This role is implicit on the element <article>",
+		"message": "The attribute 'aria-autocomplete' is not supported by the role 'article'. This role is implicit on the element `<article>`",
 		"start": {
 			"column": 9,
 			"line": 4
@@ -41,7 +41,7 @@
 			"column": 17,
 			"line": 5
 		},
-		"message": "The attribute 'aria-modal' is not supported by the role 'complementary'. This role is implicit on the element <aside>",
+		"message": "The attribute 'aria-modal' is not supported by the role 'complementary'. This role is implicit on the element `<aside>`",
 		"start": {
 			"column": 7,
 			"line": 5
@@ -53,7 +53,7 @@
 			"column": 18,
 			"line": 6
 		},
-		"message": "The attribute 'aria-invalid' is not supported by the role 'document'. This role is implicit on the element <body>",
+		"message": "The attribute 'aria-invalid' is not supported by the role 'document'. This role is implicit on the element `<body>`",
 		"start": {
 			"column": 6,
 			"line": 6
@@ -65,7 +65,7 @@
 			"column": 25,
 			"line": 7
 		},
-		"message": "The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <button>",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element `<button>`",
 		"start": {
 			"column": 8,
 			"line": 7
@@ -77,7 +77,7 @@
 			"column": 27,
 			"line": 8
 		},
-		"message": "The attribute 'aria-valuenow' is not supported by the role 'listbox'. This role is implicit on the element <datalist>",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'listbox'. This role is implicit on the element `<datalist>`",
 		"start": {
 			"column": 10,
 			"line": 8
@@ -89,7 +89,7 @@
 			"column": 21,
 			"line": 9
 		},
-		"message": "The attribute 'aria-rowindex' is not supported by the role 'definition'. This role is implicit on the element <dd>",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'definition'. This role is implicit on the element `<dd>`",
 		"start": {
 			"column": 4,
 			"line": 9
@@ -101,7 +101,7 @@
 			"column": 22,
 			"line": 10
 		},
-		"message": "The attribute 'aria-colcount' is not supported by the role 'term'. This role is implicit on the element <dfn>",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'term'. This role is implicit on the element `<dfn>`",
 		"start": {
 			"column": 5,
 			"line": 10
@@ -113,7 +113,7 @@
 			"column": 25,
 			"line": 11
 		},
-		"message": "The attribute 'aria-posinset' is not supported by the role 'dialog'. This role is implicit on the element <dialog>",
+		"message": "The attribute 'aria-posinset' is not supported by the role 'dialog'. This role is implicit on the element `<dialog>`",
 		"start": {
 			"column": 8,
 			"line": 11
@@ -125,7 +125,7 @@
 			"column": 37,
 			"line": 12
 		},
-		"message": "The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <details>",
+		"message": "The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element `<details>`",
 		"start": {
 			"column": 9,
 			"line": 12
@@ -137,7 +137,7 @@
 			"column": 21,
 			"line": 13
 		},
-		"message": "The attribute 'aria-valuemin' is not supported by the role 'term'. This role is implicit on the element <dt>",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'term'. This role is implicit on the element `<dt>`",
 		"start": {
 			"column": 4,
 			"line": 13
@@ -149,7 +149,7 @@
 			"column": 38,
 			"line": 14
 		},
-		"message": "The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <fieldset>",
+		"message": "The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element `<fieldset>`",
 		"start": {
 			"column": 10,
 			"line": 14
@@ -161,7 +161,7 @@
 			"column": 19,
 			"line": 15
 		},
-		"message": "The attribute 'aria-disabled' is not supported by the role 'form'. This role is implicit on the element <form>",
+		"message": "The attribute 'aria-disabled' is not supported by the role 'form'. This role is implicit on the element `<form>`",
 		"start": {
 			"column": 6,
 			"line": 15
@@ -173,7 +173,7 @@
 			"column": 17,
 			"line": 16
 		},
-		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h1>",
+		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element `<h1>`",
 		"start": {
 			"column": 4,
 			"line": 16
@@ -185,7 +185,7 @@
 			"column": 17,
 			"line": 17
 		},
-		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h2>",
+		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element `<h2>`",
 		"start": {
 			"column": 4,
 			"line": 17
@@ -197,7 +197,7 @@
 			"column": 17,
 			"line": 18
 		},
-		"message": "The attribute 'aria-expanded' is not supported by the role 'heading'. This role is implicit on the element <h3>",
+		"message": "The attribute 'aria-expanded' is not supported by the role 'heading'. This role is implicit on the element `<h3>`",
 		"start": {
 			"column": 4,
 			"line": 18
@@ -209,7 +209,7 @@
 			"column": 21,
 			"line": 19
 		},
-		"message": "The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h4>",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element `<h4>`",
 		"start": {
 			"column": 4,
 			"line": 19
@@ -221,7 +221,7 @@
 			"column": 17,
 			"line": 20
 		},
-		"message": "The attribute 'aria-readonly' is not supported by the role 'heading'. This role is implicit on the element <h5>",
+		"message": "The attribute 'aria-readonly' is not supported by the role 'heading'. This role is implicit on the element `<h5>`",
 		"start": {
 			"column": 4,
 			"line": 20
@@ -233,7 +233,7 @@
 			"column": 21,
 			"line": 21
 		},
-		"message": "The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h6>",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element `<h6>`",
 		"start": {
 			"column": 4,
 			"line": 21
@@ -245,7 +245,7 @@
 			"column": 17,
 			"line": 22
 		},
-		"message": "The attribute 'aria-required' is not supported by the role 'separator'. This role is implicit on the element <hr>",
+		"message": "The attribute 'aria-required' is not supported by the role 'separator'. This role is implicit on the element `<hr>`",
 		"start": {
 			"column": 4,
 			"line": 22
@@ -257,7 +257,7 @@
 			"column": 19,
 			"line": 23
 		},
-		"message": "The attribute 'aria-level' is not supported by the role 'img'. This role is implicit on the element <img>",
+		"message": "The attribute 'aria-level' is not supported by the role 'img'. This role is implicit on the element `<img>`",
 		"start": {
 			"column": 5,
 			"line": 23
@@ -269,7 +269,7 @@
 			"column": 17,
 			"line": 24
 		},
-		"message": "The attribute 'aria-required' is not supported by the role 'listitem'. This role is implicit on the element <li>",
+		"message": "The attribute 'aria-required' is not supported by the role 'listitem'. This role is implicit on the element `<li>`",
 		"start": {
 			"column": 4,
 			"line": 24
@@ -281,7 +281,7 @@
 			"column": 23,
 			"line": 25
 		},
-		"message": "The attribute 'aria-rowcount' is not supported by the role 'link'. This role is implicit on the element <link>",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'link'. This role is implicit on the element `<link>`",
 		"start": {
 			"column": 6,
 			"line": 25
@@ -293,7 +293,7 @@
 			"column": 23,
 			"line": 26
 		},
-		"message": "The attribute 'aria-valuemin' is not supported by the role 'list'. This role is implicit on the element <menu>",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'list'. This role is implicit on the element `<menu>`",
 		"start": {
 			"column": 6,
 			"line": 26
@@ -305,7 +305,7 @@
 			"column": 23,
 			"line": 27
 		},
-		"message": "The attribute 'aria-colspan' is not supported by the role 'progressbar'. This role is implicit on the element <meter>",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'progressbar'. This role is implicit on the element `<meter>`",
 		"start": {
 			"column": 7,
 			"line": 27
@@ -317,7 +317,7 @@
 			"column": 22,
 			"line": 28
 		},
-		"message": "The attribute 'aria-valuetext' is not supported by the role 'navigation'. This role is implicit on the element <nav>",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'navigation'. This role is implicit on the element `<nav>`",
 		"start": {
 			"column": 5,
 			"line": 28
@@ -329,7 +329,7 @@
 			"column": 20,
 			"line": 29
 		},
-		"message": "The attribute 'aria-sort' is not supported by the role 'list'. This role is implicit on the element <ol>",
+		"message": "The attribute 'aria-sort' is not supported by the role 'list'. This role is implicit on the element `<ol>`",
 		"start": {
 			"column": 4,
 			"line": 29
@@ -341,7 +341,7 @@
 			"column": 20,
 			"line": 30
 		},
-		"message": "The attribute 'aria-invalid' is not supported by the role 'option'. This role is implicit on the element <option>",
+		"message": "The attribute 'aria-invalid' is not supported by the role 'option'. This role is implicit on the element `<option>`",
 		"start": {
 			"column": 8,
 			"line": 30
@@ -353,7 +353,7 @@
 			"column": 26,
 			"line": 31
 		},
-		"message": "The attribute 'aria-sort' is not supported by the role 'group'. This role is implicit on the element <optgroup>",
+		"message": "The attribute 'aria-sort' is not supported by the role 'group'. This role is implicit on the element `<optgroup>`",
 		"start": {
 			"column": 10,
 			"line": 31
@@ -365,7 +365,7 @@
 			"column": 22,
 			"line": 32
 		},
-		"message": "The attribute 'aria-multiline' is not supported by the role 'status'. This role is implicit on the element <output>",
+		"message": "The attribute 'aria-multiline' is not supported by the role 'status'. This role is implicit on the element `<output>`",
 		"start": {
 			"column": 8,
 			"line": 32
@@ -377,7 +377,7 @@
 			"column": 27,
 			"line": 33
 		},
-		"message": "The attribute 'aria-rowcount' is not supported by the role 'progressbar'. This role is implicit on the element <progress>",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'progressbar'. This role is implicit on the element `<progress>`",
 		"start": {
 			"column": 10,
 			"line": 33
@@ -389,7 +389,7 @@
 			"column": 21,
 			"line": 34
 		},
-		"message": "The attribute 'aria-invalid' is not supported by the role 'region'. This role is implicit on the element <section>",
+		"message": "The attribute 'aria-invalid' is not supported by the role 'region'. This role is implicit on the element `<section>`",
 		"start": {
 			"column": 9,
 			"line": 34
@@ -401,7 +401,7 @@
 			"column": 26,
 			"line": 35
 		},
-		"message": "The attribute 'aria-rowcount' is not supported by the role 'button'. This role is implicit on the element <summary>",
+		"message": "The attribute 'aria-rowcount' is not supported by the role 'button'. This role is implicit on the element `<summary>`",
 		"start": {
 			"column": 9,
 			"line": 35
@@ -413,7 +413,7 @@
 			"column": 23,
 			"line": 36
 		},
-		"message": "The attribute 'aria-colspan' is not supported by the role 'rowgroup'. This role is implicit on the element <tbody>",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'rowgroup'. This role is implicit on the element `<tbody>`",
 		"start": {
 			"column": 7,
 			"line": 36
@@ -425,7 +425,7 @@
 			"column": 27,
 			"line": 37
 		},
-		"message": "The attribute 'aria-valuenow' is not supported by the role 'textbox'. This role is implicit on the element <textarea>",
+		"message": "The attribute 'aria-valuenow' is not supported by the role 'textbox'. This role is implicit on the element `<textarea>`",
 		"start": {
 			"column": 10,
 			"line": 37
@@ -437,7 +437,7 @@
 			"column": 20,
 			"line": 38
 		},
-		"message": "The attribute 'aria-required' is not supported by the role 'rowgroup'. This role is implicit on the element <tfoot>",
+		"message": "The attribute 'aria-required' is not supported by the role 'rowgroup'. This role is implicit on the element `<tfoot>`",
 		"start": {
 			"column": 7,
 			"line": 38
@@ -449,7 +449,7 @@
 			"column": 24,
 			"line": 39
 		},
-		"message": "The attribute 'aria-valuemin' is not supported by the role 'rowgroup'. This role is implicit on the element <thead>",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'rowgroup'. This role is implicit on the element `<thead>`",
 		"start": {
 			"column": 7,
 			"line": 39
@@ -461,7 +461,7 @@
 			"column": 16,
 			"line": 40
 		},
-		"message": "The attribute 'aria-pressed' is not supported by the role 'row'. This role is implicit on the element <tr>",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'row'. This role is implicit on the element `<tr>`",
 		"start": {
 			"column": 4,
 			"line": 40
@@ -473,7 +473,7 @@
 			"column": 24,
 			"line": 41
 		},
-		"message": "The attribute 'aria-multiselectable' is not supported by the role 'list'. This role is implicit on the element <ul>",
+		"message": "The attribute 'aria-multiselectable' is not supported by the role 'list'. This role is implicit on the element `<ul>`",
 		"start": {
 			"column": 4,
 			"line": 41
@@ -1925,7 +1925,7 @@
 			"column": 35,
 			"line": 166
 		},
-		"message": "The attribute 'aria-rowspan' is not supported by the role 'textbox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-rowspan' is not supported by the role 'textbox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 19,
 			"line": 166
@@ -1937,7 +1937,7 @@
 			"column": 30,
 			"line": 167
 		},
-		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 18,
 			"line": 167
@@ -1949,7 +1949,7 @@
 			"column": 32,
 			"line": 168
 		},
-		"message": "The attribute 'aria-level' is not supported by the role 'textbox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-level' is not supported by the role 'textbox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 18,
 			"line": 168
@@ -1961,7 +1961,7 @@
 			"column": 32,
 			"line": 169
 		},
-		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 20,
 			"line": 169
@@ -1973,7 +1973,7 @@
 			"column": 42,
 			"line": 170
 		},
-		"message": "The attribute 'aria-valuetext' is not supported by the role 'searchbox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'searchbox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 21,
 			"line": 170
@@ -1985,7 +1985,7 @@
 			"column": 50,
 			"line": 171
 		},
-		"message": "The attribute 'aria-valuemin' is not supported by the role 'combobox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-valuemin' is not supported by the role 'combobox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 33,
 			"line": 171
@@ -1997,7 +1997,7 @@
 			"column": 48,
 			"line": 172
 		},
-		"message": "The attribute 'aria-colspan' is not supported by the role 'combobox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-colspan' is not supported by the role 'combobox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 32,
 			"line": 172
@@ -2009,7 +2009,7 @@
 			"column": 49,
 			"line": 173
 		},
-		"message": "The attribute 'aria-posinset' is not supported by the role 'combobox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-posinset' is not supported by the role 'combobox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 32,
 			"line": 173
@@ -2021,7 +2021,7 @@
 			"column": 44,
 			"line": 174
 		},
-		"message": "The attribute 'aria-modal' is not supported by the role 'combobox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-modal' is not supported by the role 'combobox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 34,
 			"line": 174
@@ -2033,7 +2033,7 @@
 			"column": 52,
 			"line": 175
 		},
-		"message": "The attribute 'aria-rowindex' is not supported by the role 'combobox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'combobox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 35,
 			"line": 175
@@ -2045,7 +2045,7 @@
 			"column": 53,
 			"line": 176
 		},
-		"message": "The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 36,
 			"line": 176
@@ -2057,7 +2057,7 @@
 			"column": 30,
 			"line": 177
 		},
-		"message": "The attribute 'aria-modal' is not supported by the role 'button'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-modal' is not supported by the role 'button'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 20,
 			"line": 177
@@ -2069,7 +2069,7 @@
 			"column": 51,
 			"line": 178
 		},
-		"message": "The attribute 'aria-placeholder' is not supported by the role 'button'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-placeholder' is not supported by the role 'button'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 21,
 			"line": 178
@@ -2081,7 +2081,7 @@
 			"column": 40,
 			"line": 179
 		},
-		"message": "The attribute 'aria-rowindex' is not supported by the role 'checkbox'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-rowindex' is not supported by the role 'checkbox'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 23,
 			"line": 179
@@ -2093,7 +2093,7 @@
 			"column": 41,
 			"line": 180
 		},
-		"message": "The attribute 'aria-valuetext' is not supported by the role 'radio'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-valuetext' is not supported by the role 'radio'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 20,
 			"line": 180
@@ -2105,7 +2105,7 @@
 			"column": 32,
 			"line": 181
 		},
-		"message": "The attribute 'aria-checked' is not supported by the role 'slider'. This role is implicit on the element <input>",
+		"message": "The attribute 'aria-checked' is not supported by the role 'slider'. This role is implicit on the element `<input>`",
 		"start": {
 			"column": 20,
 			"line": 181
@@ -2117,7 +2117,7 @@
 			"column": 42,
 			"line": 182
 		},
-		"message": "The attribute 'aria-colindex' is not supported by the role 'menuitem'. This role is implicit on the element <menuitem>",
+		"message": "The attribute 'aria-colindex' is not supported by the role 'menuitem'. This role is implicit on the element `<menuitem>`",
 		"start": {
 			"column": 25,
 			"line": 182
@@ -2129,7 +2129,7 @@
 			"column": 43,
 			"line": 183
 		},
-		"message": "The attribute 'aria-colcount' is not supported by the role 'menuitemcheckbox'. This role is implicit on the element <menuitem>",
+		"message": "The attribute 'aria-colcount' is not supported by the role 'menuitemcheckbox'. This role is implicit on the element `<menuitem>`",
 		"start": {
 			"column": 26,
 			"line": 183
@@ -2141,7 +2141,7 @@
 			"column": 53,
 			"line": 184
 		},
-		"message": "The attribute 'aria-placeholder' is not supported by the role 'menuitemradio'. This role is implicit on the element <menuitem>",
+		"message": "The attribute 'aria-placeholder' is not supported by the role 'menuitemradio'. This role is implicit on the element `<menuitem>`",
 		"start": {
 			"column": 23,
 			"line": 184
diff --git a/packages/svelte/tests/validator/samples/a11y-scope/warnings.json b/packages/svelte/tests/validator/samples/a11y-scope/warnings.json
index 79ea2416fd..572c0a5b82 100644
--- a/packages/svelte/tests/validator/samples/a11y-scope/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-scope/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_misplaced_scope",
-		"message": "The scope attribute should only be used with <th> elements",
+		"message": "The scope attribute should only be used with `<th>` elements",
 		"start": {
 			"line": 6,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/action-on-component/errors.json b/packages/svelte/tests/validator/samples/action-on-component/errors.json
index f190f2282f..4225a66953 100644
--- a/packages/svelte/tests/validator/samples/action-on-component/errors.json
+++ b/packages/svelte/tests/validator/samples/action-on-component/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_component_directive",
+		"code": "component_invalid_directive",
 		"message": "This type of directive is not valid on components",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/animation-on-component/errors.json b/packages/svelte/tests/validator/samples/animation-on-component/errors.json
index f904517a89..f34042a582 100644
--- a/packages/svelte/tests/validator/samples/animation-on-component/errors.json
+++ b/packages/svelte/tests/validator/samples/animation-on-component/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_component_directive",
+		"code": "component_invalid_directive",
 		"message": "This type of directive is not valid on components",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json
index e4b6b6b329..43910c4d92 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_assignment",
+		"code": "constant_assignment",
 		"message": "Cannot assign to constant",
 		"start": {
 			"line": 13,
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json
index 7c92566f1f..64aff9f8ad 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_assignment",
+		"code": "constant_assignment",
 		"message": "Cannot assign to constant",
 		"start": {
 			"line": 14,
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json
index e714e99a38..4afea8749c 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_assignment",
+		"code": "constant_assignment",
 		"message": "Cannot assign to constant",
 		"start": {
 			"line": 17,
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json
index 41002cd83e..43e32736ea 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-5/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_assignment",
+		"code": "constant_assignment",
 		"message": "Cannot assign to constant",
 		"start": {
 			"line": 3,
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json
index 01c1aefb7e..1795b273c1 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const-7/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_assignment",
+		"code": "constant_assignment",
 		"message": "Cannot assign to constant",
 		"start": {
 			"line": 3,
diff --git a/packages/svelte/tests/validator/samples/assignment-to-const/errors.json b/packages/svelte/tests/validator/samples/assignment-to-const/errors.json
index 6963a3737b..69e01386c9 100644
--- a/packages/svelte/tests/validator/samples/assignment-to-const/errors.json
+++ b/packages/svelte/tests/validator/samples/assignment-to-const/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_assignment",
+		"code": "constant_assignment",
 		"message": "Cannot assign to constant",
 		"start": {
 			"line": 16,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json
index f99b36ff36..ab2c3120a2 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_attribute_name",
+		"code": "attribute_invalid_name",
 		"message": "'3aa' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json
index 7c49600412..38fa58fedb 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_attribute_name",
+		"code": "attribute_invalid_name",
 		"message": "'a*a' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json
index 693c080dd1..c2691b978b 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_attribute_name",
+		"code": "attribute_invalid_name",
 		"message": "'-a' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json
index 4a5b59bbe8..259a34f32a 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name-5/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_attribute_name",
+		"code": "attribute_invalid_name",
 		"message": "'a;' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json b/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json
index 6e9e2dc0f1..6935a8b611 100644
--- a/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json
+++ b/packages/svelte/tests/validator/samples/attribute-invalid-name/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_attribute_name",
+		"code": "attribute_invalid_name",
 		"message": "'}' is not a valid attribute name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/binding-await-catch/errors.json b/packages/svelte/tests/validator/samples/binding-await-catch/errors.json
index 4da88c4576..d465e82d34 100644
--- a/packages/svelte/tests/validator/samples/binding-await-catch/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-await-catch/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding",
+		"code": "constant_binding",
 		"message": "Cannot bind to constant",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json b/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json
index a5c222822c..a7ead88b36 100644
--- a/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-await-then-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding",
+		"code": "constant_binding",
 		"message": "Cannot bind to constant",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/binding-await-then/errors.json b/packages/svelte/tests/validator/samples/binding-await-then/errors.json
index 69675cf0e7..13533856b2 100644
--- a/packages/svelte/tests/validator/samples/binding-await-then/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-await-then/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding",
+		"code": "constant_binding",
 		"message": "Cannot bind to constant",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/binding-const/errors.json b/packages/svelte/tests/validator/samples/binding-const/errors.json
index d2f8b1a8b3..c589b93d2d 100644
--- a/packages/svelte/tests/validator/samples/binding-const/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-const/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding",
+		"code": "constant_binding",
 		"message": "Cannot bind to constant",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json b/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json
index 87a3f6f8ea..f6880e17b8 100644
--- a/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-input-type-boolean/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_type_attribute",
+		"code": "attribute_invalid_type",
 		"message": "'type' attribute must be a static text value if input uses two-way binding",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
index aa2d7c1621..702a6a6042 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-foreign-namespace/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "bind_invalid",
+		"code": "bind_invalid_name",
 		"message": "`bind:value` is not a valid binding. Foreign elements only support `bind:this`",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json
index 82e86887bd..934754831f 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-value-global/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding_value",
+		"code": "bind_invalid_value",
 		"message": "Can only bind to state or props",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json
index 34026c52ac..c1035ecb6b 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-value/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding_value",
+		"code": "bind_invalid_value",
 		"message": "Can only bind to state or props",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/binding-invalid/errors.json b/packages/svelte/tests/validator/samples/binding-invalid/errors.json
index 9e0e455eaf..56f2cfb15c 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "bind_invalid",
+		"code": "bind_invalid_name",
 		"message": "`bind:whatever` is not a valid binding",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/binding-let/errors.json b/packages/svelte/tests/validator/samples/binding-let/errors.json
index 88e038bba5..c96f08d4a0 100644
--- a/packages/svelte/tests/validator/samples/binding-let/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-let/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding",
+		"code": "constant_binding",
 		"message": "Cannot bind to constant",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json b/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json
index b280929333..9506d800ee 100644
--- a/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-select-multiple-dynamic/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_multiple_attribute",
+		"code": "attribute_invalid_multiple",
 		"message": "'multiple' attribute must be static if select uses two-way binding",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json b/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json
index 14288a1385..ebd64adaab 100644
--- a/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/component-event-modifiers-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Event modifiers other than 'once' can only be used on DOM elements",
-		"code": "invalid_component_event_modifier",
+		"code": "event_handler_invalid_component_modifier",
 		"start": {
 			"line": 6,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json b/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json
index 3eeb050cdb..9df751c718 100644
--- a/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json
+++ b/packages/svelte/tests/validator/samples/component-invalid-style-directive/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_component_directive",
+		"code": "component_invalid_directive",
 		"message": "This type of directive is not valid on components",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json b/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json
index e330d53f17..903eab0d9f 100644
--- a/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json
+++ b/packages/svelte/tests/validator/samples/component-name-lowercase/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "component_name_lowercase",
-		"message": "<thisShouldWarnMe> will be treated as an HTML element unless it begins with a capital letter",
+		"message": "`<thisShouldWarnMe>` will be treated as an HTML element unless it begins with a capital letter",
 		"start": {
 			"column": 0,
 			"line": 8
diff --git a/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json b/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json
index 190c4d81a2..5be2517861 100644
--- a/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slot-default-reserved/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_slot_name_default",
+		"code": "slot_element_invalid_name_default",
 		"message": "`default` is a reserved word — it cannot be used as a slot name",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json b/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json
index 238bd48d90..2c749f0b51 100644
--- a/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slot-dynamic-attribute/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_slot_attribute",
+		"code": "slot_attribute_invalid",
 		"message": "slot attribute must be a static value",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json b/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json
index 0c08ef2dad..c5842ff5fb 100644
--- a/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slot-dynamic/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_slot_name",
+		"code": "slot_element_invalid_name",
 		"message": "slot attribute must be a static value",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json b/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json
index 63960b846b..e1642bd0dc 100644
--- a/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slotted-custom-element-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_slot_placement",
+		"code": "slot_attribute_invalid_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 		"start": {
 			"line": 10,
diff --git a/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json b/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json
index b04ef9e4aa..741987999a 100644
--- a/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slotted-each-block/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_slot_placement",
+		"code": "slot_attribute_invalid_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json b/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json
index b04ef9e4aa..741987999a 100644
--- a/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json
+++ b/packages/svelte/tests/validator/samples/component-slotted-if-block/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_slot_placement",
+		"code": "slot_attribute_invalid_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json b/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json
index 07c6cbadca..3db7277574 100644
--- a/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-conflict-1/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "duplicate_declaration",
+		"code": "declaration_duplicate",
 		"message": "`a` has already been declared",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json b/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json
index 543f2a0217..822ae82cf1 100644
--- a/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-conflict-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "duplicate_declaration",
+		"code": "declaration_duplicate",
 		"message": "`item` has already been declared",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json b/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
index 4db0868c16..144345527a 100644
--- a/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid_const_placement",
-		"message": "{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>",
+		"code": "const_tag_invalid_placement",
+		"message": "`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>` or `<Component>`",
 		"start": {
 			"line": 5,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json b/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
index 33b24f369e..64a24c5f48 100644
--- a/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid_const_placement",
-		"message": "{@const} must be the immediate child of {#snippet}, {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>",
+		"code": "const_tag_invalid_placement",
+		"message": "`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>` or `<Component>`",
 		"start": {
 			"line": 7,
 			"column": 4
diff --git a/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json b/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json
index 42f9deb4df..667032f93d 100644
--- a/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-readonly-1/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_assignment",
+		"code": "constant_assignment",
 		"message": "Cannot assign to constant",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json b/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json
index 9f0d1d51e8..02a6b5afc2 100644
--- a/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-readonly-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_binding",
+		"code": "constant_binding",
 		"message": "Cannot bind to constant",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json b/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json
index 285a6f921d..7922d38d43 100644
--- a/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json
+++ b/packages/svelte/tests/validator/samples/contenteditable-dynamic/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "dynamic_contenteditable_attribute",
+		"code": "attribute_contenteditable_dynamic",
 		"message": "'contenteditable' attribute cannot be dynamic if element uses two-way binding",
 		"start": {
 			"line": 11,
diff --git a/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json b/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json
index 616c45021b..31d2666631 100644
--- a/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json
+++ b/packages/svelte/tests/validator/samples/contenteditable-missing/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "missing_contenteditable_attribute",
+		"code": "attribute_contenteditable_missing",
 		"message": "'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json
index eccbf62094..421c747518 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-1/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_selector",
+		"code": "css_selector_invalid",
 		"message": "Invalid selector",
 		"start": {
 			"line": 10,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json
index 37cfb99c87..0c1d24ee3b 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_selector",
+		"code": "css_selector_invalid",
 		"message": "Invalid selector",
 		"start": {
 			"line": 8,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json
index 74fd26a692..5f5552b498 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_selector",
+		"code": "css_selector_invalid",
 		"message": "Invalid selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json
index 24f83fee73..a762805cf6 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-combinator-selector-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_selector",
+		"code": "css_selector_invalid",
 		"message": "Invalid selector",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json
index 1a11759e43..cf556bf4c4 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_placement",
+		"code": "css_global_invalid_placement",
 		"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 		"start": {
 			"line": 8,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json
index 14fe638188..164daa5796 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_placement",
+		"code": "css_global_invalid_placement",
 		"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json
index 539d91fb4d..7b63fe4d7a 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector_list",
+		"code": "css_global_invalid_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json
index a3a6a13b77..fcc75beb5c 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector_list",
+		"code": "css_global_invalid_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json
index 008a8ec266..e1bc38e0f1 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector_list",
+		"code": "css_global_invalid_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json
index a2c76f2366..0b641f2115 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_placement",
+		"code": "css_global_invalid_placement",
 		"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json
index e6952aca16..d0be529197 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector",
+		"code": "css_global_invalid_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 11,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json
index 5eaaee69d3..d37ff8d5d1 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector",
+		"code": "css_global_invalid_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json
index d3f84026d6..c05bb647ad 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector",
+		"code": "css_global_invalid_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json
index 06ad62ef10..b1d79c25b8 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector",
+		"code": "css_global_invalid_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json
index 06ad62ef10..b1d79c25b8 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector",
+		"code": "css_global_invalid_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json
index 41fc6235e2..e9261e5e1c 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector_list",
+		"code": "css_global_invalid_selector_list",
 		"message": ":global(...) must not contain type or universal selectors when used in a compound selector",
 		"start": {
 			"line": 20,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json
index 50dfec051b..3d96fbc1ff 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_global_selector",
+		"code": "css_global_invalid_selector",
 		"message": ":global(...) must contain exactly one selector",
 		"start": {
 			"line": 11,
diff --git a/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json b/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json
index d5a2602fb6..e7c461b699 100644
--- a/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_css_type_selector_placement",
+		"code": "css_type_selector_invalid_placement",
 		"message": ":global(...) must not be followed with a type selector",
 		"start": {
 			"line": 17,
diff --git a/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json b/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json
index 40d459912c..e4dfb48c6b 100644
--- a/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json
+++ b/packages/svelte/tests/validator/samples/debug-invalid-args/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_debug",
+		"code": "debug_tag_invalid_arguments",
 		"message": "{@debug ...} arguments must be identifiers, not arbitrary expressions",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json b/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json
index 4615556188..7bdce44688 100644
--- a/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json
+++ b/packages/svelte/tests/validator/samples/default-export-anonymous-class/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "default_export",
+		"code": "module_illegal_default_export",
 		"message": "A component cannot have a default export",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json b/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json
index 652aff0e54..f385f03a48 100644
--- a/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json
+++ b/packages/svelte/tests/validator/samples/default-export-anonymous-function/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "default_export",
+		"code": "module_illegal_default_export",
 		"message": "A component cannot have a default export",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/default-export/errors.json b/packages/svelte/tests/validator/samples/default-export/errors.json
index 5b786d2222..9fd2bb7df5 100644
--- a/packages/svelte/tests/validator/samples/default-export/errors.json
+++ b/packages/svelte/tests/validator/samples/default-export/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "default_export",
+		"code": "module_illegal_default_export",
 		"message": "A component cannot have a default export",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/directive-non-expression/errors.json b/packages/svelte/tests/validator/samples/directive-non-expression/errors.json
index f7a825454e..fe14408644 100644
--- a/packages/svelte/tests/validator/samples/directive-non-expression/errors.json
+++ b/packages/svelte/tests/validator/samples/directive-non-expression/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_directive_value",
+		"code": "directive_invalid_value",
 		"message": "Directive value must be a JavaScript expression enclosed in curly braces",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json
index 630f8c5ea2..a05b1cf738 100644
--- a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-markup/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_global",
+		"code": "global_reference_invalid",
 		"message": "`$$billsyall` is an illegal variable name. To reference a global variable called `$$billsyall`, use `globalThis.$$billsyall`",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json
index 5876bcae80..f85bf6d32c 100644
--- a/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-dollar-global-in-script/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_global",
+		"code": "global_reference_invalid",
 		"message": "`$$billsyall` is an illegal variable name. To reference a global variable called `$$billsyall`, use `globalThis.$$billsyall`",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json b/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json
index 1623518ca0..1dd97cb726 100644
--- a/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-global-in-markup/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_global",
+		"code": "global_reference_invalid",
 		"message": "`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json b/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json
index 5d33dc3d83..7dffd2444b 100644
--- a/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json
+++ b/packages/svelte/tests/validator/samples/dollar-global-in-script/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_global",
+		"code": "global_reference_invalid",
 		"message": "`$` is an illegal variable name. To reference a global variable called `$`, use `globalThis.$`",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json b/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json
index ccd34029d2..fdfdb53b19 100644
--- a/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json
+++ b/packages/svelte/tests/validator/samples/dynamic-element-invalid-tag/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid_svelte_element_definition",
-		"message": "Invalid element definition — must be an {expression}",
+		"code": "svelte_element_invalid_this",
+		"message": "Invalid element definition — must be an `{expression}`",
 		"start": {
 			"line": 2,
 			"column": 17
diff --git a/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json b/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json
index d31bd1964c..60062d5aa6 100644
--- a/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json
+++ b/packages/svelte/tests/validator/samples/dynamic-element-missing-tag/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "missing_svelte_element_definition",
+		"code": "svelte_element_missing_this",
 		"message": "`<svelte:element>` must have a 'this' attribute",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/empty-block/warnings.json b/packages/svelte/tests/validator/samples/empty-block/warnings.json
index 461a4aecc9..7f912c4c75 100644
--- a/packages/svelte/tests/validator/samples/empty-block/warnings.json
+++ b/packages/svelte/tests/validator/samples/empty-block/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "empty_block",
+		"code": "block_empty",
 		"message": "Empty block",
 		"start": {
 			"line": 13,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "empty_block",
+		"code": "block_empty",
 		"message": "Empty block",
 		"start": {
 			"line": 16,
@@ -24,7 +24,7 @@
 		}
 	},
 	{
-		"code": "empty_block",
+		"code": "block_empty",
 		"message": "Empty block",
 		"start": {
 			"line": 17,
@@ -36,7 +36,7 @@
 		}
 	},
 	{
-		"code": "empty_block",
+		"code": "block_empty",
 		"message": "Empty block",
 		"start": {
 			"line": 18,
diff --git a/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json b/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json
index 84c1eeca61..9075bc80f2 100644
--- a/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json
+++ b/packages/svelte/tests/validator/samples/error-mode-warn/warnings.json
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "invalid_binding_value",
+		"code": "bind_invalid_value",
 		"message": "Can only bind to state or props",
 		"end": {
 			"column": 29,
diff --git a/packages/svelte/tests/validator/samples/event-attribute/errors.json b/packages/svelte/tests/validator/samples/event-attribute/errors.json
index 7204ea671b..ddff4f42d1 100644
--- a/packages/svelte/tests/validator/samples/event-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/event-attribute/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Event attribute must be a JavaScript expression, not a string",
-		"code": "invalid_event_attribute_value",
+		"code": "attribute_invalid_event_handler",
 		"start": {
 			"line": 4,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json b/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json
index c53951cb67..2739534fd1 100644
--- a/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json
+++ b/packages/svelte/tests/validator/samples/event-modifiers-invalid-nonpassive/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "The 'passive' and 'nonpassive' modifiers cannot be used together",
-		"code": "invalid_event_modifier_combination",
+		"code": "event_handler_invalid_modifier_combination",
 		"start": {
 			"line": 1,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json b/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json
index d1def4dcb3..98ea5d3a37 100644
--- a/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json
+++ b/packages/svelte/tests/validator/samples/event-modifiers-invalid-passive/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "The 'passive' and 'preventDefault' modifiers cannot be used together",
-		"code": "invalid_event_modifier_combination",
+		"code": "event_handler_invalid_modifier_combination",
 		"start": {
 			"line": 1,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json b/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json
index 178a5b5543..8ea4809648 100644
--- a/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/event-modifiers-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Valid event modifiers are preventDefault, stopPropagation, stopImmediatePropagation, capture, once, passive, nonpassive, self or trusted",
-		"code": "invalid_event_modifier",
+		"code": "event_handler_invalid_modifier",
 		"start": {
 			"line": 1,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/global-event-reference/warnings.json b/packages/svelte/tests/validator/samples/global-event-reference/warnings.json
index f6f6f1dc18..092d9d9c69 100644
--- a/packages/svelte/tests/validator/samples/global-event-reference/warnings.json
+++ b/packages/svelte/tests/validator/samples/global-event-reference/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "global_event_reference",
-		"message": "You are referencing globalThis.onkeydown. Did you forget to declare a variable with that name?",
+		"code": "attribute_global_event_reference",
+		"message": "You are referencing `globalThis.onkeydown`. Did you forget to declare a variable with that name?",
 		"start": {
 			"column": 8,
 			"line": 8
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "global_event_reference",
-		"message": "You are referencing globalThis.onkeydown. Did you forget to declare a variable with that name?",
+		"code": "attribute_global_event_reference",
+		"message": "You are referencing `globalThis.onkeydown`. Did you forget to declare a variable with that name?",
 		"start": {
 			"column": 8,
 			"line": 9
diff --git a/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json b/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json
index 5eedfb8971..9c70f178dd 100644
--- a/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/html-block-in-attribute/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_tag_placement",
+		"code": "tag_invalid_placement",
 		"message": "{@html ...} tag cannot be in attribute value",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json b/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json
index c0e5d0e66a..208612da14 100644
--- a/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json
+++ b/packages/svelte/tests/validator/samples/html-block-in-textarea/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_tag_placement",
+		"code": "tag_invalid_placement",
 		"message": "{@html ...} tag cannot be inside <textarea>",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/ignore-warning/warnings.json b/packages/svelte/tests/validator/samples/ignore-warning/warnings.json
index 6d1eaf74ad..926543bf3f 100644
--- a/packages/svelte/tests/validator/samples/ignore-warning/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warning/warnings.json
@@ -5,7 +5,7 @@
 			"column": 49,
 			"line": 4
 		},
-		"message": "Avoid <marquee> elements",
+		"message": "Avoid `<marquee>` elements",
 		"start": {
 			"column": 1,
 			"line": 4
@@ -17,7 +17,7 @@
 			"column": 22,
 			"line": 7
 		},
-		"message": "<img> element should have an alt attribute",
+		"message": "`<img>` element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 7
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json
index 1644aeb831..83c7b79eea 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-cumulative/warnings.json
@@ -5,7 +5,7 @@
 			"column": 12,
 			"line": 7
 		},
-		"message": "Avoid <marquee> elements",
+		"message": "Avoid `<marquee>` elements",
 		"start": {
 			"column": 2,
 			"line": 5
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json
index eb75343b4e..000e557fee 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-newline/warnings.json
@@ -5,7 +5,7 @@
 			"column": 22,
 			"line": 8
 		},
-		"message": "<img> element should have an alt attribute",
+		"message": "`<img>` element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 8
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json
index eb75343b4e..000e557fee 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings-stacked/warnings.json
@@ -5,7 +5,7 @@
 			"column": 22,
 			"line": 8
 		},
-		"message": "<img> element should have an alt attribute",
+		"message": "`<img>` element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 8
diff --git a/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json b/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json
index 3cc9ba0a39..0d0cdc981d 100644
--- a/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json
+++ b/packages/svelte/tests/validator/samples/ignore-warnings/warnings.json
@@ -5,7 +5,7 @@
 			"column": 22,
 			"line": 7
 		},
-		"message": "<img> element should have an alt attribute",
+		"message": "`<img>` element should have an alt attribute",
 		"start": {
 			"column": 0,
 			"line": 7
diff --git a/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json b/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json
index 18b5b6f202..349da9d9a9 100644
--- a/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json
+++ b/packages/svelte/tests/validator/samples/illegal-attribute-character/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_attribute_character",
+		"code": "attribute_illegal_colon",
 		"end": {
 			"column": 15,
 			"line": 14
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "illegal_attribute_character",
+		"code": "attribute_illegal_colon",
 		"end": {
 			"column": 10,
 			"line": 15
diff --git a/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json b/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json
index d55986ec5a..e0002aaa74 100644
--- a/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json
+++ b/packages/svelte/tests/validator/samples/illegal-variable-declaration/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_variable_declaration",
+		"code": "declaration_duplicate_module_import",
 		"message": "Cannot declare same variable name which is imported inside `<script context=\"module\">`",
 		"start": {
 			"line": 12,
diff --git a/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json b/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json
index 8d1918f8c6..88c4642aac 100644
--- a/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json
+++ b/packages/svelte/tests/validator/samples/inline-new-class-2/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "avoid_nested_class",
+		"code": "perf_avoid_nested_class",
 		"message": "Avoid declaring classes below the top level scope",
 		"start": {
 			"column": 2,
diff --git a/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json b/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json
index 73f1293158..9f95c73de0 100644
--- a/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json
+++ b/packages/svelte/tests/validator/samples/inline-new-class-4/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "avoid_inline_class",
+		"code": "perf_avoid_inline_class",
 		"message": "Avoid 'new class' — instead, declare the class at the top level scope",
 		"start": {
 			"column": 12,
diff --git a/packages/svelte/tests/validator/samples/inline-new-class/warnings.json b/packages/svelte/tests/validator/samples/inline-new-class/warnings.json
index 16f2e2c3c2..10d85e0959 100644
--- a/packages/svelte/tests/validator/samples/inline-new-class/warnings.json
+++ b/packages/svelte/tests/validator/samples/inline-new-class/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "avoid_inline_class",
+		"code": "perf_avoid_inline_class",
 		"message": "Avoid 'new class' — instead, declare the class at the top level scope",
 		"start": {
 			"column": 11,
diff --git a/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json b/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json
index 299cb2fff5..7a5ba2b615 100644
--- a/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json
+++ b/packages/svelte/tests/validator/samples/invalid-empty-css-declaration/errors.json
@@ -1,10 +1,10 @@
 [
 	{
-		"code": "invalid_css_declaration",
+		"code": "css_empty_declaration",
 		"message": "Declaration cannot be empty",
 		"start": {
 			"line": 5,
-			"column": 8
+			"column": 2
 		},
 		"end": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json b/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json
index 99fce66db0..0454282103 100644
--- a/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/invalid-node-placement-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_node_placement",
+		"code": "node_invalid_placement",
 		"message": "<div> is invalid inside <p>",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json b/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json
index 1b43c778ee..2955a1e522 100644
--- a/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/invalid-node-placement/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_node_placement",
+		"code": "node_invalid_placement",
 		"message": "<a> is invalid inside <a>",
 		"start": {
 			"line": 4,
diff --git a/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json b/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json
index 4e377fa9f1..09a47f17a3 100644
--- a/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json
+++ b/packages/svelte/tests/validator/samples/invalid-self-closing-tag/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid_self_closing_tag",
-		"message": "Self-closing HTML tags for non-void elements are ambiguous — use <div ...></div> rather than <div ... />",
+		"code": "element_invalid_self_closing_tag",
+		"message": "Self-closing HTML tags for non-void elements are ambiguous — use `<div ...></div>` rather than `<div ... />`",
 		"start": {
 			"line": 6,
 			"column": 0
@@ -12,8 +12,8 @@
 		}
 	},
 	{
-		"code": "invalid_self_closing_tag",
-		"message": "Self-closing HTML tags for non-void elements are ambiguous — use <my-thing ...></my-thing> rather than <my-thing ... />",
+		"code": "element_invalid_self_closing_tag",
+		"message": "Self-closing HTML tags for non-void elements are ambiguous — use `<my-thing ...></my-thing>` rather than `<my-thing ... />`",
 		"start": {
 			"line": 7,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/let-directive/errors.json b/packages/svelte/tests/validator/samples/let-directive/errors.json
index 5e4138812e..b0eedf7e09 100644
--- a/packages/svelte/tests/validator/samples/let-directive/errors.json
+++ b/packages/svelte/tests/validator/samples/let-directive/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_let_directive_placement",
+		"code": "let_directive_invalid_placement",
 		"message": "`let:` directive at invalid position",
 		"start": {
 			"line": 6,
diff --git a/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json b/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json
index c1169837ea..c541756345 100644
--- a/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json
+++ b/packages/svelte/tests/validator/samples/logic-block-in-attribute/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_block_placement",
+		"code": "block_invalid_placement",
 		"message": "{#if ...} block cannot be in attribute value",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json b/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json
index e9f8a9decf..82bf92da45 100644
--- a/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json
+++ b/packages/svelte/tests/validator/samples/logic-block-in-textarea/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_block_placement",
+		"code": "block_invalid_placement",
 		"message": "{#each ...} block cannot be inside <textarea>",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json b/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json
index 60fe159479..c3ef6cf8c6 100644
--- a/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json
+++ b/packages/svelte/tests/validator/samples/module-script-reactive-declaration/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Reactive declarations only exist at the top level of the instance script",
-		"code": "no_reactive_declaration",
+		"code": "reactive_declaration_invalid_placement",
 		"start": {
 			"line": 4,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json b/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json
index ab06795527..e1a4b15c0e 100644
--- a/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json
+++ b/packages/svelte/tests/validator/samples/multiple-script-default-context/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "duplicate_script_element",
+		"code": "script_duplicate",
 		"message": "A component can have a single top-level `<script>` element and/or a single top-level `<script context=\"module\">` element",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json b/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json
index ab06795527..e1a4b15c0e 100644
--- a/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json
+++ b/packages/svelte/tests/validator/samples/multiple-script-module-context/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "duplicate_script_element",
+		"code": "script_duplicate",
 		"message": "A component can have a single top-level `<script>` element and/or a single top-level `<script context=\"module\">` element",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/namespace-invalid/errors.json b/packages/svelte/tests/validator/samples/namespace-invalid/errors.json
index e381545dc0..566725e1f3 100644
--- a/packages/svelte/tests/validator/samples/namespace-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/namespace-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid_svelte_option_namespace",
-		"message": "Unsupported `<svelte:option>` value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\"",
+		"code": "svelte_options_invalid_attribute_value",
+		"message": "Valid values are \"html\", \"svg\" or \"foreign\"",
 		"start": {
 			"line": 1,
 			"column": 16
diff --git a/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json b/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json
index f8b2c75f05..6d6ffec16c 100644
--- a/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json
+++ b/packages/svelte/tests/validator/samples/namespace-non-literal/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"code": "invalid_svelte_option_namespace",
-		"message": "Unsupported `<svelte:option>` value for \"namespace\". Valid values are \"html\", \"svg\" or \"foreign\"",
+		"code": "svelte_options_invalid_attribute_value",
+		"message": "Valid values are \"html\", \"svg\" or \"foreign\"",
 		"start": {
 			"line": 1,
 			"column": 16
diff --git a/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json b/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json
index 26fbd26534..a9b83b713b 100644
--- a/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json
+++ b/packages/svelte/tests/validator/samples/reactive-declaration-cyclical/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Cyclical dependency detected: a → b → a",
-		"code": "cyclical_reactive_declaration",
+		"code": "reactive_declaration_cycle",
 		"start": {
 			"line": 5,
 			"column": 1
diff --git a/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json b/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json
index 452333ed98..5ce712f909 100644
--- a/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json
+++ b/packages/svelte/tests/validator/samples/reactive-declaration-non-top-level/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"message": "Reactive declarations only exist at the top level of the instance script",
-		"code": "no_reactive_declaration",
+		"code": "reactive_declaration_invalid_placement",
 		"start": {
 			"line": 6,
 			"column": 2
diff --git a/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json b/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json
index f47e0e4952..b401db5008 100644
--- a/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json
+++ b/packages/svelte/tests/validator/samples/reactive-module-variable/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "module_script_reactive_declaration",
+		"code": "reactive_declaration_module_script",
 		"message": "All dependencies of the reactive declaration are declared in a module script and will not be reactive",
 		"start": {
 			"column": 1,
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json
index 08cf4a4752..38db7a3fe4 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding-2/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_rest_eachblock_binding",
+		"code": "bind_invalid_each_rest",
 		"message": "The rest operator (...) will create a new object and binding 'rest' with the original object will not work",
 		"start": {
 			"line": 8,
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json
index 55a2c2d7a5..c1970f0007 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding-3/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_rest_eachblock_binding",
+		"code": "bind_invalid_each_rest",
 		"message": "The rest operator (...) will create a new object and binding 'rest' with the original object will not work",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json
index f457198a7d..ebb631d0e7 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding-nested-rest/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_rest_eachblock_binding",
+		"code": "bind_invalid_each_rest",
 		"end": {
 			"column": 37,
 			"line": 5
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "invalid_rest_eachblock_binding",
+		"code": "bind_invalid_each_rest",
 		"end": {
 			"column": 50,
 			"line": 5
diff --git a/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json b/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json
index 0841781c7f..fb5d4063c7 100644
--- a/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json
+++ b/packages/svelte/tests/validator/samples/rest-eachblock-binding/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_rest_eachblock_binding",
+		"code": "bind_invalid_each_rest",
 		"message": "The rest operator (...) will create a new object and binding 'rest' with the original object will not work",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/runes-bindable-not-called/_config.js b/packages/svelte/tests/validator/samples/runes-bindable-not-called/_config.js
deleted file mode 100644
index f47bee71df..0000000000
--- a/packages/svelte/tests/validator/samples/runes-bindable-not-called/_config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { test } from '../../test';
-
-export default test({});
diff --git a/packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json b/packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json
deleted file mode 100644
index f6d4927f60..0000000000
--- a/packages/svelte/tests/validator/samples/runes-bindable-not-called/warnings.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-	{
-		"code": "invalid_bindable_declaration",
-		"message": "Bindable component properties are declared using `$bindable()` in runes mode. Did you forget to call the function?",
-		"start": {
-			"column": 7,
-			"line": 2
-		},
-		"end": {
-			"column": 20,
-			"line": 2
-		}
-	}
-]
diff --git a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
index b7db493e68..b667f2e2dd 100644
--- a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
@@ -1,35 +1,35 @@
 [
 	{
-		"code": "deprecated_slot_element",
+		"code": "slot_element_deprecated",
 		"end": {
 			"column": 13,
 			"line": 11
 		},
-		"message": "Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.",
+		"message": "Using `<slot>` to render parent content is deprecated. Use `{@render ...}` tags instead.",
 		"start": {
 			"column": 0,
 			"line": 11
 		}
 	},
 	{
-		"code": "deprecated_slot_element",
+		"code": "slot_element_deprecated",
 		"end": {
 			"column": 24,
 			"line": 12
 		},
-		"message": "Using <slot> to render parent content is deprecated. Use {@render ...} tags instead.",
+		"message": "Using `<slot>` to render parent content is deprecated. Use `{@render ...}` tags instead.",
 		"start": {
 			"column": 0,
 			"line": 12
 		}
 	},
 	{
-		"code": "deprecated_event_handler",
+		"code": "event_directive_deprecated",
 		"end": {
 			"column": 22,
 			"line": 13
 		},
-		"message": "Using on:click to listen to the click event is is deprecated. Use the event attribute onclick instead.",
+		"message": "Using `on:click` to listen to the click event is deprecated. Use the event attribute `onclick` instead.",
 		"start": {
 			"column": 8,
 			"line": 13
diff --git a/packages/svelte/tests/validator/samples/runes-props-not-called/_config.js b/packages/svelte/tests/validator/samples/runes-props-not-called/_config.js
deleted file mode 100644
index f47bee71df..0000000000
--- a/packages/svelte/tests/validator/samples/runes-props-not-called/_config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { test } from '../../test';
-
-export default test({});
diff --git a/packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json b/packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json
deleted file mode 100644
index b906f65c36..0000000000
--- a/packages/svelte/tests/validator/samples/runes-props-not-called/warnings.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-	{
-		"code": "invalid_props_declaration",
-		"message": "Component properties are declared using `$props()` in runes mode. Did you forget to call the function?",
-		"start": {
-			"column": 5,
-			"line": 2
-		},
-		"end": {
-			"column": 19,
-			"line": 2
-		}
-	}
-]
diff --git a/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json b/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json
index bc575249f3..dedc6e8b6a 100644
--- a/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-referenced-nonstate-bind-this/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "non_state_reference",
+		"code": "non_reactive_update",
 		"message": "`does_need1` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates",
 		"start": {
 			"column": 5,
diff --git a/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json b/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json
index 348b270bf6..641d21a7d1 100644
--- a/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-referenced-nonstate/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "non_state_reference",
+		"code": "non_reactive_update",
 		"message": "`b` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates",
 		"start": {
 			"column": 5,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "non_state_reference",
+		"code": "non_reactive_update",
 		"message": "`c` is updated, but is not declared with `$state(...)`. Changing its value will not correctly trigger updates",
 		"start": {
 			"column": 5,
diff --git a/packages/svelte/tests/validator/samples/script-invalid-context/errors.json b/packages/svelte/tests/validator/samples/script-invalid-context/errors.json
index 173958d6c6..3698b92386 100644
--- a/packages/svelte/tests/validator/samples/script-invalid-context/errors.json
+++ b/packages/svelte/tests/validator/samples/script-invalid-context/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_script_context",
+		"code": "script_invalid_context",
 		"message": "If the context attribute is supplied, its value must be \"module\"",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte b/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte
index 3c644b1248..275165ffd7 100644
--- a/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte
+++ b/packages/svelte/tests/validator/samples/silence-warnings-2/input.svelte
@@ -2,7 +2,7 @@
 	let foo;
 </script>
 
-<!-- svelte-ignore module_script_reactive_declaration -->
+<!-- svelte-ignore reactive_declaration_module_script -->
 <script>
 	$: reactive = foo;
 </script>
diff --git a/packages/svelte/tests/validator/samples/silence-warnings/input.svelte b/packages/svelte/tests/validator/samples/silence-warnings/input.svelte
index 24becff683..4520aed9c1 100644
--- a/packages/svelte/tests/validator/samples/silence-warnings/input.svelte
+++ b/packages/svelte/tests/validator/samples/silence-warnings/input.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <script>
-	// svelte-ignore module_script_reactive_declaration
+	// svelte-ignore reactive_declaration_module_script
 	$: reactive = foo;
 </script>
 
diff --git a/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json b/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json
index e421039874..76e150c7e1 100644
--- a/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/slot-attribute-invalid/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_slot_placement",
+		"code": "slot_attribute_invalid_placement",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/slot-warning/warnings.json b/packages/svelte/tests/validator/samples/slot-warning/warnings.json
index cd66eab361..367f77f38b 100644
--- a/packages/svelte/tests/validator/samples/slot-warning/warnings.json
+++ b/packages/svelte/tests/validator/samples/slot-warning/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"column": 1,
 			"line": 7
diff --git a/packages/svelte/tests/validator/samples/slot-warning2/warnings.json b/packages/svelte/tests/validator/samples/slot-warning2/warnings.json
index 24452c7e70..239f1ded54 100644
--- a/packages/svelte/tests/validator/samples/slot-warning2/warnings.json
+++ b/packages/svelte/tests/validator/samples/slot-warning2/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_click_events_have_key_events",
-		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as <button type=\"button\"> or <a> might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
+		"message": "Visible, non-interactive elements with a click event must be accompanied by a keyboard event handler. Consider whether an interactive element such as `<button type=\"button\">` or `<a>` might be more appropriate. See https://svelte.dev/docs/accessibility-warnings#a11y-click-events-have-key-events for more details.",
 		"start": {
 			"column": 1,
 			"line": 8
diff --git a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
index b0649869fc..9ba0941519 100644
--- a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
+++ b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "static_state_reference",
+		"code": "state_referenced_locally",
 		"message": "State referenced in its own scope will never update. Did you mean to reference it inside a closure?",
 		"start": {
 			"column": 13,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "static_state_reference",
+		"code": "state_referenced_locally",
 		"message": "State referenced in its own scope will never update. Did you mean to reference it inside a closure?",
 		"start": {
 			"column": 13,
diff --git a/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json b/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json
index 0e894db6e1..0233789b23 100644
--- a/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json
+++ b/packages/svelte/tests/validator/samples/store-runes-conflict/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "store_with_rune_name",
+		"code": "store_rune_conflict",
 		"message": "It looks like you're using the `$state` rune, but there is a local binding called `state`. Referencing a local variable with a `$` prefix will create a store subscription. Please rename `state` to avoid the ambiguity",
 		"start": {
 			"column": 1,
diff --git a/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json b/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json
index 3d1373e8cd..aaaf907cca 100644
--- a/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/style-directive-modifiers-invalid/errors.json
@@ -1,7 +1,7 @@
 [
 	{
-		"message": "Invalid 'style:' modifier. Valid modifiers are: 'important'",
-		"code": "invalid_style_directive_modifier",
+		"message": "`style:` directive can only use the `important` modifier",
+		"code": "style_directive_invalid_modifier",
 		"start": {
 			"line": 1,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json b/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json
index cf34adc56b..ded3b1d69f 100644
--- a/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/svelte-fragment-placement-2/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_svelte_fragment_placement",
+		"code": "svelte_fragment_invalid_placement",
 		"message": "`<svelte:fragment>` must be the direct child of a component",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json b/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json
index 195b0fca19..303a85e8e8 100644
--- a/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json
+++ b/packages/svelte/tests/validator/samples/svelte-fragment-placement/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_svelte_fragment_placement",
+		"code": "svelte_fragment_invalid_placement",
 		"message": "`<svelte:fragment>` must be the direct child of a component",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json b/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json
index f230f20788..5db7d529db 100644
--- a/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json
+++ b/packages/svelte/tests/validator/samples/svelte-head-attributes/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_svelte_head_attribute",
+		"code": "svelte_head_illegal_attribute",
 		"message": "`<svelte:head>` cannot have attributes nor directives",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/tag-invalid/errors.json b/packages/svelte/tests/validator/samples/tag-invalid/errors.json
index 84d7f49de6..848f51af98 100644
--- a/packages/svelte/tests/validator/samples/tag-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/tag-invalid/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_tag_property",
+		"code": "svelte_options_invalid_tagname",
 		"message": "Tag name must be two or more words joined by the \"-\" character",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/tag-non-string/errors.json b/packages/svelte/tests/validator/samples/tag-non-string/errors.json
index 0a41e50b9d..b74358966c 100644
--- a/packages/svelte/tests/validator/samples/tag-non-string/errors.json
+++ b/packages/svelte/tests/validator/samples/tag-non-string/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_svelte_option_customElement",
+		"code": "svelte_options_invalid_customelement",
 		"message": "\"customElement\" must be a string literal defining a valid custom element name or an object of the form { tag: string; shadow?: \"open\" | \"none\"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/textarea-value-children/errors.json b/packages/svelte/tests/validator/samples/textarea-value-children/errors.json
index e2ea3e48fc..815f2270ea 100644
--- a/packages/svelte/tests/validator/samples/textarea-value-children/errors.json
+++ b/packages/svelte/tests/validator/samples/textarea-value-children/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_textarea_content",
+		"code": "textarea_invalid_content",
 		"message": "A `<textarea>` can have either a value attribute or (equivalently) child content, but not both",
 		"start": {
 			"line": 1,
diff --git a/packages/svelte/tests/validator/samples/title-no-attributes/errors.json b/packages/svelte/tests/validator/samples/title-no-attributes/errors.json
index 85768c1fa9..76860e5769 100644
--- a/packages/svelte/tests/validator/samples/title-no-attributes/errors.json
+++ b/packages/svelte/tests/validator/samples/title-no-attributes/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "illegal_title_attribute",
+		"code": "title_illegal_attribute",
 		"message": "`<title>` cannot have attributes nor directives",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/title-no-children/errors.json b/packages/svelte/tests/validator/samples/title-no-children/errors.json
index 6a4d2475e1..36a2deeabf 100644
--- a/packages/svelte/tests/validator/samples/title-no-children/errors.json
+++ b/packages/svelte/tests/validator/samples/title-no-children/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_title_content",
+		"code": "title_invalid_content",
 		"message": "`<title>` can only contain text and {tags}",
 		"start": {
 			"line": 2,
diff --git a/packages/svelte/tests/validator/samples/transition-on-component/errors.json b/packages/svelte/tests/validator/samples/transition-on-component/errors.json
index 52155a1480..eb670c6f55 100644
--- a/packages/svelte/tests/validator/samples/transition-on-component/errors.json
+++ b/packages/svelte/tests/validator/samples/transition-on-component/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_component_directive",
+		"code": "component_invalid_directive",
 		"message": "This type of directive is not valid on components",
 		"start": {
 			"line": 7,
diff --git a/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json b/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json
index 0008dd1544..725c73a583 100644
--- a/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json
+++ b/packages/svelte/tests/validator/samples/unreferenced-variables-each/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "unused_export_let",
+		"code": "export_let_unused",
 		"message": "Component has unused export property 'default_value_5'. If it is for external reference only, please consider using `export const default_value_5`",
 		"start": {
 			"column": 12,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "unused_export_let",
+		"code": "export_let_unused",
 		"message": "Component has unused export property 'default_value_6'. If it is for external reference only, please consider using `export const default_value_6`",
 		"start": {
 			"column": 12,
diff --git a/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json b/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json
index 12b78ee572..e2d39a5c6f 100644
--- a/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json
+++ b/packages/svelte/tests/validator/samples/unreferenced-variables/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "unused_export_let",
+		"code": "export_let_unused",
 		"end": {
 			"column": 8,
 			"line": 28
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "unused_export_let",
+		"code": "export_let_unused",
 		"end": {
 			"column": 8,
 			"line": 29
@@ -24,7 +24,7 @@
 		}
 	},
 	{
-		"code": "unused_export_let",
+		"code": "export_let_unused",
 		"end": {
 			"column": 15,
 			"line": 32
@@ -36,7 +36,7 @@
 		}
 	},
 	{
-		"code": "unused_export_let",
+		"code": "export_let_unused",
 		"end": {
 			"column": 15,
 			"line": 33
@@ -48,7 +48,7 @@
 		}
 	},
 	{
-		"code": "unused_export_let",
+		"code": "export_let_unused",
 		"end": {
 			"column": 15,
 			"line": 35
diff --git a/packages/svelte/tests/validator/samples/use-the-platform/warnings.json b/packages/svelte/tests/validator/samples/use-the-platform/warnings.json
index f62bbca540..be5a0bd712 100644
--- a/packages/svelte/tests/validator/samples/use-the-platform/warnings.json
+++ b/packages/svelte/tests/validator/samples/use-the-platform/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "invalid_html_attribute",
+		"code": "attribute_invalid_property_name",
 		"message": "'className' is not a valid HTML attribute. Did you mean 'class'?",
 		"start": {
 			"column": 5,
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "invalid_html_attribute",
+		"code": "attribute_invalid_property_name",
 		"message": "'htmlFor' is not a valid HTML attribute. Did you mean 'for'?",
 		"start": {
 			"column": 7,
diff --git a/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json b/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
index a63e8a0877..170f339773 100644
--- a/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
+++ b/packages/svelte/tests/validator/samples/window-binding-invalid-innerwidth/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "bind_invalid",
+		"code": "bind_invalid_name",
 		"message": "`bind:innerwidth` is not a valid binding. Did you mean 'innerWidth'?",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json b/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json
index fc6c219444..ee6ae8da7c 100644
--- a/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json
+++ b/packages/svelte/tests/validator/samples/window-binding-invalid/errors.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "bind_invalid",
+		"code": "bind_invalid_name",
 		"message": "`bind:potato` is not a valid binding",
 		"start": {
 			"line": 5,
diff --git a/packages/svelte/tests/validator/test.ts b/packages/svelte/tests/validator/test.ts
index cf39369e38..1482dad6c2 100644
--- a/packages/svelte/tests/validator/test.ts
+++ b/packages/svelte/tests/validator/test.ts
@@ -80,7 +80,7 @@ it.skip('check warning position', () => {
 	assert.deepEqual(warnings, [
 		{
 			code: 'a11y-missing-attribute',
-			message: 'A11y: <img> element should have an alt attribute',
+			message: 'A11y: `<img>` element should have an alt attribute',
 			start: { column: 2, line: 2, character: 3 },
 			end: { column: 15, line: 3, character: 24 }
 		}

From 9a887f8dab8e4846bff8734cba982bcdae44d401 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 25 Apr 2024 11:36:40 -0400
Subject: [PATCH 20/27] chore: directly export function in non-HMR mode
 (#11333)

* chore: directly export function in non-HMR mode

* remove some more noise

* update snapshots

* Update sites/svelte-5-preview/src/lib/workers/compiler/index.js

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .../3-transform/client/transform-client.js    | 25 ++++++++++---------
 .../src/compiler/phases/3-transform/index.js  | 14 -----------
 .../_expected/client/index.svelte.js          |  8 ++----
 .../_expected/server/index.svelte.js          |  2 --
 .../_expected/client/index.svelte.js          |  8 ++----
 .../_expected/server/index.svelte.js          |  2 --
 .../_expected/client/index.svelte.js          |  8 ++----
 .../_expected/server/index.svelte.js          |  2 --
 .../_expected/client/main.svelte.js           |  8 ++----
 .../_expected/server/main.svelte.js           |  2 --
 .../_expected/client/index.svelte.js          |  8 ++----
 .../_expected/server/index.svelte.js          |  2 --
 .../_expected/client/index.svelte.js          |  8 ++----
 .../_expected/server/index.svelte.js          |  2 --
 .../_expected/client/index.svelte.js          |  8 ++----
 .../_expected/server/index.svelte.js          |  2 --
 .../hmr/_expected/client/index.svelte.js      |  4 +--
 .../hmr/_expected/server/index.svelte.js      |  2 --
 .../_expected/client/index.svelte.js          |  6 +----
 .../_expected/server/index.svelte.js          |  2 --
 .../_expected/client/index.svelte.js          |  8 ++----
 .../_expected/server/index.svelte.js          |  2 --
 .../src/lib/workers/compiler/index.js         |  3 ++-
 23 files changed, 33 insertions(+), 103 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
index f9d06ac0d0..61a0377e6f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -430,18 +430,17 @@ export function client_component(source, analysis, options) {
 		component_block.body.unshift(b.const('$$slots', b.call('$.sanitize_slots', b.id('$$props'))));
 	}
 
-	const body = [
-		...state.hoisted,
-		...module.body,
-		b.function_declaration(
-			b.id(analysis.name),
-			[b.id('$$anchor'), b.id('$$props')],
-			component_block
-		)
-	];
+	const body = [...state.hoisted, ...module.body];
+
+	const component = b.function_declaration(
+		b.id(analysis.name),
+		[b.id('$$anchor'), b.id('$$props')],
+		component_block
+	);
 
 	if (options.hmr) {
 		body.push(
+			component,
 			b.if(
 				b.id('import.meta.hot'),
 				b.block([
@@ -459,12 +458,14 @@ export function client_component(source, analysis, options) {
 						)
 					)
 				])
-			)
+			),
+
+			b.export_default(b.id(analysis.name))
 		);
+	} else {
+		body.push(b.export_default(component));
 	}
 
-	body.push(b.export_default(b.id(analysis.name)));
-
 	if (options.dev) {
 		if (options.filename) {
 			let filename = options.filename;
diff --git a/packages/svelte/src/compiler/phases/3-transform/index.js b/packages/svelte/src/compiler/phases/3-transform/index.js
index 2c4adb3dc8..de246f6a9d 100644
--- a/packages/svelte/src/compiler/phases/3-transform/index.js
+++ b/packages/svelte/src/compiler/phases/3-transform/index.js
@@ -30,20 +30,6 @@ export function transform_component(analysis, source, options) {
 			? server_component(analysis, options)
 			: client_component(source, analysis, options);
 
-	const basename = (options.filename ?? 'Component').split(/[/\\]/).at(-1);
-	if (program.body.length > 0) {
-		program.body[0].leadingComments = [
-			{
-				type: 'Line',
-				value: ` ${basename} (Svelte v${VERSION})`
-			},
-			{
-				type: 'Line',
-				value: ' Note: compiler output will change before 5.0 is released!'
-			}
-		];
-	}
-
 	const js_source_name = get_source_name(options.filename, options.outputFilename, 'input.svelte');
 	const js = print(program, {
 		// include source content; makes it easier/more robust looking up the source map code
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
index ba25326774..06c1eb77d8 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 import TextInput from './Child.svelte';
@@ -7,7 +5,7 @@ import TextInput from './Child.svelte';
 var root_1 = $.template(`Something`, 1);
 var root = $.template(`<!> `, 1);
 
-function Bind_component_snippet($$anchor, $$props) {
+export default function Bind_component_snippet($$anchor, $$props) {
 	$.push($$props, true);
 
 	let value = $.source('');
@@ -36,6 +34,4 @@ function Bind_component_snippet($$anchor, $$props) {
 	$.render_effect(() => $.set_text(text, ` value: ${$.stringify($.get(value))}`));
 	$.append($$anchor, fragment_1);
 	$.pop();
-}
-
-export default Bind_component_snippet;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
index b1f83fed42..5450b39b68 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 import TextInput from './Child.svelte';
 
diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js
index 40149aacef..b1481cba15 100644
--- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js
@@ -1,9 +1,7 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-function Bind_this($$anchor, $$props) {
+export default function Bind_this($$anchor, $$props) {
 	$.push($$props, false);
 	$.init();
 
@@ -13,6 +11,4 @@ function Bind_this($$anchor, $$props) {
 	$.bind_this(Foo(node, {}), ($$value) => foo = $$value, () => foo);
 	$.append($$anchor, fragment);
 	$.pop();
-}
-
-export default Bind_this;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
index bd1d1ec711..974165c73c 100644
--- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Bind_this($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js
index 2b0a847d85..02b109636f 100644
--- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js
@@ -1,9 +1,7 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-function Class_state_field_constructor_assignment($$anchor, $$props) {
+export default function Class_state_field_constructor_assignment($$anchor, $$props) {
 	$.push($$props, true);
 
 	class Foo {
@@ -26,6 +24,4 @@ function Class_state_field_constructor_assignment($$anchor, $$props) {
 	}
 
 	$.pop();
-}
-
-export default Class_state_field_constructor_assignment;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
index 6ba11ebb16..f9c74cfc5a 100644
--- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Class_state_field_constructor_assignment($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
index d3d0ece855..c598f6a2f4 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
@@ -1,11 +1,9 @@
-// main.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
 var root = $.template(`<div></div> <svg></svg> <custom-element></custom-element> <div></div> <svg></svg> <custom-element></custom-element>`, 3);
 
-function Main($$anchor, $$props) {
+export default function Main($$anchor, $$props) {
 	$.push($$props, true);
 
 	// needs to be a snapshot test because jsdom does auto-correct the attribute casing
@@ -35,6 +33,4 @@ function Main($$anchor, $$props) {
 
 	$.append($$anchor, fragment);
 	$.pop();
-}
-
-export default Main;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
index 0352ce77aa..fb85d344ca 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
@@ -1,5 +1,3 @@
-// main.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Main($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js
index 1df7634eef..d1c32ab902 100644
--- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js
@@ -1,9 +1,7 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-function Each_string_template($$anchor, $$props) {
+export default function Each_string_template($$anchor, $$props) {
 	$.push($$props, false);
 	$.init();
 
@@ -19,6 +17,4 @@ function Each_string_template($$anchor, $$props) {
 
 	$.append($$anchor, fragment);
 	$.pop();
-}
-
-export default Each_string_template;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
index afb1daa750..3a5b2f77a7 100644
--- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Each_string_template($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
index 30de978c7c..15ab1d260c 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
@@ -1,9 +1,7 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-function Function_prop_no_getter($$anchor, $$props) {
+export default function Function_prop_no_getter($$anchor, $$props) {
 	$.push($$props, true);
 
 	let count = $.source(0);
@@ -30,6 +28,4 @@ function Function_prop_no_getter($$anchor, $$props) {
 
 	$.append($$anchor, fragment);
 	$.pop();
-}
-
-export default Function_prop_no_getter;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
index 1ae4cc7613..0aec1f7d9b 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Function_prop_no_getter($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js
index c973f87e21..1d8a850360 100644
--- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js
@@ -1,11 +1,9 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
 var root = $.template(`<h1>hello world</h1>`);
 
-function Hello_world($$anchor, $$props) {
+export default function Hello_world($$anchor, $$props) {
 	$.push($$props, false);
 	$.init();
 
@@ -13,6 +11,4 @@ function Hello_world($$anchor, $$props) {
 
 	$.append($$anchor, h1);
 	$.pop();
-}
-
-export default Hello_world;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
index 7007fe2b48..d40db0682d 100644
--- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Hello_world($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
index 61c5f6e83f..15fc41a906 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
@@ -25,4 +23,4 @@ if (import.meta.hot) {
 	});
 }
 
-export default Hmr;
+export default Hmr;
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
index d671f7884a..c0879a42df 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Hmr($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
index 162ace8501..120da7eaed 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
@@ -12,7 +10,7 @@ function reset(_, str, tpl) {
 
 var root = $.template(`<input> <input> <button>reset</button>`, 1);
 
-function State_proxy_literal($$anchor, $$props) {
+export default function State_proxy_literal($$anchor, $$props) {
 	$.push($$props, true);
 
 	let str = $.source('');
@@ -35,6 +33,4 @@ function State_proxy_literal($$anchor, $$props) {
 	$.pop();
 }
 
-export default State_proxy_literal;
-
 $.delegate(["click"]);
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
index c541299e36..073fe194f7 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function State_proxy_literal($$payload, $$props) {
diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js
index 0396cbe092..cfb5d595a9 100644
--- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js
@@ -1,9 +1,7 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-function Svelte_element($$anchor, $$props) {
+export default function Svelte_element($$anchor, $$props) {
 	$.push($$props, true);
 
 	let tag = $.prop($$props, "tag", 3, 'hr');
@@ -13,6 +11,4 @@ function Svelte_element($$anchor, $$props) {
 	$.element(node, tag, false);
 	$.append($$anchor, fragment);
 	$.pop();
-}
-
-export default Svelte_element;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
index 2bd6400a5c..1afc30985b 100644
--- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
@@ -1,5 +1,3 @@
-// index.svelte (Svelte VERSION)
-// Note: compiler output will change before 5.0 is released!
 import * as $ from "svelte/internal/server";
 
 export default function Svelte_element($$payload, $$props) {
diff --git a/sites/svelte-5-preview/src/lib/workers/compiler/index.js b/sites/svelte-5-preview/src/lib/workers/compiler/index.js
index d264e702a0..b5bf92e646 100644
--- a/sites/svelte-5-preview/src/lib/workers/compiler/index.js
+++ b/sites/svelte-5-preview/src/lib/workers/compiler/index.js
@@ -59,7 +59,8 @@ function compile({ id, source, options, return_ast }) {
 			const compiled = svelte.compile(source, {
 				filename: options.filename,
 				generate: options.generate,
-				dev: options.dev
+				dev: options.dev,
+				discloseVersion: false // less visual noise in the output tab
 			});
 
 			const { js, css, warnings, metadata } = compiled;

From 8e43e9aae0adb7158847ab3837a6beb991f16d9a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 25 Apr 2024 13:34:51 -0400
Subject: [PATCH 21/27] fix: correctly interpret empty aria- attribute (#11325)

* fix: correctly interpret empty aria- attribute

* changeset

* huh

* only suggest default value for boolean/tristate attributes

* adjust messages, disallow empty strings

* gah
---
 .changeset/brown-geckos-fry.md                |   5 +
 .../svelte/messages/compile-warnings/a11y.md  |   4 +-
 .../src/compiler/phases/2-analyze/a11y.js     |  15 +-
 packages/svelte/src/compiler/warnings.js      |   8 +-
 .../a11y-aria-proptypes-boolean/warnings.json |   4 +-
 .../a11y-aria-proptypes-integer/input.svelte  |   1 -
 .../a11y-aria-proptypes-integer/warnings.json |   4 +-
 .../a11y-aria-proptypes-number/input.svelte   |   2 +-
 .../a11y-aria-proptypes-number/warnings.json  |   8 +-
 .../a11y-aria-proptypes-string/input.svelte   |   2 +-
 .../a11y-aria-proptypes-string/warnings.json  |  15 +-
 .../a11y-aria-proptypes-token/input.svelte    |   2 +-
 .../a11y-aria-proptypes-token/warnings.json   |   2 +-
 .../input.svelte                              |   2 +-
 .../warnings.json                             |   2 +-
 .../input.svelte                              |   2 +-
 .../a11y-heading-has-content/input.svelte     |   2 +-
 .../a11y-heading-has-content/warnings.json    |   2 +-
 .../a11y-img-redundant-alt/input.svelte       |   2 +-
 .../input.svelte                              |   4 +-
 .../a11y-media-has-caption/input.svelte       |   3 +-
 .../a11y-media-has-caption/warnings.json      |  12 -
 .../input.svelte                              |  10 +-
 .../input.svelte                              |   2 +-
 .../input.svelte                              |  32 +-
 .../warnings.json                             |  20 +-
 .../input.svelte                              | 342 +++++++++---------
 .../warnings.json                             | 176 ++++-----
 28 files changed, 337 insertions(+), 348 deletions(-)
 create mode 100644 .changeset/brown-geckos-fry.md

diff --git a/.changeset/brown-geckos-fry.md b/.changeset/brown-geckos-fry.md
new file mode 100644
index 0000000000..e3b3e086af
--- /dev/null
+++ b/.changeset/brown-geckos-fry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly interpret empty aria- attribute
diff --git a/packages/svelte/messages/compile-warnings/a11y.md b/packages/svelte/messages/compile-warnings/a11y.md
index f85c17a56a..26023d28f3 100644
--- a/packages/svelte/messages/compile-warnings/a11y.md
+++ b/packages/svelte/messages/compile-warnings/a11y.md
@@ -44,11 +44,11 @@
 
 ## a11y_incorrect_aria_attribute_type
 
-> The value of '%attribute%' must be of type %type%
+> The value of '%attribute%' must be a %type%
 
 ## a11y_incorrect_aria_attribute_type_boolean
 
-> The value of '%attribute%' must be either 'true' or 'false'
+> The value of '%attribute%' must be either 'true' or 'false'. It cannot be empty
 
 ## a11y_incorrect_aria_attribute_type_id
 
diff --git a/packages/svelte/src/compiler/phases/2-analyze/a11y.js b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
index 91dc7cf8fb..a45c3c1f97 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/a11y.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/a11y.js
@@ -103,7 +103,7 @@ function has_disabled_attribute(attribute_map) {
 	const aria_disabled_attr = attribute_map.get('aria-disabled');
 	if (aria_disabled_attr) {
 		const aria_disabled_attr_value = get_static_value(aria_disabled_attr);
-		if (aria_disabled_attr_value === true) {
+		if (aria_disabled_attr_value === 'true') {
 			return true;
 		}
 	}
@@ -601,20 +601,19 @@ function is_parent(parent, elements) {
  */
 function validate_aria_attribute_value(attribute, name, schema, value) {
 	const type = schema.type;
-	const is_string = typeof value === 'string';
 
 	if (value === null) return;
-	if (value === true) value = 'true'; // TODO this is actually incorrect, and we should fix it
+	if (value === true) value = '';
 
 	if (type === 'boolean' && value !== 'true' && value !== 'false') {
 		w.a11y_incorrect_aria_attribute_type_boolean(attribute, name);
-	} else if (type === 'integer' && !Number.isInteger(+value)) {
+	} else if (type === 'integer' && (value === '' || !Number.isInteger(+value))) {
 		w.a11y_incorrect_aria_attribute_type_integer(attribute, name);
-	} else if (type === 'number' && isNaN(+value)) {
+	} else if (type === 'number' && (value === '' || isNaN(+value))) {
 		w.a11y_incorrect_aria_attribute_type(attribute, name, 'number');
-	} else if ((type === 'string' || type === 'id') && !is_string) {
-		w.a11y_incorrect_aria_attribute_type(attribute, name, 'string');
-	} else if (type === 'idlist' && !is_string) {
+	} else if ((type === 'string' || type === 'id') && value === '') {
+		w.a11y_incorrect_aria_attribute_type(attribute, name, 'non-empty string');
+	} else if (type === 'idlist' && value === '') {
 		w.a11y_incorrect_aria_attribute_type_idlist(attribute, name);
 	} else if (type === 'token') {
 		const values = (schema.values ?? []).map((value) => value.toString());
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index 6d871bf5c7..39d9d9efb0 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -134,22 +134,22 @@ export function a11y_img_redundant_alt(node) {
 }
 
 /**
- * The value of '%attribute%' must be of type %type%
+ * The value of '%attribute%' must be a %type%
  * @param {null | NodeLike} node
  * @param {string} attribute
  * @param {string} type
  */
 export function a11y_incorrect_aria_attribute_type(node, attribute, type) {
-	w(node, "a11y_incorrect_aria_attribute_type", `The value of '${attribute}' must be of type ${type}`);
+	w(node, "a11y_incorrect_aria_attribute_type", `The value of '${attribute}' must be a ${type}`);
 }
 
 /**
- * The value of '%attribute%' must be either 'true' or 'false'
+ * The value of '%attribute%' must be either 'true' or 'false'. It cannot be empty
  * @param {null | NodeLike} node
  * @param {string} attribute
  */
 export function a11y_incorrect_aria_attribute_type_boolean(node, attribute) {
-	w(node, "a11y_incorrect_aria_attribute_type_boolean", `The value of '${attribute}' must be either 'true' or 'false'`);
+	w(node, "a11y_incorrect_aria_attribute_type_boolean", `The value of '${attribute}' must be either 'true' or 'false'. It cannot be empty`);
 }
 
 /**
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json
index 10320c4308..1da0fc3fdf 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-boolean/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_incorrect_aria_attribute_type_boolean",
-		"message": "The value of 'aria-disabled' must be either 'true' or 'false'",
+		"message": "The value of 'aria-disabled' must be either 'true' or 'false'. It cannot be empty",
 		"start": {
 			"line": 5,
 			"column": 8
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_incorrect_aria_attribute_type_boolean",
-		"message": "The value of 'aria-disabled' must be either 'true' or 'false'",
+		"message": "The value of 'aria-disabled' must be either 'true' or 'false'. It cannot be empty",
 		"start": {
 			"line": 6,
 			"column": 8
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/input.svelte b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/input.svelte
index 74ea3f9dcc..af4f654038 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/input.svelte
@@ -1,7 +1,6 @@
 <div aria-level="yes"></div>
 <div aria-level="no"></div>
 <div aria-level={`abc`}></div>
-<div aria-level={true}></div>
 <div aria-level></div>
 <div aria-level={"false"}></div>
 <div aria-level={!"false"}></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json
index d8be2ef8cd..ba2ede1da1 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-integer/warnings.json
@@ -27,11 +27,11 @@
 		"code": "a11y_incorrect_aria_attribute_type_integer",
 		"message": "The value of 'aria-level' must be an integer",
 		"start": {
-			"line": 5,
+			"line": 4,
 			"column": 5
 		},
 		"end": {
-			"line": 5,
+			"line": 4,
 			"column": 15
 		}
 	}
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/input.svelte b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/input.svelte
index a9591aa12e..d0ac15889e 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/input.svelte
@@ -2,6 +2,6 @@
 <div aria-valuemax="no"></div>
 <div aria-valuemax={`abc`}></div>
 <div aria-valuemax={true}></div>
-<div aria-valuemax></div>
+<div aria-valuemax="true"></div>
 <div aria-valuemax={'false'}></div>
 <div aria-valuemax={!'false'}></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json
index ed5283f797..fade8615b4 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-number/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_incorrect_aria_attribute_type",
-		"message": "The value of 'aria-valuemax' must be of type number",
+		"message": "The value of 'aria-valuemax' must be a number",
 		"start": {
 			"line": 1,
 			"column": 5
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_incorrect_aria_attribute_type",
-		"message": "The value of 'aria-valuemax' must be of type number",
+		"message": "The value of 'aria-valuemax' must be a number",
 		"start": {
 			"line": 2,
 			"column": 5
@@ -25,14 +25,14 @@
 	},
 	{
 		"code": "a11y_incorrect_aria_attribute_type",
-		"message": "The value of 'aria-valuemax' must be of type number",
+		"message": "The value of 'aria-valuemax' must be a number",
 		"start": {
 			"line": 5,
 			"column": 5
 		},
 		"end": {
 			"line": 5,
-			"column": 18
+			"column": 25
 		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/input.svelte b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/input.svelte
index c21efdd55b..0719e80c7e 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/input.svelte
@@ -1,4 +1,4 @@
-<div aria-label></div>
+<div aria-label="true"></div>
 <div aria-label={true}></div>
 <div aria-label={false}></div>
 <div aria-label={1234}></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json
index 3a93dbcee6..fe51488c70 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-string/warnings.json
@@ -1,14 +1 @@
-[
-	{
-		"code": "a11y_incorrect_aria_attribute_type",
-		"message": "The value of 'aria-label' must be of type string",
-		"start": {
-			"line": 1,
-			"column": 5
-		},
-		"end": {
-			"line": 1,
-			"column": 15
-		}
-	}
-]
+[]
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/input.svelte b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/input.svelte
index 70dd68e30d..4b6e65d4ad 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/input.svelte
@@ -1,6 +1,6 @@
 <div aria-sort=""></div>
 <div aria-sort="incorrect"></div>
-<div aria-sort></div>
+<div aria-sort="true"></div>
 <div aria-sort={true}></div>
 <div aria-sort={"false"}></div>
 <div aria-sort="ascending descending"></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json
index fea249be0a..75ac994ce1 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-token/warnings.json
@@ -32,7 +32,7 @@
 		},
 		"end": {
 			"line": 3,
-			"column": 14
+			"column": 21
 		}
 	},
 	{
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/input.svelte b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/input.svelte
index 9ebf8b35c2..364afc0c0b 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/input.svelte
@@ -1,6 +1,6 @@
 <div aria-relevant=""></div>
 <div aria-relevant="foobar"></div>
-<div aria-relevant></div>
+<div aria-relevant="true"></div>
 <div aria-relevant={true}></div>
 <div aria-relevant={"false"}></div>
 <div aria-relevant="additions removals_"></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
index 10a92d1790..c4923707ca 100644
--- a/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
@@ -32,7 +32,7 @@
 		},
 		"end": {
 			"line": 3,
-			"column": 18
+			"column": 25
 		}
 	},
 	{
diff --git a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
index 4ca8d30c4d..4f23811a01 100644
--- a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
@@ -57,7 +57,7 @@
 <input on:click={noop} type="hidden" />
 
 <!-- svelte-ignore a11y_no_static_element_interactions -->
-<div on:click={noop} aria-hidden></div>
+<div on:click={noop} aria-hidden="true"></div>
 <!-- svelte-ignore a11y_no_static_element_interactions -->
 <div on:click={noop} aria-hidden="true"></div>
 <!-- svelte-ignore a11y_no_static_element_interactions -->
diff --git a/packages/svelte/tests/validator/samples/a11y-heading-has-content/input.svelte b/packages/svelte/tests/validator/samples/a11y-heading-has-content/input.svelte
index 1414af825d..7991bcc11b 100644
--- a/packages/svelte/tests/validator/samples/a11y-heading-has-content/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-heading-has-content/input.svelte
@@ -1,2 +1,2 @@
 <h1></h1>
-<h2 aria-hidden>invisible header</h2>
\ No newline at end of file
+<h2 aria-hidden="true">invisible header</h2>
diff --git a/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json b/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
index 296d680777..da77e2d36d 100644
--- a/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-heading-has-content/warnings.json
@@ -20,7 +20,7 @@
 		},
 		"end": {
 			"line": 2,
-			"column": 15
+			"column": 22
 		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/input.svelte b/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/input.svelte
index a3528a5c41..d1360b813b 100644
--- a/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-img-redundant-alt/input.svelte
@@ -1,5 +1,5 @@
 <img src="foo" alt="Foo eating a sandwich." />
-<img src="bar" aria-hidden alt="Picture of me taking a photo of an image" />
+<img src="bar" aria-hidden="true" alt="Picture of me taking a photo of an image" />
 <img src="foo" alt="Photo of foo being weird." />
 <img src="bar" alt="Image of me at a bar!" />
 <img src="foo" alt="Picture of baz fixing a bug." />
diff --git a/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/input.svelte b/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/input.svelte
index 270424ccab..673c615704 100644
--- a/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-interactive-supports-focus/input.svelte
@@ -1,6 +1,6 @@
 <!-- VALID -->
-<div aria-hidden role="button" on:keypress={() => {}}></div>
-<div aria-disabled role="button" on:keypress={() => {}}></div>
+<div aria-hidden="true" role="button" on:keypress={() => {}}></div>
+<div aria-disabled="true" role="button" on:keypress={() => {}}></div>
 <div disabled role="button" on:keypress={() => {}}></div>
 <div role="presentation" on:keypress={() => {}}></div>
 <button on:click={() => {}}></button>
diff --git a/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte b/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte
index 30f9a05f91..2e479d97da 100644
--- a/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte
@@ -2,6 +2,5 @@
 <video></video>
 <video><track /></video>
 <audio></audio>
-<video aria-hidden></video>
-<video aria-hidden="false"></video>
 <video aria-hidden="true"></video>
+<video aria-hidden="false"></video>
diff --git a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
index 3ef72edc78..2a7de1f730 100644
--- a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
@@ -23,18 +23,6 @@
 			"line": 3
 		}
 	},
-	{
-		"code": "a11y_media_has_caption",
-		"end": {
-			"column": 27,
-			"line": 5
-		},
-		"message": "`<video>` elements must have a `<track kind=\"captions\">`",
-		"start": {
-			"column": 0,
-			"line": 5
-		}
-	},
 	{
 		"code": "a11y_media_has_caption",
 		"end": {
diff --git a/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte b/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte
index 0dedcafd90..c9f75efe26 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte
@@ -83,11 +83,11 @@
 <div role="menu"></div>
 <div role="menubar"></div>
 <div role="menuitem"></div>
-<div role="menuitemcheckbox" aria-checked></div>
-<div role="menuitemradio" aria-checked></div>
-<div role="option" aria-selected></div>
+<div role="menuitemcheckbox" aria-checked="true"></div>
+<div role="menuitemradio" aria-checked="true"></div>
+<div role="option" aria-selected="true"></div>
 <div role="progressbar"></div>
-<div role="radio" aria-checked></div>
+<div role="radio" aria-checked="true"></div>
 <div role="radiogroup"></div>
 <div role="row"></div>
 <div role="rowheader"></div>
@@ -95,7 +95,7 @@
 <div role="searchbox"></div>
 <div role="slider" aria-valuenow={0}></div>
 <div role="spinbutton"></div>
-<div role="switch" aria-checked></div>
+<div role="switch" aria-checked="true"></div>
 <div role="tab"></div>
 <div role="textbox"></div>
 <div role="treeitem" aria-selected={true}></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte
index 7c38111cda..742d21245b 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte
@@ -1,7 +1,7 @@
 <!-- VALID -->
 <div role="presentation" on:mouseup={() => {}}></div>
 <div role="button" tabindex="-1" on:click={() => {}} on:keypress={() => {}}></div>
-<div role="listitem" aria-hidden on:click={() => {}} on:keypress={() => {}}></div>
+<div role="listitem" aria-hidden="true" on:click={() => {}} on:keypress={() => {}}></div>
 <button on:click={() => {}}></button>
 <h1 contenteditable="true" on:keydown={() => {}}>Heading</h1>
 <h1>Heading</h1>
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte
index e272ac79f5..e5db8719b0 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte
@@ -9,39 +9,39 @@
 <dir role="menu"></dir>
 <dl role="menubar"></dl>
 <dfn role="menuitem"></dfn>
-<dt role="menuitemcheckbox" aria-checked></dt>
-<fieldset role="menuitemradio" aria-checked></fieldset>
+<dt role="menuitemcheckbox" aria-checked="true"></dt>
+<fieldset role="menuitemradio" aria-checked="true"></fieldset>
 <figure>
-	<figcaption role="menuitemradio" aria-checked></figcaption>
+	<figcaption role="menuitemradio" aria-checked="true"></figcaption>
 </figure>
-<figure role="option" aria-selected></figure>
-<footer role="radio" aria-checked></footer>
+<figure role="option" aria-selected="true"></figure>
+<footer role="radio" aria-checked="true"></footer>
 <form role="radiogroup"></form>
 <h1 role="rowheader">Button</h1>
 <h2 role="scrollbar" aria-controls={[]} aria-valuenow={0}>Button</h2>
 <h3 role="searchbox">Button</h3>
 <h4 role="slider" aria-valuenow={0}>Button</h4>
 <h5 role="spinbutton">Button</h5>
-<h6 role="switch" aria-checked>Button</h6>
+<h6 role="switch" aria-checked="true">Button</h6>
 <hr role="tab" />
 <img role="tabpanel" alt="tabpanel" />
 <label role="textbox"></label>
 <legend role="toolbar"></legend>
 <li role="tree"></li>
 <main role="treegrid"></main>
-<mark role="treeitem" aria-selected></mark>
+<mark role="treeitem" aria-selected="true"></mark>
 <marquee role="doc-backlink"></marquee>
 <menu role="doc-biblioref"></menu>
 <meter role="doc-glossref"></meter>
 <nav role="doc-noteref"></nav>
 <ol role="button"></ol>
-<optgroup role="treeitem" aria-selected></optgroup>
+<optgroup role="treeitem" aria-selected="true"></optgroup>
 <output role="treegrid"></output>
 <p role="columnheader"></p>
 <pre role="tree"></pre>
-<progress role="combobox" aria-controls={[]} aria-expanded></progress>
+<progress role="combobox" aria-controls={[]} aria-expanded="true"></progress>
 <ruby role="toolbar"></ruby>
-<section role="radio" aria-label="radio" aria-checked></section>
+<section role="radio" aria-label="radio" aria-checked="true"></section>
 <table role="menu"></table>
 <tbody role="searchbox"></tbody>
 <tfoot role="listbox"></tfoot>
@@ -82,11 +82,11 @@
 <div role="menu"></div>
 <div role="menubar"></div>
 <div role="menuitem"></div>
-<div role="menuitemcheckbox" aria-checked></div>
-<div role="menuitemradio" aria-checked></div>
-<div role="option" aria-selected></div>
+<div role="menuitemcheckbox" aria-checked="true"></div>
+<div role="menuitemradio" aria-checked="true"></div>
+<div role="option" aria-selected="true"></div>
 <div role="progressbar"></div>
-<div role="radio" aria-checked></div>
+<div role="radio" aria-checked="true"></div>
 <div role="radiogroup"></div>
 <div role="row"></div>
 <div role="rowheader"></div>
@@ -94,11 +94,11 @@
 <div role="searchbox"></div>
 <div role="slider" aria-valuenow={0}></div>
 <div role="spinbutton"></div>
-<div role="switch" aria-checked></div>
+<div role="switch" aria-checked="true"></div>
 <div role="tab"></div>
 <div role="textbox"></div>
 <div role="treeitem" aria-selected={true}></div>
-<body role="combobox" aria-controls={[]} aria-expanded></body>
+<body role="combobox" aria-controls={[]} aria-expanded="true"></body>
 <td role="button"></td>
 
 <!-- VALID: HTML elements attributed with a non-interactive role -->
diff --git a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
index e8d54ee9e5..839c6639e5 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
@@ -128,7 +128,7 @@
 		},
 		"end": {
 			"line": 12,
-			"column": 46
+			"column": 53
 		}
 	},
 	{
@@ -140,7 +140,7 @@
 		},
 		"end": {
 			"line": 13,
-			"column": 55
+			"column": 62
 		}
 	},
 	{
@@ -152,7 +152,7 @@
 		},
 		"end": {
 			"line": 15,
-			"column": 60
+			"column": 67
 		}
 	},
 	{
@@ -164,7 +164,7 @@
 		},
 		"end": {
 			"line": 17,
-			"column": 45
+			"column": 52
 		}
 	},
 	{
@@ -176,7 +176,7 @@
 		},
 		"end": {
 			"line": 18,
-			"column": 43
+			"column": 50
 		}
 	},
 	{
@@ -260,7 +260,7 @@
 		},
 		"end": {
 			"line": 25,
-			"column": 42
+			"column": 49
 		}
 	},
 	{
@@ -356,7 +356,7 @@
 		},
 		"end": {
 			"line": 32,
-			"column": 43
+			"column": 50
 		}
 	},
 	{
@@ -440,7 +440,7 @@
 		},
 		"end": {
 			"line": 38,
-			"column": 51
+			"column": 58
 		}
 	},
 	{
@@ -488,7 +488,7 @@
 		},
 		"end": {
 			"line": 42,
-			"column": 70
+			"column": 77
 		}
 	},
 	{
@@ -512,7 +512,7 @@
 		},
 		"end": {
 			"line": 44,
-			"column": 64
+			"column": 71
 		}
 	},
 	{
diff --git a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/input.svelte b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/input.svelte
index fcbb89ca42..d641d77e5d 100644
--- a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/input.svelte
@@ -1,9 +1,9 @@
 <!-- INVALID -->
 <a aria-setsize="0" href="/">Link</a>
-<area aria-pressed alt="" />
+<area aria-pressed="true" alt="" />
 <article aria-autocomplete="inline"></article>
-<aside aria-modal></aside>
-<body aria-invalid></body>
+<aside aria-modal="true"></aside>
+<body aria-invalid="true"></body>
 <button aria-valuemax="0"></button>
 <datalist aria-valuenow="0"></datalist>
 <dd aria-rowindex="0"></dd>
@@ -12,149 +12,149 @@
 <details aria-orientation="undefined"></details>
 <dt aria-valuemin="0"></dt>
 <fieldset aria-orientation="undefined"></fieldset>
-<form aria-disabled></form>
-<h1 aria-selected>H1</h1>
-<h2 aria-selected>H2</h2>
-<h3 aria-expanded>H3</h3>
+<form aria-disabled="true"></form>
+<h1 aria-selected="true">H1</h1>
+<h2 aria-selected="true">H2</h2>
+<h3 aria-expanded="true">H3</h3>
 <h4 aria-valuemin="0">H4</h4>
-<h5 aria-readonly>H5</h5>
+<h5 aria-readonly="true">H5</h5>
 <h6 aria-valuemin="0">H6</h6>
-<hr aria-required />
+<hr aria-required="true" />
 <img aria-level="0" alt="invalid aria" />
-<li aria-required></li>
+<li aria-required="true"></li>
 <link aria-rowcount="0" />
 <menu aria-valuemin="0"></menu>
 <meter aria-colspan="0"></meter>
-<nav aria-valuetext=""></nav>
+<nav aria-valuetext="x"></nav>
 <ol aria-sort="none"></ol>
-<option aria-invalid></option>
+<option aria-invalid="true"></option>
 <optgroup aria-sort="none"></optgroup>
-<output aria-multiline></output>
+<output aria-multiline="true"></output>
 <progress aria-rowcount="0"></progress>
-<section aria-invalid></section>
+<section aria-invalid="true"></section>
 <summary aria-rowcount="0"></summary>
 <tbody aria-colspan="0"></tbody>
 <textarea aria-valuenow="0"></textarea>
-<tfoot aria-required></tfoot>
+<tfoot aria-required="true"></tfoot>
 <thead aria-valuemin="0"></thead>
-<tr aria-pressed></tr>
-<ul aria-multiselectable></ul>
+<tr aria-pressed="true"></tr>
+<ul aria-multiselectable="true"></ul>
 
 <div role="alert" aria-colspan="0"></div>
 <div role="alertdialog" aria-autocomplete="inline"></div>
-<div role="application" aria-required></div>
-<div role="article" aria-multiline></div>
+<div role="application" aria-required="true"></div>
+<div role="article" aria-multiline="true"></div>
 <div role="banner" aria-autocomplete="inline"></div>
-<div role="blockquote" aria-valuetext=""></div>
+<div role="blockquote" aria-valuetext="x"></div>
 <div role="button" aria-colspan="0"></div>
 <div role="caption" aria-setsize="0"></div>
-<div role="cell" aria-multiline></div>
-<div role="checkbox" aria-multiline aria-checked></div>
-<div role="code" aria-invalid></div>
+<div role="cell" aria-multiline="true"></div>
+<div role="checkbox" aria-multiline="true" aria-checked="true"></div>
+<div role="code" aria-invalid="true"></div>
 <div role="columnheader" aria-colcount="0"></div>
-<div role="combobox" aria-multiselectable aria-controls={[]} aria-expanded></div>
-<div role="complementary" aria-readonly></div>
-<div role="contentinfo" aria-valuetext=""></div>
-<div role="definition" aria-multiline></div>
-<div role="deletion" aria-expanded></div>
-<div role="dialog" aria-multiline></div>
+<div role="combobox" aria-multiselectable="true" aria-controls={[]} aria-expanded="true"></div>
+<div role="complementary" aria-readonly="true"></div>
+<div role="contentinfo" aria-valuetext="x"></div>
+<div role="definition" aria-multiline="true"></div>
+<div role="deletion" aria-expanded="true"></div>
+<div role="dialog" aria-multiline="true"></div>
 <div role="directory" aria-rowcount="0"></div>
 <div role="document" aria-valuemin="0"></div>
 <div role="emphasis" aria-rowindex="0"></div>
 <div role="feed" aria-colindex="0"></div>
 <div role="figure" aria-valuemax="0"></div>
-<div role="form" aria-readonly></div>
+<div role="form" aria-readonly="true"></div>
 <div role="generic" aria-valuemax="0"></div>
-<div role="grid" aria-checked></div>
+<div role="grid" aria-checked="true"></div>
 <div role="gridcell" aria-level="0"></div>
 <div role="group" aria-colspan="0"></div>
 <div role="heading" aria-activedescendant="id" tabindex="-1" aria-level="0"></div>
 <div role="insertion" aria-errormessage="error"></div>
-<div role="link" aria-multiline></div>
-<div role="list" aria-selected></div>
-<div role="listbox" aria-haspopup></div>
+<div role="link" aria-multiline="true"></div>
+<div role="list" aria-selected="true"></div>
+<div role="listbox" aria-haspopup="true"></div>
 <div role="listitem" aria-activedescendant="id" tabindex="-1"></div>
-<div role="log" aria-required></div>
+<div role="log" aria-required="true"></div>
 <div role="main" aria-sort="none"></div>
 <div role="marquee" aria-autocomplete="inline"></div>
-<div role="math" aria-multiline></div>
-<div role="menu" aria-checked></div>
+<div role="math" aria-multiline="true"></div>
+<div role="menu" aria-checked="true"></div>
 <div role="menubar" aria-errormessage="error"></div>
-<div role="menuitem" aria-checked></div>
-<div role="menuitemcheckbox" aria-pressed aria-checked="false"></div>
+<div role="menuitem" aria-checked="true"></div>
+<div role="menuitemcheckbox" aria-pressed="true" aria-checked="false"></div>
 <div role="menuitemradio" aria-rowspan="0" aria-checked="false"></div>
-<div role="meter" aria-valuenow="0" aria-haspopup></div>
-<div role="navigation" aria-expanded></div>
-<div role="none" aria-placeholder=""></div>
-<div role="note" aria-modal></div>
-<div role="option" aria-selected aria-valuemax="0"></div>
+<div role="meter" aria-valuenow="0" aria-haspopup="true"></div>
+<div role="navigation" aria-expanded="true"></div>
+<div role="none" aria-placeholder="x"></div>
+<div role="note" aria-modal="true"></div>
+<div role="option" aria-selected="true" aria-valuemax="0"></div>
 <div role="paragraph" aria-level="0"></div>
-<div role="presentation" aria-disabled></div>
-<div role="progressbar" aria-expanded></div>
-<div role="radio" aria-checked aria-rowindex="0"></div>
+<div role="presentation" aria-disabled="true"></div>
+<div role="progressbar" aria-expanded="true"></div>
+<div role="radio" aria-checked="true" aria-rowindex="0"></div>
 <div role="radiogroup" aria-valuenow="0"></div>
 <div role="region" aria-rowspan="0"></div>
-<div role="row" aria-required></div>
-<div role="rowgroup" aria-expanded></div>
+<div role="row" aria-required="true"></div>
+<div role="rowgroup" aria-expanded="true"></div>
 <div role="rowheader" aria-activedescendant="id" tabindex="0"></div>
 <div role="scrollbar" aria-controls={[]} aria-valuenow="0" aria-rowspan="0"></div>
 <div role="search" aria-autocomplete="inline"></div>
 <div role="searchbox" aria-colindex="0"></div>
 <div role="separator" aria-sort="none"></div>
-<div role="slider" aria-valuenow="0" aria-placeholder=""></div>
+<div role="slider" aria-valuenow="0" aria-placeholder="x"></div>
 <div role="spinbutton" aria-posinset="0"></div>
 <div role="status" aria-valuemin="0"></div>
 <div role="strong" aria-valuemin="0"></div>
 <div role="subscript" aria-colcount="0"></div>
 <div role="superscript" aria-level="0"></div>
-<div role="switch" aria-checked aria-valuenow="0"></div>
-<div role="tab" aria-required></div>
-<div role="table" aria-modal></div>
+<div role="switch" aria-checked="true" aria-valuenow="0"></div>
+<div role="tab" aria-required="true"></div>
+<div role="table" aria-modal="true"></div>
 <div role="tablist" aria-setsize="0"></div>
-<div role="tabpanel" aria-multiselectable></div>
+<div role="tabpanel" aria-multiselectable="true"></div>
 <div role="term" aria-posinset="0"></div>
 <div role="textbox" aria-colspan="0"></div>
-<div role="time" aria-selected></div>
+<div role="time" aria-selected="true"></div>
 <div role="timer" aria-sort="none"></div>
-<div role="toolbar" aria-valuetext=""></div>
-<div role="tooltip" aria-multiline></div>
-<div role="tree" aria-expanded></div>
+<div role="toolbar" aria-valuetext="x"></div>
+<div role="tooltip" aria-multiline="true"></div>
+<div role="tree" aria-expanded="true"></div>
 <div role="treegrid" aria-level="0"></div>
-<div role="treeitem" aria-selected aria-activedescendant="id" tabindex="-1"></div>
+<div role="treeitem" aria-selected="true" aria-activedescendant="id" tabindex="-1"></div>
 <div role="doc-abstract" aria-colindex="0"></div>
 <div role="doc-acknowledgments" aria-setsize="0"></div>
-<div role="doc-afterword" aria-modal></div>
+<div role="doc-afterword" aria-modal="true"></div>
 <div role="doc-appendix" aria-activedescendant="id" tabindex="-1"></div>
 <div role="doc-backlink" aria-colspan="0"></div>
 <div role="doc-biblioentry" aria-valuemax="0"></div>
 <div role="doc-bibliography" aria-level="0"></div>
-<div role="doc-biblioref" aria-checked></div>
-<div role="doc-chapter" aria-required></div>
+<div role="doc-biblioref" aria-checked="true"></div>
+<div role="doc-chapter" aria-required="true"></div>
 <div role="doc-colophon" aria-setsize="0"></div>
 <div role="doc-conclusion" aria-colindex="0"></div>
-<div role="doc-cover" aria-modal></div>
-<div role="doc-credit" aria-selected></div>
+<div role="doc-cover" aria-modal="true"></div>
+<div role="doc-credit" aria-selected="true"></div>
 <div role="doc-credits" aria-orientation="undefined"></div>
 <div role="doc-dedication" aria-level="0"></div>
-<div role="doc-endnote" aria-checked></div>
+<div role="doc-endnote" aria-checked="true"></div>
 <div role="doc-endnotes" aria-colcount="0"></div>
-<div role="doc-epigraph" aria-multiline></div>
+<div role="doc-epigraph" aria-multiline="true"></div>
 <div role="doc-epilogue" aria-colcount="0"></div>
 <div role="doc-errata" aria-sort="none"></div>
-<div role="doc-example" aria-multiselectable></div>
+<div role="doc-example" aria-multiselectable="true"></div>
 <div role="doc-footnote" aria-rowcount="0"></div>
 <div role="doc-foreword" aria-valuenow="0"></div>
-<div role="doc-glossary" aria-valuetext=""></div>
-<div role="doc-glossref" aria-placeholder=""></div>
+<div role="doc-glossary" aria-valuetext="x"></div>
+<div role="doc-glossref" aria-placeholder="x"></div>
 <div role="doc-index" aria-rowcount="0"></div>
-<div role="doc-introduction" aria-pressed></div>
+<div role="doc-introduction" aria-pressed="true"></div>
 <div role="doc-noteref" aria-valuenow="0"></div>
-<div role="doc-notice" aria-selected></div>
+<div role="doc-notice" aria-selected="true"></div>
 <div role="doc-pagebreak" aria-rowcount="0"></div>
-<div role="doc-pagelist" aria-modal></div>
+<div role="doc-pagelist" aria-modal="true"></div>
 <div role="doc-part" aria-setsize="0"></div>
 <div role="doc-preface" aria-orientation="undefined"></div>
-<div role="doc-prologue" aria-required></div>
+<div role="doc-prologue" aria-required="true"></div>
 <div role="doc-pullquote" aria-rowcount="0"></div>
 <div role="doc-qna" aria-setsize="0"></div>
 <div role="doc-subtitle" aria-rowindex="0"></div>
@@ -164,208 +164,208 @@
 <!-- input and menuitem have different implicit roles based on different type attributes, and thus different valid and invalid props -->
 <!-- INVALID -->
 <input type="text" aria-rowspan="0" /> <!-- implicit role: textbox -->
-<input type="tel" aria-pressed /> <!-- implicit role: textbox -->
+<input type="tel" aria-pressed="true" /> <!-- implicit role: textbox -->
 <input type="url" aria-level="0" /> <!-- implicit role: textbox -->
-<input type="email" aria-pressed /> <!-- implicit role: textbox -->
+<input type="email" aria-pressed="true" /> <!-- implicit role: textbox -->
 <input type="search" aria-valuetext="text" /> <!-- implicit role: searchbox -->
 <input type="text" list={['id']} aria-valuemin="0" /> <!-- implicit role: combobox -->
 <input type="tel" list={['id']} aria-colspan="0" /> <!-- implicit role: combobox -->
 <input type="url" list={['id']} aria-posinset="0" /> <!-- implicit role: combobox -->
-<input type="email" list={['id']} aria-modal /> <!-- implicit role: combobox -->
+<input type="email" list={['id']} aria-modal="true" /> <!-- implicit role: combobox -->
 <input type="search" list={['id']} aria-rowindex="0" /> <!-- implicit role: combobox -->
 <input type="image" alt="some text" aria-valuemax="0" /> <!-- implicit role: button -->
-<input type="reset" aria-modal /> <!-- implicit role: button -->
+<input type="reset" aria-modal="true" /> <!-- implicit role: button -->
 <input type="submit" aria-placeholder="placeholder" /> <!-- implicit role: button -->
 <input type="checkbox" aria-rowindex="0" /> <!-- implicit role: checkbox -->
 <input type="radio" aria-valuetext="text" /> <!-- implicit role: radio -->
-<input type="range" aria-checked /> <!-- implicit role: slider -->
+<input type="range" aria-checked="true" /> <!-- implicit role: slider -->
 <menuitem type="command" aria-colindex="0"></menuitem> <!-- implicit role: menuitem -->
 <menuitem type="checkbox" aria-colcount="0"></menuitem> <!-- implicit role: menuitemcheckbox -->
 <menuitem type="radio" aria-placeholder="placeholder"></menuitem> <!-- implicit role: menuitemradio -->
 
 <!-- VALID -->
-<a aria-keyshortcuts="" href="/">Link</a>
-<area aria-expanded alt="" />
+<a aria-keyshortcuts="x" href="/">Link</a>
+<area aria-expanded="true" alt="" />
 <article aria-dropeffect="none"></article>
-<aside aria-keyshortcuts=""></aside>
+<aside aria-keyshortcuts="x"></aside>
 <body aria-labelledby="id"></body>
-<button aria-hidden></button>
+<button aria-hidden="true"></button>
 <datalist aria-activedescendant="id" tabindex="0"></datalist>
 <dd aria-labelledby="id"></dd>
 <dfn aria-details="id"></dfn>
-<dialog aria-keyshortcuts=""></dialog>
-<details aria-keyshortcuts=""></details>
-<dt aria-hidden></dt>
+<dialog aria-keyshortcuts="x"></dialog>
+<details aria-keyshortcuts="x"></details>
+<dt aria-hidden="true"></dt>
 <fieldset aria-owns="id"></fieldset>
-<form aria-keyshortcuts=""></form>
-<h1 aria-keyshortcuts="">H1</h1>
+<form aria-keyshortcuts="x"></form>
+<h1 aria-keyshortcuts="x">H1</h1>
 <h2 aria-controls={[]}>H2</h2>
 <h3 aria-controls={[]}>H3</h3>
 <h4 aria-details="id">H4</h4>
-<h5 aria-grabbed>H5</h5>
-<h6 aria-grabbed>H6</h6>
+<h5 aria-grabbed="true">H5</h5>
+<h6 aria-grabbed="true">H6</h6>
 <hr aria-relevant="all" />
 <img aria-flowto="id" alt="Valid aria role" />
-<li aria-label=""></li>
-<link aria-hidden />
-<menu aria-roledescription=""></menu>
+<li aria-label="x"></li>
+<link aria-hidden="true" />
+<menu aria-roledescription="x"></menu>
 <meter aria-valuemin="0"></meter>
 <nav aria-labelledby="id"></nav>
-<ol aria-grabbed></ol>
-<option aria-selected></option>
-<optgroup aria-hidden></optgroup>
+<ol aria-grabbed="true"></ol>
+<option aria-selected="true"></option>
+<optgroup aria-hidden="true"></optgroup>
 <output aria-dropeffect="none"></output>
-<progress aria-hidden></progress>
+<progress aria-hidden="true"></progress>
 <section aria-details="id"></section>
 <summary aria-controls={[]}></summary>
 <tbody aria-controls={[]}></tbody>
-<textarea aria-busy></textarea>
+<textarea aria-busy="true"></textarea>
 <tfoot aria-labelledby="id"></tfoot>
 <thead aria-flowto="id"></thead>
 <tr aria-describedby="id"></tr>
 <ul aria-dropeffect="none"></ul>
 
 <div role="alert" aria-owns="id"></div>
-<div role="alertdialog" aria-busy></div>
-<div role="application" aria-invalid></div>
-<div role="article" aria-atomic></div>
-<div role="banner" aria-grabbed></div>
-<div role="blockquote" aria-busy></div>
-<div role="button" aria-busy></div>
-<div role="caption" aria-grabbed></div>
+<div role="alertdialog" aria-busy="true"></div>
+<div role="application" aria-invalid="true"></div>
+<div role="article" aria-atomic="true"></div>
+<div role="banner" aria-grabbed="true"></div>
+<div role="blockquote" aria-busy="true"></div>
+<div role="button" aria-busy="true"></div>
+<div role="caption" aria-grabbed="true"></div>
 <div role="cell" aria-rowindex="0"></div>
-<div role="checkbox" aria-checked aria-details="id"></div>
-<div role="code" aria-keyshortcuts=""></div>
+<div role="checkbox" aria-checked="true" aria-details="id"></div>
+<div role="code" aria-keyshortcuts="x"></div>
 <div role="columnheader" aria-rowspan="0"></div>
-<div role="combobox" aria-invalid aria-controls={[]} aria-expanded></div>
-<div role="complementary" aria-label=""></div>
+<div role="combobox" aria-invalid="true" aria-controls={[]} aria-expanded="true"></div>
+<div role="complementary" aria-label="x"></div>
 <div role="contentinfo" aria-dropeffect="none"></div>
-<div role="definition" aria-grabbed></div>
-<div role="deletion" aria-busy></div>
+<div role="definition" aria-grabbed="true"></div>
+<div role="deletion" aria-busy="true"></div>
 <div role="dialog" aria-flowto="id"></div>
 <div role="directory" aria-controls={[]}></div>
-<div role="document" aria-grabbed></div>
-<div role="emphasis" aria-atomic></div>
-<div role="feed" aria-atomic></div>
-<div role="figure" aria-busy></div>
-<div role="form" aria-roledescription=""></div>
-<div role="generic" aria-current></div>
-<div role="grid" aria-busy></div>
+<div role="document" aria-grabbed="true"></div>
+<div role="emphasis" aria-atomic="true"></div>
+<div role="feed" aria-atomic="true"></div>
+<div role="figure" aria-busy="true"></div>
+<div role="form" aria-roledescription="x"></div>
+<div role="generic" aria-current="true"></div>
+<div role="grid" aria-busy="true"></div>
 <div role="gridcell" aria-relevant="all"></div>
-<div role="group" aria-busy></div>
+<div role="group" aria-busy="true"></div>
 <div role="heading" aria-level="" aria-flowto="id"></div>
-<div role="img" aria-grabbed></div>
-<div role="insertion" aria-roledescription=""></div>
+<div role="img" aria-grabbed="true"></div>
+<div role="insertion" aria-roledescription="x"></div>
 <div role="link" aria-owns="id"></div>
 <div role="list" aria-labelledby="id"></div>
-<div role="listbox" aria-current></div>
+<div role="listbox" aria-current="true"></div>
 <div role="listitem" aria-controls={[]}></div>
 <div role="log" aria-controls={[]}></div>
-<div role="main" aria-keyshortcuts=""></div>
+<div role="main" aria-keyshortcuts="x"></div>
 <div role="marquee" aria-labelledby="id"></div>
 <div role="math" aria-labelledby="id"></div>
-<div role="menu" aria-atomic></div>
-<div role="menubar" aria-grabbed></div>
-<div role="menuitem" aria-grabbed></div>
-<div role="menuitemcheckbox" aria-checked aria-controls={[]}></div>
-<div role="menuitemradio" aria-checked aria-grabbed></div>
-<div role="meter" aria-valuenow="0" aria-valuetext=""></div>
+<div role="menu" aria-atomic="true"></div>
+<div role="menubar" aria-grabbed="true"></div>
+<div role="menuitem" aria-grabbed="true"></div>
+<div role="menuitemcheckbox" aria-checked="true" aria-controls={[]}></div>
+<div role="menuitemradio" aria-checked="true" aria-grabbed="true"></div>
+<div role="meter" aria-valuenow="0" aria-valuetext="x"></div>
 <div role="navigation" aria-controls={[]}></div>
 <div role="none" undefined></div>
-<div role="note" aria-hidden></div>
-<div role="option" aria-selected aria-describedby="id"></div>
-<div role="paragraph" aria-grabbed></div>
+<div role="note" aria-hidden="true"></div>
+<div role="option" aria-selected="true" aria-describedby="id"></div>
+<div role="paragraph" aria-grabbed="true"></div>
 <div role="presentation" aria-relevant="all"></div>
 <div role="progressbar" aria-valuemin="0"></div>
-<div role="radio" aria-checked aria-roledescription=""></div>
-<div role="radiogroup" aria-required></div>
-<div role="region" aria-roledescription=""></div>
+<div role="radio" aria-checked="true" aria-roledescription="x"></div>
+<div role="radiogroup" aria-required="true"></div>
+<div role="region" aria-roledescription="x"></div>
 <div role="row" aria-posinset="0"></div>
-<div role="rowgroup" aria-busy></div>
-<div role="rowheader" aria-label=""></div>
+<div role="rowgroup" aria-busy="true"></div>
+<div role="rowheader" aria-label="x"></div>
 <div role="scrollbar" aria-controls={[]} aria-valuenow="0" aria-relevant="all"></div>
-<div role="search" aria-grabbed></div>
+<div role="search" aria-grabbed="true"></div>
 <div role="searchbox" aria-dropeffect="none"></div>
-<div role="separator" aria-roledescription=""></div>
+<div role="separator" aria-roledescription="x"></div>
 <div role="slider" aria-valuenow="0" aria-relevant="all"></div>
-<div role="spinbutton" aria-required></div>
-<div role="status" aria-label=""></div>
-<div role="strong" aria-keyshortcuts=""></div>
-<div role="subscript" aria-keyshortcuts=""></div>
+<div role="spinbutton" aria-required="true"></div>
+<div role="status" aria-label="x"></div>
+<div role="strong" aria-keyshortcuts="x"></div>
+<div role="subscript" aria-keyshortcuts="x"></div>
 <div role="superscript" aria-live="off"></div>
-<div role="switch" aria-checked aria-roledescription=""></div>
+<div role="switch" aria-checked="true" aria-roledescription="x"></div>
 <div role="tab" aria-flowto="id"></div>
 <div role="table" aria-rowcount="0"></div>
-<div role="tablist" aria-atomic></div>
+<div role="tablist" aria-atomic="true"></div>
 <div role="tabpanel" aria-labelledby="id"></div>
 <div role="term" aria-details="id"></div>
-<div role="textbox" aria-hidden></div>
-<div role="time" aria-label=""></div>
-<div role="timer" aria-hidden></div>
-<div role="toolbar" aria-roledescription=""></div>
+<div role="textbox" aria-hidden="true"></div>
+<div role="time" aria-label="x"></div>
+<div role="timer" aria-hidden="true"></div>
+<div role="toolbar" aria-roledescription="x"></div>
 <div role="tooltip" aria-owns="id"></div>
 <div role="tree" aria-errormessage="error"></div>
 <div role="treegrid" aria-details="id"></div>
 <div role="treeitem" aria-selected="true" aria-dropeffect="none"></div>
-<div role="doc-abstract" aria-label=""></div>
+<div role="doc-abstract" aria-label="x"></div>
 <div role="doc-acknowledgments" aria-controls={[]}></div>
 <div role="doc-afterword" aria-flowto="id"></div>
 <div role="doc-appendix" aria-describedby="id"></div>
 <div role="doc-backlink" aria-dropeffect="none"></div>
-<div role="doc-biblioentry" aria-roledescription=""></div>
+<div role="doc-biblioentry" aria-roledescription="x"></div>
 <div role="doc-bibliography" aria-labelledby="id"></div>
-<div role="doc-biblioref" aria-haspopup></div>
+<div role="doc-biblioref" aria-haspopup="true"></div>
 <div role="doc-chapter" aria-controls={[]}></div>
-<div role="doc-colophon" aria-expanded></div>
+<div role="doc-colophon" aria-expanded="true"></div>
 <div role="doc-conclusion" aria-dropeffect="none"></div>
 <div role="doc-cover" aria-controls={[]}></div>
-<div role="doc-credit" aria-haspopup></div>
+<div role="doc-credit" aria-haspopup="true"></div>
 <div role="doc-credits" aria-describedby="id"></div>
-<div role="doc-dedication" aria-roledescription=""></div>
+<div role="doc-dedication" aria-roledescription="x"></div>
 <div role="doc-endnote" aria-errormessage="error"></div>
 <div role="doc-endnotes" aria-owns="id"></div>
 <div role="doc-epigraph" aria-controls={[]}></div>
 <div role="doc-epilogue" aria-relevant="all"></div>
-<div role="doc-errata" aria-keyshortcuts=""></div>
-<div role="doc-example" aria-invalid></div>
+<div role="doc-errata" aria-keyshortcuts="x"></div>
+<div role="doc-example" aria-invalid="true"></div>
 <div role="doc-footnote" aria-labelledby="id"></div>
-<div role="doc-foreword" aria-expanded></div>
-<div role="doc-glossary" aria-grabbed></div>
-<div role="doc-glossref" aria-haspopup></div>
+<div role="doc-foreword" aria-expanded="true"></div>
+<div role="doc-glossary" aria-grabbed="true"></div>
+<div role="doc-glossref" aria-haspopup="true"></div>
 <div role="doc-index" aria-controls={[]}></div>
 <div role="doc-introduction" aria-labelledby="id"></div>
 <div role="doc-noteref" aria-details="id"></div>
 <div role="doc-notice" aria-owns="id"></div>
 <div role="doc-pagebreak" aria-owns="id"></div>
-<div role="doc-pagelist" aria-disabled></div>
+<div role="doc-pagelist" aria-disabled="true"></div>
 <div role="doc-part" aria-relevant="all"></div>
-<div role="doc-preface" aria-label=""></div>
-<div role="doc-prologue" aria-invalid></div>
+<div role="doc-preface" aria-label="x"></div>
+<div role="doc-prologue" aria-invalid="true"></div>
 <div role="doc-pullquote" undefined></div>
 <div role="doc-qna" aria-errormessage="error"></div>
 <div role="doc-subtitle" aria-errormessage="error"></div>
 <div role="doc-tip" aria-owns="id"></div>
-<div role="doc-toc" aria-expanded></div>
+<div role="doc-toc" aria-expanded="true"></div>
 
 <!-- input and menuitem have different implicit roles based on different type attributes, and thus different valid and invalid props -->
 <!-- VALID -->
 <input type="text" aria-labelledby="id" /> <!-- implicit role: textbox -->
-<input type="tel" aria-readonly /> <!-- implicit role: textbox -->
+<input type="tel" aria-readonly="true" /> <!-- implicit role: textbox -->
 <input type="url" aria-errormessage="id" /> <!-- implicit role: textbox -->
 <input type="email" aria-details="id" /> <!-- implicit role: textbox -->
 <input type="searchbox" aria-owns="id" /> <!-- implicit role: searchbox -->
 <input type="text" list={['id']} aria-keyshortcuts="key" /> <!-- implicit role: combobox -->
-<input type="tel" list={['id']} aria-readonly /> <!-- implicit role: combobox -->
+<input type="tel" list={['id']} aria-readonly="true" /> <!-- implicit role: combobox -->
 <input type="url" list={['id']} aria-label="label" /> <!-- implicit role: combobox -->
 <input type="email" list={['id']} aria-activedescendant="id" /> <!-- implicit role: combobox -->
 <input type="search" list={['id']} aria-dropeffect="none" /> <!-- implicit role: combobox -->
-<input type="image" alt="some text" aria-pressed /> <!-- implicit role: button -->
-<input type="reset" aria-expanded /> <!-- implicit role: button -->
-<input type="submit" aria-disabled /> <!-- implicit role: button -->
+<input type="image" alt="some text" aria-pressed="true" /> <!-- implicit role: button -->
+<input type="reset" aria-expanded="true" /> <!-- implicit role: button -->
+<input type="submit" aria-disabled="true" /> <!-- implicit role: button -->
 <input type="checkbox" aria-controls="id" /> <!-- implicit role: checkbox -->
-<input type="radio" aria-atomic /> <!-- implicit role: radio -->
-<input type="range" aria-hidden /> <!-- implicit role: slider -->
+<input type="radio" aria-atomic="true" /> <!-- implicit role: radio -->
+<input type="range" aria-hidden="true" /> <!-- implicit role: slider -->
 <menuitem type="command" aria-live="off"></menuitem> <!-- implicit role: menuitem -->
 <menuitem type="checkbox" aria-relevant="all"></menuitem> <!-- implicit role: menuitemcheckbox -->
-<menuitem type="radio" aria-required></menuitem> <!-- implicit role: menuitemradio -->
+<menuitem type="radio" aria-required="true"></menuitem> <!-- implicit role: menuitemradio -->
 
diff --git a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
index 15b0cf1ac0..5d8d2931b3 100644
--- a/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-role-supports-aria-props/warnings.json
@@ -14,7 +14,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 18,
+			"column": 25,
 			"line": 3
 		},
 		"message": "The attribute 'aria-pressed' is not supported by the role 'link'. This role is implicit on the element `<area>`",
@@ -38,7 +38,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 17,
+			"column": 24,
 			"line": 5
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'complementary'. This role is implicit on the element `<aside>`",
@@ -50,7 +50,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 18,
+			"column": 25,
 			"line": 6
 		},
 		"message": "The attribute 'aria-invalid' is not supported by the role 'document'. This role is implicit on the element `<body>`",
@@ -158,7 +158,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 19,
+			"column": 26,
 			"line": 15
 		},
 		"message": "The attribute 'aria-disabled' is not supported by the role 'form'. This role is implicit on the element `<form>`",
@@ -170,7 +170,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 17,
+			"column": 24,
 			"line": 16
 		},
 		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element `<h1>`",
@@ -182,7 +182,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 17,
+			"column": 24,
 			"line": 17
 		},
 		"message": "The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element `<h2>`",
@@ -194,7 +194,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 17,
+			"column": 24,
 			"line": 18
 		},
 		"message": "The attribute 'aria-expanded' is not supported by the role 'heading'. This role is implicit on the element `<h3>`",
@@ -218,7 +218,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 17,
+			"column": 24,
 			"line": 20
 		},
 		"message": "The attribute 'aria-readonly' is not supported by the role 'heading'. This role is implicit on the element `<h5>`",
@@ -242,7 +242,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 17,
+			"column": 24,
 			"line": 22
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'separator'. This role is implicit on the element `<hr>`",
@@ -266,7 +266,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 17,
+			"column": 24,
 			"line": 24
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'listitem'. This role is implicit on the element `<li>`",
@@ -314,7 +314,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 22,
+			"column": 23,
 			"line": 28
 		},
 		"message": "The attribute 'aria-valuetext' is not supported by the role 'navigation'. This role is implicit on the element `<nav>`",
@@ -338,7 +338,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 20,
+			"column": 27,
 			"line": 30
 		},
 		"message": "The attribute 'aria-invalid' is not supported by the role 'option'. This role is implicit on the element `<option>`",
@@ -362,7 +362,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 22,
+			"column": 29,
 			"line": 32
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'status'. This role is implicit on the element `<output>`",
@@ -386,7 +386,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 21,
+			"column": 28,
 			"line": 34
 		},
 		"message": "The attribute 'aria-invalid' is not supported by the role 'region'. This role is implicit on the element `<section>`",
@@ -434,7 +434,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 20,
+			"column": 27,
 			"line": 38
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'rowgroup'. This role is implicit on the element `<tfoot>`",
@@ -458,7 +458,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 16,
+			"column": 23,
 			"line": 40
 		},
 		"message": "The attribute 'aria-pressed' is not supported by the role 'row'. This role is implicit on the element `<tr>`",
@@ -470,7 +470,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 24,
+			"column": 31,
 			"line": 41
 		},
 		"message": "The attribute 'aria-multiselectable' is not supported by the role 'list'. This role is implicit on the element `<ul>`",
@@ -506,7 +506,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 37,
+			"column": 44,
 			"line": 45
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'application'",
@@ -518,7 +518,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 34,
+			"column": 41,
 			"line": 46
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'article'",
@@ -542,7 +542,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 40,
+			"column": 41,
 			"line": 48
 		},
 		"message": "The attribute 'aria-valuetext' is not supported by the role 'blockquote'",
@@ -578,7 +578,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 31,
+			"column": 38,
 			"line": 51
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'cell'",
@@ -590,7 +590,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 35,
+			"column": 42,
 			"line": 52
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'checkbox'",
@@ -602,7 +602,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 29,
+			"column": 36,
 			"line": 53
 		},
 		"message": "The attribute 'aria-invalid' is not supported by the role 'code'",
@@ -626,7 +626,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 41,
+			"column": 48,
 			"line": 55
 		},
 		"message": "The attribute 'aria-multiselectable' is not supported by the role 'combobox'",
@@ -638,7 +638,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 39,
+			"column": 46,
 			"line": 56
 		},
 		"message": "The attribute 'aria-readonly' is not supported by the role 'complementary'",
@@ -650,7 +650,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 41,
+			"column": 42,
 			"line": 57
 		},
 		"message": "The attribute 'aria-valuetext' is not supported by the role 'contentinfo'",
@@ -662,7 +662,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 37,
+			"column": 44,
 			"line": 58
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'definition'",
@@ -674,7 +674,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 34,
+			"column": 41,
 			"line": 59
 		},
 		"message": "The attribute 'aria-expanded' is not supported by the role 'deletion'",
@@ -686,7 +686,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 33,
+			"column": 40,
 			"line": 60
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'dialog'",
@@ -758,7 +758,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 30,
+			"column": 37,
 			"line": 66
 		},
 		"message": "The attribute 'aria-readonly' is not supported by the role 'form'",
@@ -782,7 +782,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 29,
+			"column": 36,
 			"line": 68
 		},
 		"message": "The attribute 'aria-checked' is not supported by the role 'grid'",
@@ -842,7 +842,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 31,
+			"column": 38,
 			"line": 73
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'link'",
@@ -854,7 +854,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 30,
+			"column": 37,
 			"line": 74
 		},
 		"message": "The attribute 'aria-selected' is not supported by the role 'list'",
@@ -866,7 +866,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 33,
+			"column": 40,
 			"line": 75
 		},
 		"message": "The attribute 'aria-haspopup' is not supported by the role 'listbox'",
@@ -890,7 +890,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 29,
+			"column": 36,
 			"line": 77
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'log'",
@@ -926,7 +926,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 31,
+			"column": 38,
 			"line": 80
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'math'",
@@ -938,7 +938,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 29,
+			"column": 36,
 			"line": 81
 		},
 		"message": "The attribute 'aria-checked' is not supported by the role 'menu'",
@@ -962,7 +962,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 33,
+			"column": 40,
 			"line": 83
 		},
 		"message": "The attribute 'aria-checked' is not supported by the role 'menuitem'",
@@ -974,7 +974,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 41,
+			"column": 48,
 			"line": 84
 		},
 		"message": "The attribute 'aria-pressed' is not supported by the role 'menuitemcheckbox'",
@@ -998,7 +998,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 49,
+			"column": 56,
 			"line": 86
 		},
 		"message": "The attribute 'aria-haspopup' is not supported by the role 'meter'",
@@ -1010,7 +1010,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 36,
+			"column": 43,
 			"line": 87
 		},
 		"message": "The attribute 'aria-expanded' is not supported by the role 'navigation'",
@@ -1022,7 +1022,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 36,
+			"column": 37,
 			"line": 88
 		},
 		"message": "The attribute 'aria-placeholder' is not supported by the role 'none'",
@@ -1034,7 +1034,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 27,
+			"column": 34,
 			"line": 89
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'note'",
@@ -1046,12 +1046,12 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 50,
+			"column": 57,
 			"line": 90
 		},
 		"message": "The attribute 'aria-valuemax' is not supported by the role 'option'",
 		"start": {
-			"column": 33,
+			"column": 40,
 			"line": 90
 		}
 	},
@@ -1070,7 +1070,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 38,
+			"column": 45,
 			"line": 92
 		},
 		"message": "The attribute 'aria-disabled' is not supported by the role 'presentation'",
@@ -1082,7 +1082,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 37,
+			"column": 44,
 			"line": 93
 		},
 		"message": "The attribute 'aria-expanded' is not supported by the role 'progressbar'",
@@ -1094,12 +1094,12 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 48,
+			"column": 55,
 			"line": 94
 		},
 		"message": "The attribute 'aria-rowindex' is not supported by the role 'radio'",
 		"start": {
-			"column": 31,
+			"column": 38,
 			"line": 94
 		}
 	},
@@ -1130,7 +1130,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 29,
+			"column": 36,
 			"line": 97
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'row'",
@@ -1142,7 +1142,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 34,
+			"column": 41,
 			"line": 98
 		},
 		"message": "The attribute 'aria-expanded' is not supported by the role 'rowgroup'",
@@ -1214,7 +1214,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 56,
+			"column": 57,
 			"line": 104
 		},
 		"message": "The attribute 'aria-placeholder' is not supported by the role 'slider'",
@@ -1286,19 +1286,19 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 49,
+			"column": 56,
 			"line": 110
 		},
 		"message": "The attribute 'aria-valuenow' is not supported by the role 'switch'",
 		"start": {
-			"column": 32,
+			"column": 39,
 			"line": 110
 		}
 	},
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 29,
+			"column": 36,
 			"line": 111
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'tab'",
@@ -1310,7 +1310,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 28,
+			"column": 35,
 			"line": 112
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'table'",
@@ -1334,7 +1334,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 41,
+			"column": 48,
 			"line": 114
 		},
 		"message": "The attribute 'aria-multiselectable' is not supported by the role 'tabpanel'",
@@ -1370,7 +1370,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 30,
+			"column": 37,
 			"line": 117
 		},
 		"message": "The attribute 'aria-selected' is not supported by the role 'time'",
@@ -1394,7 +1394,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 37,
+			"column": 38,
 			"line": 119
 		},
 		"message": "The attribute 'aria-valuetext' is not supported by the role 'toolbar'",
@@ -1406,7 +1406,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 34,
+			"column": 41,
 			"line": 120
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'tooltip'",
@@ -1418,7 +1418,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 30,
+			"column": 37,
 			"line": 121
 		},
 		"message": "The attribute 'aria-expanded' is not supported by the role 'tree'",
@@ -1442,12 +1442,12 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 61,
+			"column": 68,
 			"line": 123
 		},
 		"message": "The attribute 'aria-activedescendant' is not supported by the role 'treeitem'",
 		"start": {
-			"column": 35,
+			"column": 42,
 			"line": 123
 		}
 	},
@@ -1478,7 +1478,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 36,
+			"column": 43,
 			"line": 126
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'doc-afterword'",
@@ -1538,7 +1538,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 38,
+			"column": 45,
 			"line": 131
 		},
 		"message": "The attribute 'aria-checked' is not supported by the role 'doc-biblioref'",
@@ -1550,7 +1550,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 37,
+			"column": 44,
 			"line": 132
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'doc-chapter'",
@@ -1586,7 +1586,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 32,
+			"column": 39,
 			"line": 135
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'doc-cover'",
@@ -1598,7 +1598,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 36,
+			"column": 43,
 			"line": 136
 		},
 		"message": "The attribute 'aria-selected' is not supported by the role 'doc-credit'",
@@ -1634,7 +1634,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 36,
+			"column": 43,
 			"line": 139
 		},
 		"message": "The attribute 'aria-checked' is not supported by the role 'doc-endnote'",
@@ -1658,7 +1658,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 39,
+			"column": 46,
 			"line": 141
 		},
 		"message": "The attribute 'aria-multiline' is not supported by the role 'doc-epigraph'",
@@ -1694,7 +1694,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 44,
+			"column": 51,
 			"line": 144
 		},
 		"message": "The attribute 'aria-multiselectable' is not supported by the role 'doc-example'",
@@ -1730,7 +1730,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 42,
+			"column": 43,
 			"line": 147
 		},
 		"message": "The attribute 'aria-valuetext' is not supported by the role 'doc-glossary'",
@@ -1742,7 +1742,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 44,
+			"column": 45,
 			"line": 148
 		},
 		"message": "The attribute 'aria-placeholder' is not supported by the role 'doc-glossref'",
@@ -1766,7 +1766,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 41,
+			"column": 48,
 			"line": 150
 		},
 		"message": "The attribute 'aria-pressed' is not supported by the role 'doc-introduction'",
@@ -1790,7 +1790,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 36,
+			"column": 43,
 			"line": 152
 		},
 		"message": "The attribute 'aria-selected' is not supported by the role 'doc-notice'",
@@ -1814,7 +1814,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 35,
+			"column": 42,
 			"line": 154
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'doc-pagelist'",
@@ -1850,7 +1850,7 @@
 	{
 		"code": "a11y_role_supports_aria_props",
 		"end": {
-			"column": 38,
+			"column": 45,
 			"line": 157
 		},
 		"message": "The attribute 'aria-required' is not supported by the role 'doc-prologue'",
@@ -1934,7 +1934,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 30,
+			"column": 37,
 			"line": 167
 		},
 		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element `<input>`",
@@ -1958,7 +1958,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 32,
+			"column": 39,
 			"line": 169
 		},
 		"message": "The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element `<input>`",
@@ -2018,7 +2018,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 44,
+			"column": 51,
 			"line": 174
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'combobox'. This role is implicit on the element `<input>`",
@@ -2054,7 +2054,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 30,
+			"column": 37,
 			"line": 177
 		},
 		"message": "The attribute 'aria-modal' is not supported by the role 'button'. This role is implicit on the element `<input>`",
@@ -2102,7 +2102,7 @@
 	{
 		"code": "a11y_role_supports_aria_props_implicit",
 		"end": {
-			"column": 32,
+			"column": 39,
 			"line": 181
 		},
 		"message": "The attribute 'aria-checked' is not supported by the role 'slider'. This role is implicit on the element `<input>`",
@@ -2146,5 +2146,17 @@
 			"column": 23,
 			"line": 184
 		}
+	},
+	{
+		"code": "a11y_incorrect_aria_attribute_type_integer",
+		"end": {
+			"column": 33,
+			"line": 256
+		},
+		"message": "The value of 'aria-level' must be an integer",
+		"start": {
+			"column": 20,
+			"line": 256
+		}
 	}
 ]

From f1986da75536ad749ad4f57c5d4239b643125016 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 25 Apr 2024 13:35:09 -0400
Subject: [PATCH 22/27] feat: only inject push/init/pop when necessary (#11319)

* feat: only inject push/init/pop when necessary - closes #11297

* regenerate

* differentiate between safe/unsafe

* only inject $$props when necessary

* more

* fix

* simplify

* handle store subscriptions
---
 .changeset/nervous-berries-boil.md            |  5 ++
 .../src/compiler/phases/2-analyze/index.js    | 51 ++++++++++++++++++-
 .../3-transform/client/transform-client.js    | 34 ++++++++++---
 .../3-transform/client/visitors/template.js   |  2 +
 .../svelte/src/compiler/phases/types.d.ts     |  2 +
 .../_expected/client/index.svelte.js          |  5 +-
 .../_expected/client/index.svelte.js          |  6 +--
 .../_expected/client/main.svelte.js           |  5 +-
 .../_expected/client/index.svelte.js          |  6 +--
 .../_expected/client/index.svelte.js          |  5 +-
 .../_expected/client/index.svelte.js          |  6 +--
 .../hmr/_expected/client/index.svelte.js      |  6 +--
 .../_expected/client/index.svelte.js          |  5 +-
 .../_expected/client/index.svelte.js          |  3 --
 14 files changed, 93 insertions(+), 48 deletions(-)
 create mode 100644 .changeset/nervous-berries-boil.md

diff --git a/.changeset/nervous-berries-boil.md b/.changeset/nervous-berries-boil.md
new file mode 100644
index 0000000000..c14195f32d
--- /dev/null
+++ b/.changeset/nervous-berries-boil.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+feat: only inject push/init/pop when necessary
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 5eae33a4d7..2ed2288a8e 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -370,6 +370,8 @@ export function analyze_component(root, source, options) {
 		uses_slots: false,
 		uses_component_bindings: false,
 		uses_render_tags: false,
+		needs_context: false,
+		needs_props: false,
 		custom_element: options.customElementOptions ?? options.customElement,
 		inject_styles: options.css === 'injected' || options.customElement,
 		accessors: options.customElement
@@ -803,6 +805,8 @@ const legacy_scope_tweaker = {
 			return next();
 		}
 
+		state.analysis.needs_props = true;
+
 		if (!node.declaration) {
 			for (const specifier of node.specifiers) {
 				const binding = /** @type {import('#compiler').Binding} */ (
@@ -931,6 +935,8 @@ const runes_scope_tweaker = {
 		}
 
 		if (rune === '$props') {
+			state.analysis.needs_props = true;
+
 			for (const property of /** @type {import('estree').ObjectPattern} */ (node.id).properties) {
 				if (property.type !== 'Property') continue;
 
@@ -1038,6 +1044,33 @@ const function_visitor = (node, context) => {
 	});
 };
 
+/**
+ * A 'safe' identifier means that the `foo` in `foo.bar` or `foo()` will not
+ * call functions that require component context to exist
+ * @param {import('estree').Expression | import('estree').Super} expression
+ * @param {Scope} scope
+ */
+function is_safe_identifier(expression, scope) {
+	let node = expression;
+	while (node.type === 'MemberExpression') node = node.object;
+
+	if (node.type !== 'Identifier') return false;
+
+	const binding = scope.get(node.name);
+	if (!binding) return true;
+
+	if (binding.kind === 'store_sub') {
+		return is_safe_identifier({ name: node.name.slice(1), type: 'Identifier' }, scope);
+	}
+
+	return (
+		binding.declaration_kind !== 'import' &&
+		binding.kind !== 'prop' &&
+		binding.kind !== 'bindable_prop' &&
+		binding.kind !== 'rest_prop'
+	);
+}
+
 /** @type {import('./types').Visitors} */
 const common_visitors = {
 	_(node, context) {
@@ -1209,6 +1242,8 @@ const common_visitors = {
 		}
 
 		const callee = node.callee;
+		const rune = get_rune(node, context.state.scope);
+
 		if (callee.type === 'Identifier') {
 			const binding = context.state.scope.get(callee.name);
 
@@ -1216,7 +1251,7 @@ const common_visitors = {
 				binding.is_called = true;
 			}
 
-			if (get_rune(node, context.state.scope) === '$derived') {
+			if (rune === '$derived') {
 				// special case — `$derived(foo)` is treated as `$derived(() => foo)`
 				// for the purposes of identifying static state references
 				context.next({
@@ -1228,6 +1263,16 @@ const common_visitors = {
 			}
 		}
 
+		if (rune === '$effect' || rune === '$effect.pre') {
+			// `$effect` needs context because Svelte needs to know whether it should re-run
+			// effects that invalidate themselves, and that's determined by whether we're in runes mode
+			context.state.analysis.needs_context = true;
+		} else if (rune === null) {
+			if (!is_safe_identifier(callee, context.state.scope)) {
+				context.state.analysis.needs_context = true;
+			}
+		}
+
 		context.next();
 	},
 	MemberExpression(node, context) {
@@ -1235,6 +1280,10 @@ const common_visitors = {
 			context.state.expression.metadata.dynamic = true;
 		}
 
+		if (!is_safe_identifier(node, context.state.scope)) {
+			context.state.analysis.needs_context = true;
+		}
+
 		context.next();
 	},
 	BindDirective(node, context) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
index 61a0377e6f..aabf99d821 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -351,12 +351,11 @@ export function client_component(source, analysis, options) {
 	if (options.dev) push_args.push(b.id(analysis.name));
 
 	const component_block = b.block([
-		b.stmt(b.call('$.push', ...push_args)),
 		...store_setup,
 		...legacy_reactive_declarations,
 		...group_binding_declarations,
 		.../** @type {import('estree').Statement[]} */ (instance.body),
-		analysis.runes ? b.empty : b.stmt(b.call('$.init')),
+		analysis.runes || !analysis.needs_context ? b.empty : b.stmt(b.call('$.init')),
 		.../** @type {import('estree').Statement[]} */ (template.body)
 	]);
 
@@ -392,11 +391,22 @@ export function client_component(source, analysis, options) {
 			: () => {};
 
 	append_styles();
-	component_block.body.push(
-		component_returned_object.length > 0
-			? b.return(b.call('$.pop', b.object(component_returned_object)))
-			: b.stmt(b.call('$.pop'))
-	);
+
+	const should_inject_context =
+		analysis.needs_context ||
+		analysis.reactive_statements.size > 0 ||
+		component_returned_object.length > 0 ||
+		options.dev;
+
+	if (should_inject_context) {
+		component_block.body.unshift(b.stmt(b.call('$.push', ...push_args)));
+
+		component_block.body.push(
+			component_returned_object.length > 0
+				? b.return(b.call('$.pop', b.object(component_returned_object)))
+				: b.stmt(b.call('$.pop'))
+		);
+	}
 
 	if (analysis.uses_rest_props) {
 		const named_props = analysis.exports.map(({ name, alias }) => alias ?? name);
@@ -430,11 +440,19 @@ export function client_component(source, analysis, options) {
 		component_block.body.unshift(b.const('$$slots', b.call('$.sanitize_slots', b.id('$$props'))));
 	}
 
+	let should_inject_props =
+		should_inject_context ||
+		analysis.needs_props ||
+		analysis.uses_props ||
+		analysis.uses_rest_props ||
+		analysis.uses_slots ||
+		analysis.slot_names.size > 0;
+
 	const body = [...state.hoisted, ...module.body];
 
 	const component = b.function_declaration(
 		b.id(analysis.name),
-		[b.id('$$anchor'), b.id('$$props')],
+		should_inject_props ? [b.id('$$anchor'), b.id('$$props')] : [b.id('$$anchor')],
 		component_block
 	);
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
index 9c7706a17c..89eb32f429 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
@@ -1228,6 +1228,8 @@ function serialize_event_handler(node, { state, visit }) {
 
 		return handler;
 	} else {
+		state.analysis.needs_props = true;
+
 		// Function + .call to preserve "this" context as much as possible
 		return b.function(
 			null,
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index c2ece7d7fd..3e892fefef 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -57,6 +57,8 @@ export interface ComponentAnalysis extends Analysis {
 	uses_slots: boolean;
 	uses_component_bindings: boolean;
 	uses_render_tags: boolean;
+	needs_context: boolean;
+	needs_props: boolean;
 	custom_element: boolean | SvelteOptions['customElement'];
 	/** If `true`, should append styles through JavaScript */
 	inject_styles: boolean;
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
index 06c1eb77d8..4f78c872b5 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
@@ -5,9 +5,7 @@ import TextInput from './Child.svelte';
 var root_1 = $.template(`Something`, 1);
 var root = $.template(`<!> `, 1);
 
-export default function Bind_component_snippet($$anchor, $$props) {
-	$.push($$props, true);
-
+export default function Bind_component_snippet($$anchor) {
 	let value = $.source('');
 	const _snippet = snippet;
 	var fragment_1 = root();
@@ -33,5 +31,4 @@ export default function Bind_component_snippet($$anchor, $$props) {
 
 	$.render_effect(() => $.set_text(text, ` value: ${$.stringify($.get(value))}`));
 	$.append($$anchor, fragment_1);
-	$.pop();
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js
index b1481cba15..9dd2ef3048 100644
--- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js
@@ -1,14 +1,10 @@
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-export default function Bind_this($$anchor, $$props) {
-	$.push($$props, false);
-	$.init();
-
+export default function Bind_this($$anchor) {
 	var fragment = $.comment();
 	var node = $.first_child(fragment);
 
 	$.bind_this(Foo(node, {}), ($$value) => foo = $$value, () => foo);
 	$.append($$anchor, fragment);
-	$.pop();
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
index c598f6a2f4..3cbaef59c8 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
@@ -3,9 +3,7 @@ import * as $ from "svelte/internal/client";
 
 var root = $.template(`<div></div> <svg></svg> <custom-element></custom-element> <div></div> <svg></svg> <custom-element></custom-element>`, 3);
 
-export default function Main($$anchor, $$props) {
-	$.push($$props, true);
-
+export default function Main($$anchor) {
 	// needs to be a snapshot test because jsdom does auto-correct the attribute casing
 	let x = 'test';
 	let y = () => 'test';
@@ -32,5 +30,4 @@ export default function Main($$anchor, $$props) {
 	});
 
 	$.append($$anchor, fragment);
-	$.pop();
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js
index d1c32ab902..7524a55c78 100644
--- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js
@@ -1,10 +1,7 @@
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-export default function Each_string_template($$anchor, $$props) {
-	$.push($$props, false);
-	$.init();
-
+export default function Each_string_template($$anchor) {
 	var fragment = $.comment();
 	var node = $.first_child(fragment);
 
@@ -16,5 +13,4 @@ export default function Each_string_template($$anchor, $$props) {
 	});
 
 	$.append($$anchor, fragment);
-	$.pop();
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
index 15ab1d260c..bd889e91d8 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
@@ -1,9 +1,7 @@
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-export default function Function_prop_no_getter($$anchor, $$props) {
-	$.push($$props, true);
-
+export default function Function_prop_no_getter($$anchor) {
 	let count = $.source(0);
 
 	function onmouseup() {
@@ -27,5 +25,4 @@ export default function Function_prop_no_getter($$anchor, $$props) {
 	});
 
 	$.append($$anchor, fragment);
-	$.pop();
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js
index 1d8a850360..92354d8f14 100644
--- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js
@@ -3,12 +3,8 @@ import * as $ from "svelte/internal/client";
 
 var root = $.template(`<h1>hello world</h1>`);
 
-export default function Hello_world($$anchor, $$props) {
-	$.push($$props, false);
-	$.init();
-
+export default function Hello_world($$anchor) {
 	var h1 = root();
 
 	$.append($$anchor, h1);
-	$.pop();
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
index 15fc41a906..f1c08f4ed8 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
@@ -3,14 +3,10 @@ import * as $ from "svelte/internal/client";
 
 var root = $.template(`<h1>hello world</h1>`);
 
-function Hmr($$anchor, $$props) {
-	$.push($$props, false);
-	$.init();
-
+function Hmr($$anchor) {
 	var h1 = root();
 
 	$.append($$anchor, h1);
-	$.pop();
 }
 
 if (import.meta.hot) {
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
index 120da7eaed..455f227e09 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
@@ -10,9 +10,7 @@ function reset(_, str, tpl) {
 
 var root = $.template(`<input> <input> <button>reset</button>`, 1);
 
-export default function State_proxy_literal($$anchor, $$props) {
-	$.push($$props, true);
-
+export default function State_proxy_literal($$anchor) {
 	let str = $.source('');
 	let tpl = $.source(``);
 	var fragment = root();
@@ -30,7 +28,6 @@ export default function State_proxy_literal($$anchor, $$props) {
 	$.bind_value(input, () => $.get(str), ($$value) => $.set(str, $$value));
 	$.bind_value(input_1, () => $.get(tpl), ($$value) => $.set(tpl, $$value));
 	$.append($$anchor, fragment);
-	$.pop();
 }
 
 $.delegate(["click"]);
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js
index cfb5d595a9..a4bbea582b 100644
--- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js
@@ -2,13 +2,10 @@ import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
 export default function Svelte_element($$anchor, $$props) {
-	$.push($$props, true);
-
 	let tag = $.prop($$props, "tag", 3, 'hr');
 	var fragment = $.comment();
 	var node = $.first_child(fragment);
 
 	$.element(node, tag, false);
 	$.append($$anchor, fragment);
-	$.pop();
 }
\ No newline at end of file

From cd798077b464ab3a28227f1e4a9aace20ba29b28 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 26 Apr 2024 20:56:40 +0200
Subject: [PATCH 23/27] feat: provide migration function (#11334)

Provides a migration function, exported as `migrate` from `svelte/compiler`, which tries its best to automatically migrate towards runes, render tags (instead of slots) and event attributes (instead of event handlers)

The preview REPL was updated with a migrate button so people can try it out in the playground.

closes #9239
---
 .changeset/orange-zoos-heal.md                |   5 +
 packages/svelte/src/compiler/index.js         |   2 +-
 packages/svelte/src/compiler/migrate/index.js | 770 ++++++++++++++++++
 packages/svelte/src/compiler/phases/scope.js  |   2 +-
 packages/svelte/src/legacy/legacy-client.js   |  12 +
 packages/svelte/src/legacy/legacy-server.js   |  11 +
 .../migrate/samples/derivations/input.svelte  |   7 +
 .../migrate/samples/derivations/output.svelte |   7 +
 .../migrate/samples/effects/input.svelte      |  13 +
 .../migrate/samples/effects/output.svelte     |  21 +
 .../samples/event-handlers/input.svelte       |  17 +
 .../samples/event-handlers/output.svelte      |  47 ++
 .../samples/props-export-alias/input.svelte   |   6 +
 .../samples/props-export-alias/output.svelte  |   8 +
 .../samples/props-rest-props/input.svelte     |   5 +
 .../samples/props-rest-props/output.svelte    |   6 +
 .../migrate/samples/props-ts/input.svelte     |  11 +
 .../migrate/samples/props-ts/output.svelte    |  20 +
 .../tests/migrate/samples/props/input.svelte  |  11 +
 .../tests/migrate/samples/props/output.svelte |  14 +
 .../tests/migrate/samples/slots/input.svelte  |   7 +
 .../tests/migrate/samples/slots/output.svelte |  12 +
 packages/svelte/tests/migrate/test.ts         |  30 +
 packages/svelte/types/index.d.ts              |  14 +
 playgrounds/sandbox/run.js                    |   9 +-
 .../src/lib/Input/ComponentSelector.svelte    |  10 +
 .../src/lib/Input/Migrate.svelte              |  22 +
 .../src/lib/Output/Compiler.js                |  18 +
 sites/svelte-5-preview/src/lib/Repl.svelte    |  22 +
 sites/svelte-5-preview/src/lib/types.d.ts     |   1 +
 .../src/lib/workers/compiler/index.js         |  26 +
 .../src/lib/workers/workers.d.ts              |   6 +
 32 files changed, 1169 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/orange-zoos-heal.md
 create mode 100644 packages/svelte/src/compiler/migrate/index.js
 create mode 100644 packages/svelte/tests/migrate/samples/derivations/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/derivations/output.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/effects/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/effects/output.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/event-handlers/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/event-handlers/output.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props-export-alias/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props-export-alias/output.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props-rest-props/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props-rest-props/output.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props-ts/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props-ts/output.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/props/output.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/slots/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/slots/output.svelte
 create mode 100644 packages/svelte/tests/migrate/test.ts
 create mode 100644 sites/svelte-5-preview/src/lib/Input/Migrate.svelte

diff --git a/.changeset/orange-zoos-heal.md b/.changeset/orange-zoos-heal.md
new file mode 100644
index 0000000000..f134a4b8a2
--- /dev/null
+++ b/.changeset/orange-zoos-heal.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+feat: provide migration helper
diff --git a/packages/svelte/src/compiler/index.js b/packages/svelte/src/compiler/index.js
index 97dcc364f0..ba312a1a63 100644
--- a/packages/svelte/src/compiler/index.js
+++ b/packages/svelte/src/compiler/index.js
@@ -190,5 +190,5 @@ export function walk() {
 }
 
 export { CompileError } from './errors.js';
-
 export { VERSION } from '../version.js';
+export { migrate } from './migrate/index.js';
diff --git a/packages/svelte/src/compiler/migrate/index.js b/packages/svelte/src/compiler/migrate/index.js
new file mode 100644
index 0000000000..e6328c70ba
--- /dev/null
+++ b/packages/svelte/src/compiler/migrate/index.js
@@ -0,0 +1,770 @@
+import MagicString from 'magic-string';
+import { walk } from 'zimmerframe';
+import { parse } from '../phases/1-parse/index.js';
+import { analyze_component } from '../phases/2-analyze/index.js';
+import { validate_component_options } from '../validate-options.js';
+import { get_rune } from '../phases/scope.js';
+import { reset_warnings } from '../warnings.js';
+import { extract_identifiers } from '../utils/ast.js';
+import { regex_is_valid_identifier } from '../phases/patterns.js';
+
+/**
+ * Does a best-effort migration of Svelte code towards using runes, event attributes and render tags.
+ * May throw an error if the code is too complex to migrate automatically.
+ *
+ * @param {string} source
+ * @returns {{ code: string; }}
+ */
+export function migrate(source) {
+	try {
+		reset_warnings({ source, filename: 'migrate.svelte' });
+
+		let parsed = parse(source);
+
+		const { customElement: customElementOptions, ...parsed_options } = parsed.options || {};
+
+		/** @type {import('#compiler').ValidatedCompileOptions} */
+		const combined_options = {
+			...validate_component_options({}, ''),
+			...parsed_options,
+			customElementOptions
+		};
+
+		const str = new MagicString(source);
+		const analysis = analyze_component(parsed, source, combined_options);
+		const indent = guess_indent(source);
+
+		/** @type {State} */
+		let state = {
+			scope: analysis.instance.scope,
+			analysis,
+			str,
+			indent,
+			props: [],
+			props_insertion_point: parsed.instance?.content.start ?? 0,
+			has_props_rune: false,
+			props_name: analysis.root.unique('props').name,
+			rest_props_name: analysis.root.unique('rest').name,
+			end: source.length,
+			run_name: analysis.root.unique('run').name,
+			needs_run: false
+		};
+
+		if (parsed.instance) {
+			walk(parsed.instance.content, state, instance_script);
+		}
+
+		state = { ...state, scope: analysis.template.scope };
+		walk(parsed.fragment, state, template);
+
+		const run_import = `import { run${state.run_name === 'run' ? '' : `as ${state.run_name}`} } from 'svelte/legacy';`;
+		let added_legacy_import = false;
+
+		if (state.props.length > 0 || analysis.uses_rest_props || analysis.uses_props) {
+			const has_many_props = state.props.length > 3;
+			const props_separator = has_many_props ? `\n${indent}${indent}` : ' ';
+			let props = '';
+			if (analysis.uses_props) {
+				props = `...${state.props_name}`;
+			} else {
+				props = state.props
+					.map((prop) => {
+						let prop_str =
+							prop.local === prop.exported ? prop.local : `${prop.exported}: ${prop.local}`;
+						if (prop.bindable) {
+							prop_str += ` = $bindable(${prop.init})`;
+						} else if (prop.init) {
+							prop_str += ` = ${prop.init}`;
+						}
+						return prop_str;
+					})
+					.join(`,${props_separator}`);
+
+				if (analysis.uses_rest_props) {
+					props += `,${props_separator}...${state.rest_props_name}`;
+				}
+			}
+
+			if (state.has_props_rune) {
+				// some render tags or forwarded event attributes to add
+				str.appendRight(state.props_insertion_point, ` ${props},`);
+			} else {
+				const uses_ts = parsed.instance?.attributes.some(
+					(attr) => attr.name === 'lang' && /** @type {any} */ (attr).value[0].data === 'ts'
+				);
+				const type_name = state.scope.root.unique('Props').name;
+				let type = '';
+				if (uses_ts) {
+					if (analysis.uses_props || analysis.uses_rest_props) {
+						type = `interface ${type_name} { [key: string]: any }`;
+					} else {
+						type = `interface ${type_name} {${props_separator}${state.props
+							.map((prop) => {
+								return `${prop.exported}${prop.optional ? '?' : ''}: ${prop.type}`;
+							})
+							.join(`,${props_separator}`)}${has_many_props ? `\n${indent}` : ' '}}`;
+					}
+				} else {
+					if (analysis.uses_props || analysis.uses_rest_props) {
+						type = `{Record<string, any>}`;
+					} else {
+						type = `{${state.props
+							.map((prop) => {
+								return `${prop.exported}${prop.optional ? '?' : ''}: ${prop.type}`;
+							})
+							.join(`, `)}}`;
+					}
+				}
+
+				let props_declaration = `let {${props_separator}${props}${has_many_props ? `\n${indent}` : ' '}}`;
+				if (uses_ts) {
+					props_declaration = `${type}\n\n${indent}${props_declaration}`;
+					props_declaration = `${props_declaration}${type ? `: ${type_name}` : ''} = $props();`;
+				} else {
+					props_declaration = `/** @type {${type}} */\n${indent}${props_declaration}`;
+					props_declaration = `${props_declaration} = $props();`;
+				}
+
+				if (parsed.instance) {
+					props_declaration = `\n${indent}${props_declaration}`;
+					str.appendRight(state.props_insertion_point, props_declaration);
+				} else {
+					const imports = state.needs_run ? `${indent}${run_import}\n` : '';
+					str.prepend(`<script>\n${imports}${indent}${props_declaration}\n</script>\n\n`);
+					added_legacy_import = true;
+				}
+			}
+		}
+
+		if (state.needs_run && !added_legacy_import) {
+			if (parsed.instance) {
+				str.appendRight(
+					/** @type {number} */ (parsed.instance.content.start),
+					`\n${indent}${run_import}\n`
+				);
+			} else {
+				str.prepend(`<script>\n${indent}${run_import}\n</script>\n\n`);
+			}
+		}
+
+		return { code: str.toString() };
+	} catch (e) {
+		// eslint-disable-next-line no-console
+		console.error('Error while migrating Svelte code');
+		throw e;
+	}
+}
+
+/**
+ * @typedef {{
+ *  scope: import('../phases/scope.js').Scope;
+ *  str: MagicString;
+ *  analysis: import('../phases/types.js').ComponentAnalysis;
+ *  indent: string;
+ *  props: Array<{ local: string; exported: string; init: string; bindable: boolean; optional: boolean; type: string }>;
+ *  props_insertion_point: number;
+ *  has_props_rune: boolean;
+ * 	props_name: string;
+ * 	rest_props_name: string;
+ *  end: number;
+ *  run_name: string;
+ *  needs_run: boolean;
+ * }} State
+ */
+
+/** @type {import('zimmerframe').Visitors<import('../types/template.js').SvelteNode, State>} */
+const instance_script = {
+	Identifier(node, { state }) {
+		handle_identifier(node, state);
+	},
+	ExportNamedDeclaration(node, { state, next }) {
+		if (node.declaration) {
+			next();
+			return;
+		}
+
+		let count_removed = 0;
+		for (const specifier of node.specifiers) {
+			const binding = state.scope.get(specifier.local.name);
+			if (binding?.kind === 'bindable_prop') {
+				state.str.remove(
+					/** @type {number} */ (specifier.start),
+					/** @type {number} */ (specifier.end)
+				);
+				count_removed++;
+			}
+		}
+		if (count_removed === node.specifiers.length) {
+			state.str.remove(/** @type {number} */ (node.start), /** @type {number} */ (node.end));
+		}
+	},
+	VariableDeclaration(node, { state, path }) {
+		if (state.scope !== state.analysis.instance.scope) {
+			return;
+		}
+
+		let nr_of_props = 0;
+
+		for (const declarator of node.declarations) {
+			if (state.analysis.runes) {
+				if (get_rune(declarator.init, state.scope) === '$props') {
+					state.props_insertion_point = /** @type {number} */ (declarator.id.start) + 1;
+					state.has_props_rune = true;
+				}
+				continue;
+			}
+
+			let bindings;
+			try {
+				bindings = state.scope.get_bindings(declarator);
+			} catch (e) {
+				// no bindings, so we can skip this
+				continue;
+			}
+			const has_state = bindings.some((binding) => binding.kind === 'state');
+			const has_props = bindings.some((binding) => binding.kind === 'bindable_prop');
+
+			if (!has_state && !has_props) {
+				continue;
+			}
+
+			if (has_props) {
+				nr_of_props++;
+
+				if (declarator.id.type !== 'Identifier') {
+					// TODO invest time in this?
+					throw new Error(
+						'Encountered an export declaration pattern that is not supported for automigration.'
+					);
+					// Turn export let into props. It's really really weird because export let { x: foo, z: [bar]} = ..
+					// means that foo and bar are the props (i.e. the leafs are the prop names), not x and z.
+					// const tmp = state.scope.generate('tmp');
+					// const paths = extract_paths(declarator.id);
+					// state.props_pre.push(
+					// 	b.declaration('const', b.id(tmp), visit(declarator.init!) as Expression)
+					// );
+					// for (const path of paths) {
+					// 	const name = (path.node as Identifier).name;
+					// 	const binding = state.scope.get(name)!;
+					// 	const value = path.expression!(b.id(tmp));
+					// 	if (binding.kind === 'bindable_prop' || binding.kind === 'rest_prop') {
+					// 		state.props.push({
+					// 			local: name,
+					// 			exported: binding.prop_alias ? binding.prop_alias : name,
+					// 			init: value
+					// 		});
+					// 		state.props_insertion_point = /** @type {number} */(declarator.end);
+					// 	} else {
+					// 		declarations.push(b.declarator(path.node, value));
+					// 	}
+					// }
+				}
+
+				const binding = /** @type {import('#compiler').Binding} */ (
+					state.scope.get(declarator.id.name)
+				);
+
+				if (
+					state.analysis.uses_props &&
+					(declarator.init || binding.mutated || binding.reassigned)
+				) {
+					throw new Error(
+						'$$props is used together with named props in a way that cannot be automatically migrated.'
+					);
+				}
+
+				state.props.push({
+					local: declarator.id.name,
+					exported: binding.prop_alias ? binding.prop_alias : declarator.id.name,
+					init: declarator.init
+						? state.str.original.substring(
+								/** @type {number} */ (declarator.init.start),
+								/** @type {number} */ (declarator.init.end)
+							)
+						: '',
+					optional: !!declarator.init,
+					type: extract_type(declarator, state.str, path),
+					bindable: binding.mutated || binding.reassigned
+				});
+				state.props_insertion_point = /** @type {number} */ (declarator.end);
+				state.str.update(
+					/** @type {number} */ (declarator.start),
+					/** @type {number} */ (declarator.end),
+					''
+				);
+
+				continue;
+			}
+
+			// state
+			if (declarator.init) {
+				state.str.prependLeft(/** @type {number} */ (declarator.init.start), '$state(');
+				state.str.appendRight(/** @type {number} */ (declarator.init.end), ')');
+			} else {
+				state.str.prependLeft(/** @type {number} */ (declarator.id.end), ' = $state()');
+			}
+		}
+
+		if (nr_of_props === node.declarations.length) {
+			let start = /** @type {number} */ (node.start);
+			let end = /** @type {number} */ (node.end);
+
+			const parent = path.at(-1);
+			if (parent?.type === 'ExportNamedDeclaration') {
+				start = /** @type {number} */ (parent.start);
+				end = /** @type {number} */ (parent.end);
+			}
+			while (state.str.original[start] !== '\n') start--;
+			while (state.str.original[end] !== '\n') end++;
+			state.str.update(start, end, '');
+		}
+	},
+	BreakStatement(node, { state, path }) {
+		if (path[1].type !== 'LabeledStatement') return;
+		if (node.label?.name !== '$') return;
+		state.str.update(
+			/** @type {number} */ (node.start),
+			/** @type {number} */ (node.end),
+			'return;'
+		);
+	},
+	LabeledStatement(node, { path, state, next }) {
+		if (state.analysis.runes) return;
+		if (path.length > 1) return;
+		if (node.label.name !== '$') return;
+
+		next();
+
+		if (
+			node.body.type === 'ExpressionStatement' &&
+			node.body.expression.type === 'AssignmentExpression'
+		) {
+			const ids = extract_identifiers(node.body.expression.left);
+			const bindings = ids.map((id) => state.scope.get(id.name));
+			const reassigned_bindings = bindings.filter((b) => b?.reassigned);
+			if (reassigned_bindings.length === 0 && !bindings.some((b) => b?.kind === 'store_sub')) {
+				// $derived
+				state.str.update(
+					/** @type {number} */ (node.start),
+					/** @type {number} */ (node.body.expression.start),
+					'let '
+				);
+				state.str.prependLeft(
+					/** @type {number} */ (node.body.expression.right.start),
+					'$derived('
+				);
+				state.str.update(
+					/** @type {number} */ (node.body.expression.right.end),
+					/** @type {number} */ (node.end),
+					');'
+				);
+				return;
+			} else {
+				for (const binding of reassigned_bindings) {
+					if (binding && ids.includes(binding.node)) {
+						// implicitly-declared variable which we need to make explicit
+						state.str.prependLeft(
+							/** @type {number} */ (node.start),
+							`let ${binding.node.name}${binding.kind === 'state' ? ' = $state()' : ''};\n${state.indent}`
+						);
+					}
+				}
+			}
+		}
+
+		state.needs_run = true;
+		const is_block_stmt = node.body.type === 'BlockStatement';
+		const start_end = /** @type {number} */ (node.body.start);
+		// TODO try to find out if we can use $derived.by instead?
+		if (is_block_stmt) {
+			state.str.update(
+				/** @type {number} */ (node.start),
+				start_end + 1,
+				`${state.run_name}(() => {`
+			);
+			const end = /** @type {number} */ (node.body.end);
+			state.str.update(end - 1, end, '});');
+		} else {
+			state.str.update(
+				/** @type {number} */ (node.start),
+				start_end,
+				`${state.run_name}(() => {\n${state.indent}`
+			);
+			state.str.indent(state.indent, {
+				exclude: [
+					[0, /** @type {number} */ (node.body.start)],
+					[/** @type {number} */ (node.body.end), state.end]
+				]
+			});
+			state.str.appendRight(/** @type {number} */ (node.end), `\n${state.indent}});`);
+		}
+	}
+};
+
+/** @type {import('zimmerframe').Visitors<import('../types/template.js').SvelteNode, State>} */
+const template = {
+	Identifier(node, { state }) {
+		handle_identifier(node, state);
+	},
+	RegularElement(node, { state, next }) {
+		handle_events(node, state);
+		next();
+	},
+	SvelteElement(node, { state, next }) {
+		handle_events(node, state);
+		next();
+	},
+	SvelteWindow(node, { state, next }) {
+		handle_events(node, state);
+		next();
+	},
+	SvelteBody(node, { state, next }) {
+		handle_events(node, state);
+		next();
+	},
+	SvelteDocument(node, { state, next }) {
+		handle_events(node, state);
+		next();
+	},
+	SlotElement(node, { state, next }) {
+		let name = 'children';
+		let slot_props = '{ ';
+
+		for (const attr of node.attributes) {
+			if (attr.type === 'SpreadAttribute') {
+				slot_props += `...${state.str.original.substring(/** @type {number} */ (attr.expression.start), attr.expression.end)}, `;
+			} else if (attr.type === 'Attribute') {
+				if (attr.name === 'name') {
+					name = state.scope.generate(/** @type {any} */ (attr.value)[0].data);
+				} else {
+					const value =
+						attr.value !== true
+							? state.str.original.substring(
+									attr.value[0].start,
+									attr.value[attr.value.length - 1].end
+								)
+							: 'true';
+					slot_props += value === attr.name ? `${value}, ` : `${attr.name}: ${value}, `;
+				}
+			}
+		}
+
+		slot_props += '}';
+		if (slot_props === '{ }') {
+			slot_props = '';
+		}
+
+		state.props.push({
+			local: name,
+			exported: name,
+			init: '',
+			bindable: false,
+			optional: true,
+			type: `import('svelte').${slot_props ? 'Snippet<[any]>' : 'Snippet'}`
+		});
+
+		if (node.fragment.nodes.length > 0) {
+			next();
+			state.str.update(
+				node.start,
+				node.fragment.nodes[0].start,
+				`{#if ${name}}{@render ${name}(${slot_props})}{:else}`
+			);
+			state.str.update(node.fragment.nodes[node.fragment.nodes.length - 1].end, node.end, '{/if}');
+		} else {
+			state.str.update(node.start, node.end, `{@render ${name}?.(${slot_props})}`);
+		}
+	}
+};
+
+/**
+ * @param {import('estree').VariableDeclarator} declarator
+ * @param {MagicString} str
+ * @param {import('#compiler').SvelteNode[]} path
+ */
+function extract_type(declarator, str, path) {
+	if (declarator.id.typeAnnotation) {
+		let start = declarator.id.typeAnnotation.start + 1; // skip the colon
+		while (str.original[start] === ' ') {
+			start++;
+		}
+		return str.original.substring(start, declarator.id.typeAnnotation.end);
+	}
+
+	// try to find a comment with a type annotation, hinting at jsdoc
+	const parent = path.at(-1);
+	if (parent?.type === 'ExportNamedDeclaration' && parent.leadingComments) {
+		const last = parent.leadingComments[parent.leadingComments.length - 1];
+		if (last.type === 'Block') {
+			const match = /@type {([^}]+)}/.exec(last.value);
+			if (match) {
+				str.update(/** @type {any} */ (last).start, /** @type {any} */ (last).end, '');
+				return match[1];
+			}
+		}
+	}
+
+	// try to infer it from the init
+	if (declarator.init?.type === 'Literal') {
+		const type = typeof declarator.init.value;
+		if (type === 'string' || type === 'number' || type === 'boolean') {
+			return type;
+		}
+	}
+
+	return 'any';
+}
+
+/**
+ * @param {import('#compiler').RegularElement | import('#compiler').SvelteElement | import('#compiler').SvelteWindow | import('#compiler').SvelteDocument | import('#compiler').SvelteBody} node
+ * @param {State} state
+ */
+function handle_events(node, state) {
+	/** @type {Map<string, import('#compiler').OnDirective[]>} */
+	const handlers = new Map();
+	for (const attribute of node.attributes) {
+		if (attribute.type !== 'OnDirective') continue;
+
+		let name = `on${attribute.name}`;
+		if (attribute.modifiers.includes('capture')) {
+			name += 'capture';
+		}
+
+		const nodes = handlers.get(name) || [];
+		nodes.push(attribute);
+		handlers.set(name, nodes);
+	}
+
+	for (const [name, nodes] of handlers) {
+		// turn on:click into a prop
+		let exported = name;
+		if (!regex_is_valid_identifier.test(name)) {
+			exported = `'${exported}'`;
+		}
+		// Check if prop already set, could happen when on:click on different elements
+		let local = state.props.find((prop) => prop.exported === exported)?.local;
+
+		const last = nodes[nodes.length - 1];
+		const payload_name =
+			last.expression?.type === 'ArrowFunctionExpression' &&
+			last.expression.params[0]?.type === 'Identifier'
+				? last.expression.params[0].name
+				: generate_event_name(last, state);
+		let prepend = '';
+
+		for (let i = 0; i < nodes.length - 1; i += 1) {
+			const node = nodes[i];
+			if (node.expression) {
+				let body = '';
+				if (node.expression.type === 'ArrowFunctionExpression') {
+					body = state.str.original.substring(
+						/** @type {number} */ (node.expression.body.start),
+						/** @type {number} */ (node.expression.body.end)
+					);
+				} else {
+					body = `${state.str.original.substring(
+						/** @type {number} */ (node.expression.start),
+						/** @type {number} */ (node.expression.end)
+					)}();`;
+				}
+				// TODO check how many indents needed
+				for (const modifier of node.modifiers) {
+					if (modifier === 'stopPropagation') {
+						body = `\n${state.indent}${payload_name}.stopPropagation();\n${body}`;
+					} else if (modifier === 'preventDefault') {
+						body = `\n${state.indent}${payload_name}.preventDefault();\n${body}`;
+					} else if (modifier === 'stopImmediatePropagation') {
+						body = `\n${state.indent}${payload_name}.stopImmediatePropagation();\n${body}`;
+					} else {
+						body = `\n${state.indent}// @migration-task: incorporate ${modifier} modifier\n${body}`;
+					}
+				}
+				prepend += `\n${state.indent}${body}\n`;
+			} else {
+				if (!local) {
+					local = state.scope.generate(`on${node.name}`);
+					state.props.push({
+						local,
+						exported,
+						init: '',
+						bindable: false,
+						optional: true,
+						type: '(event: any) => void'
+					});
+				}
+				prepend += `\n${state.indent}${local}?.(${payload_name});\n`;
+			}
+
+			state.str.remove(node.start, node.end);
+		}
+
+		if (last.expression) {
+			// remove : from on:click
+			state.str.remove(last.start + 2, last.start + 3);
+			// remove modifiers
+			if (last.modifiers.length > 0) {
+				state.str.remove(
+					last.start + last.name.length + 3,
+					state.str.original.indexOf('=', last.start)
+				);
+			}
+			if (last.modifiers.includes('capture')) {
+				state.str.appendRight(last.start + last.name.length + 3, 'capture');
+			}
+
+			for (const modifier of last.modifiers) {
+				if (modifier === 'stopPropagation') {
+					prepend += `\n${state.indent}${payload_name}.stopPropagation();\n`;
+				} else if (modifier === 'preventDefault') {
+					prepend += `\n${state.indent}${payload_name}.preventDefault();\n`;
+				} else if (modifier === 'stopImmediatePropagation') {
+					prepend += `\n${state.indent}${payload_name}.stopImmediatePropagation();\n`;
+				} else if (modifier !== 'capture') {
+					prepend += `\n${state.indent}// @migration-task: incorporate ${modifier} modifier\n`;
+				}
+			}
+
+			if (prepend) {
+				let pos = last.expression.start;
+				if (last.expression.type === 'ArrowFunctionExpression') {
+					pos = last.expression.body.start;
+					if (
+						last.expression.params.length > 0 &&
+						last.expression.params[0].type !== 'Identifier'
+					) {
+						const start = /** @type {number} */ (last.expression.params[0].start);
+						const end = /** @type {number} */ (last.expression.params[0].end);
+						// replace event payload with generated one that others use,
+						// then destructure generated payload param into what the user wrote
+						state.str.overwrite(start, end, payload_name);
+						prepend = `let ${state.str.original.substring(
+							start,
+							end
+						)} = ${payload_name};\n${prepend}`;
+					} else if (last.expression.params.length === 0) {
+						// add generated payload param to arrow function
+						const pos = state.str.original.lastIndexOf(')', last.expression.body.start);
+						state.str.prependLeft(pos, payload_name);
+					}
+
+					const needs_curlies = last.expression.body.type !== 'BlockStatement';
+					state.str.prependRight(
+						/** @type {number} */ (pos) + (needs_curlies ? 0 : 1),
+						`${needs_curlies ? '{' : ''}${prepend}${state.indent}`
+					);
+					state.str.appendRight(
+						/** @type {number} */ (last.expression.body.end) - (needs_curlies ? 0 : 1),
+						`\n${needs_curlies ? '}' : ''}`
+					);
+				} else {
+					state.str.update(
+						/** @type {number} */ (last.expression.start),
+						/** @type {number} */ (last.expression.end),
+						`(${payload_name}) => {${prepend}\n${state.indent}${state.str.original.substring(
+							/** @type {number} */ (last.expression.start),
+							/** @type {number} */ (last.expression.end)
+						)}?.(${payload_name});\n}`
+					);
+				}
+			}
+		} else {
+			// turn on:click into a prop
+			// Check if prop already set, could happen when on:click on different elements
+			if (!local) {
+				local = state.scope.generate(`on${last.name}`);
+				state.props.push({
+					local,
+					exported,
+					init: '',
+					bindable: false,
+					optional: true,
+					type: '(event: any) => void'
+				});
+			}
+
+			let replacement = '';
+			if (!prepend) {
+				if (exported === local) {
+					replacement = `{${name}}`;
+				} else {
+					replacement = `${name}={${local}}`;
+				}
+			} else {
+				replacement = `${name}={(${payload_name}) => {${prepend}\n${state.indent}${local}?.(${payload_name});\n}}`;
+			}
+
+			state.str.update(last.start, last.end, replacement);
+		}
+	}
+}
+
+/**
+ * @param {import('#compiler').OnDirective} last
+ * @param {State} state
+ */
+function generate_event_name(last, state) {
+	const scope =
+		(last.expression && state.analysis.template.scopes.get(last.expression)) || state.scope;
+
+	let name = 'event';
+	if (!scope.get(name)) return name;
+
+	let i = 1;
+	while (scope.get(`${name}${i}`)) i += 1;
+	return `${name}${i}`;
+}
+
+/**
+ * @param {import('estree').Identifier} node
+ * @param {State} state
+ */
+function handle_identifier(node, state) {
+	if (state.analysis.uses_props) {
+		if (node.name === '$$props' || node.name === '$$restProps') {
+			// not 100% correct for $$restProps but it'll do
+			state.str.update(
+				/** @type {number} */ (node.start),
+				/** @type {number} */ (node.end),
+				state.props_name
+			);
+		} else {
+			const binding = state.scope.get(node.name);
+			if (binding?.kind === 'bindable_prop') {
+				state.str.prependLeft(/** @type {number} */ (node.start), `${state.props_name}.`);
+			}
+		}
+	} else if (node.name === '$$restProps' && state.analysis.uses_rest_props) {
+		state.str.update(
+			/** @type {number} */ (node.start),
+			/** @type {number} */ (node.end),
+			state.rest_props_name
+		);
+	}
+}
+
+/** @param {string} content */
+function guess_indent(content) {
+	const lines = content.split('\n');
+
+	const tabbed = lines.filter((line) => /^\t+/.test(line));
+	const spaced = lines.filter((line) => /^ {2,}/.test(line));
+
+	if (tabbed.length === 0 && spaced.length === 0) {
+		return '\t';
+	}
+
+	// More lines tabbed than spaced? Assume tabs, and
+	// default to tabs in the case of a tie (or nothing
+	// to go on)
+	if (tabbed.length >= spaced.length) {
+		return '\t';
+	}
+
+	// Otherwise, we need to guess the multiple
+	const min = spaced.reduce((previous, current) => {
+		const count = /^ +/.exec(current)?.[0].length ?? 0;
+		return Math.min(count, previous);
+	}, Infinity);
+
+	return ' '.repeat(min);
+}
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index 95161fd6e4..7a8036c76b 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -704,7 +704,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 		} else {
 			extract_identifiers(node).forEach((identifier) => {
 				const binding = scope.get(identifier.name);
-				if (binding) {
+				if (binding && identifier !== binding.node) {
 					binding.mutated = true;
 					binding.reassigned = true;
 				}
diff --git a/packages/svelte/src/legacy/legacy-client.js b/packages/svelte/src/legacy/legacy-client.js
index 570a7c8456..8784489c4d 100644
--- a/packages/svelte/src/legacy/legacy-client.js
+++ b/packages/svelte/src/legacy/legacy-client.js
@@ -1,4 +1,5 @@
 import { proxy } from '../internal/client/proxy.js';
+import { user_pre_effect } from '../internal/client/reactivity/effects.js';
 import { hydrate, mount, unmount } from '../internal/client/render.js';
 import { define_property } from '../internal/client/utils.js';
 
@@ -128,3 +129,14 @@ class Svelte4Component {
 		this.#instance.$destroy();
 	}
 }
+
+/**
+ * Runs the given function once immediately on the server, and works like `$effect.pre` on the client.
+ *
+ * @deprecated Use this only as a temporary solution to migrate your component code to Svelte 5.
+ * @param {() => void | (() => void)} fn
+ * @returns {void}
+ */
+export function run(fn) {
+	user_pre_effect(fn);
+}
diff --git a/packages/svelte/src/legacy/legacy-server.js b/packages/svelte/src/legacy/legacy-server.js
index 6b8d5bfd2c..dad89d0603 100644
--- a/packages/svelte/src/legacy/legacy-server.js
+++ b/packages/svelte/src/legacy/legacy-server.js
@@ -36,3 +36,14 @@ export function asClassComponent(component) {
 	// @ts-ignore
 	return component_constructor;
 }
+
+/**
+ * Runs the given function once immediately on the server, and works like `$effect.pre` on the client.
+ *
+ * @deprecated Use this only as a temporary solution to migrate your component code to Svelte 5.
+ * @param {() => void | (() => void)} fn
+ * @returns {void}
+ */
+export function run(fn) {
+	fn();
+}
diff --git a/packages/svelte/tests/migrate/samples/derivations/input.svelte b/packages/svelte/tests/migrate/samples/derivations/input.svelte
new file mode 100644
index 0000000000..9fde4a4359
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/derivations/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	let count = 0;
+	$: doubled = count * 2;
+	$: ({ quadrupled } = { quadrupled: count * 4 });
+</script>
+
+{count} / {doubled} / {quadrupled}
diff --git a/packages/svelte/tests/migrate/samples/derivations/output.svelte b/packages/svelte/tests/migrate/samples/derivations/output.svelte
new file mode 100644
index 0000000000..f6af6dd450
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/derivations/output.svelte
@@ -0,0 +1,7 @@
+<script>
+	let count = 0;
+	let doubled = $derived(count * 2);
+	let { quadrupled } = $derived({ quadrupled: count * 4 });
+</script>
+
+{count} / {doubled} / {quadrupled}
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/effects/input.svelte b/packages/svelte/tests/migrate/samples/effects/input.svelte
new file mode 100644
index 0000000000..f7f1edfb97
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/effects/input.svelte
@@ -0,0 +1,13 @@
+<script>
+	let count = 0;
+	$: console.log(count);
+	$: if (count > 10) {
+		alert('too high')
+	}
+	$: {
+		console.log('foo');
+		if (x) break $;
+		console.log('bar');
+	}
+	$: $count = 1;
+</script>
diff --git a/packages/svelte/tests/migrate/samples/effects/output.svelte b/packages/svelte/tests/migrate/samples/effects/output.svelte
new file mode 100644
index 0000000000..006ce4b23d
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/effects/output.svelte
@@ -0,0 +1,21 @@
+<script>
+	import { run } from 'svelte/legacy';
+
+	let count = 0;
+	run(() => {
+		console.log(count);
+	});
+	run(() => {
+		if (count > 10) {
+			alert('too high')
+		}
+	});
+	run(() => {
+		console.log('foo');
+		if (x) return;
+		console.log('bar');
+	});
+	run(() => {
+		$count = 1;
+	});
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/event-handlers/input.svelte b/packages/svelte/tests/migrate/samples/event-handlers/input.svelte
new file mode 100644
index 0000000000..a3cbe72889
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/event-handlers/input.svelte
@@ -0,0 +1,17 @@
+<button on:click={() => console.log('hi')} on:click>click me</button>
+<button on:click={() => console.log('before')} on:click on:click={() => console.log('after')}>click me</button>
+<button on:click on:click={foo}>click me</button>
+<button on:click>click me</button>
+
+<button on:dblclick={() => console.log('hi')}>click me</button>
+<button on:toggle>click me</button>
+<button on:custom-event={() => 'hi'}>click me</button>
+<button on:custom-event-bubble>click me</button>
+
+<button on:click|preventDefault={() => ''}>click me</button>
+<button on:click|stopPropagation={() => {}}>click me</button>
+<button on:click|stopImmediatePropagation={() => ''}>click me</button>
+<button on:click|capture={() => ''}>click me</button>
+<button on:click|self={() => ''}>click me</button>
+
+<Button on:click={() => 'leave untouched'} on:click>click me</Button>
diff --git a/packages/svelte/tests/migrate/samples/event-handlers/output.svelte b/packages/svelte/tests/migrate/samples/event-handlers/output.svelte
new file mode 100644
index 0000000000..94103938a2
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/event-handlers/output.svelte
@@ -0,0 +1,47 @@
+<script>
+	/** @type {{onclick?: (event: any) => void, ontoggle?: (event: any) => void, 'oncustom-event-bubble'?: (event: any) => void}} */
+	let { onclick, ontoggle, 'oncustom-event-bubble': oncustom_event_bubble } = $props();
+</script>
+
+<button  onclick={(event) => {
+	console.log('hi')
+
+	onclick?.(event);
+}}>click me</button>
+<button   onclick={(event) => {
+	console.log('before')
+
+	onclick?.(event);
+	console.log('after')
+}}>click me</button>
+<button  onclick={(event) => {
+	onclick?.(event);
+
+	foo?.(event);
+}}>click me</button>
+<button {onclick}>click me</button>
+
+<button ondblclick={() => console.log('hi')}>click me</button>
+<button {ontoggle}>click me</button>
+<button oncustom-event={() => 'hi'}>click me</button>
+<button oncustom-event-bubble={oncustom_event_bubble}>click me</button>
+
+<button onclick={(event) => {
+	event.preventDefault();
+	''
+}}>click me</button>
+<button onclick={(event) => {
+	event.stopPropagation();
+	
+}}>click me</button>
+<button onclick={(event) => {
+	event.stopImmediatePropagation();
+	''
+}}>click me</button>
+<button onclickcapture={() => ''}>click me</button>
+<button onclick={(event) => {
+	// @migration-task: incorporate self modifier
+	''
+}}>click me</button>
+
+<Button on:click={() => 'leave untouched'} on:click>click me</Button>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/props-export-alias/input.svelte b/packages/svelte/tests/migrate/samples/props-export-alias/input.svelte
new file mode 100644
index 0000000000..1cb57ef5fd
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props-export-alias/input.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+	let klass = '';
+	export { klass as class }
+</script>
+
+{klass}
diff --git a/packages/svelte/tests/migrate/samples/props-export-alias/output.svelte b/packages/svelte/tests/migrate/samples/props-export-alias/output.svelte
new file mode 100644
index 0000000000..76d25afb08
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props-export-alias/output.svelte
@@ -0,0 +1,8 @@
+<script lang="ts">
+	interface Props { class?: string }
+
+	let { class: klass = '' }: Props = $props();
+	
+</script>
+
+{klass}
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/props-rest-props/input.svelte b/packages/svelte/tests/migrate/samples/props-rest-props/input.svelte
new file mode 100644
index 0000000000..2086c32c52
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props-rest-props/input.svelte
@@ -0,0 +1,5 @@
+<script>
+    export let foo;
+</script>
+
+<button {foo} {...$$restProps}>click me</button>
diff --git a/packages/svelte/tests/migrate/samples/props-rest-props/output.svelte b/packages/svelte/tests/migrate/samples/props-rest-props/output.svelte
new file mode 100644
index 0000000000..7272cd5db6
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props-rest-props/output.svelte
@@ -0,0 +1,6 @@
+<script>
+    /** @type {{Record<string, any>}} */
+    let { foo, ...rest } = $props();
+</script>
+
+<button {foo} {...rest}>click me</button>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/props-ts/input.svelte b/packages/svelte/tests/migrate/samples/props-ts/input.svelte
new file mode 100644
index 0000000000..3738630649
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props-ts/input.svelte
@@ -0,0 +1,11 @@
+<script lang="ts">
+    export let readonly: number;
+    export let optional = 'foo';
+    export let binding: string;
+    export let bindingOptional: string | undefined = 'bar';
+</script>
+
+{readonly}
+{optional}
+<input bind:value={binding} />
+<input bind:value={bindingOptional} />
diff --git a/packages/svelte/tests/migrate/samples/props-ts/output.svelte b/packages/svelte/tests/migrate/samples/props-ts/output.svelte
new file mode 100644
index 0000000000..441d48b823
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props-ts/output.svelte
@@ -0,0 +1,20 @@
+<script lang="ts">
+    interface Props {
+        readonly: number,
+        optional?: string,
+        binding: string,
+        bindingOptional?: string | undefined
+    }
+
+    let {
+        readonly,
+        optional = 'foo',
+        binding = $bindable(),
+        bindingOptional = $bindable('bar')
+    }: Props = $props();
+</script>
+
+{readonly}
+{optional}
+<input bind:value={binding} />
+<input bind:value={bindingOptional} />
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/props/input.svelte b/packages/svelte/tests/migrate/samples/props/input.svelte
new file mode 100644
index 0000000000..b29e9be480
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props/input.svelte
@@ -0,0 +1,11 @@
+<script>
+    export let readonly;
+    export let optional = 'foo';
+    export let binding;
+    export let bindingOptional = 'bar';
+</script>
+
+{readonly}
+{optional}
+<input bind:value={binding} />
+<input bind:value={bindingOptional} />
diff --git a/packages/svelte/tests/migrate/samples/props/output.svelte b/packages/svelte/tests/migrate/samples/props/output.svelte
new file mode 100644
index 0000000000..5dacd500b6
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/props/output.svelte
@@ -0,0 +1,14 @@
+<script>
+    /** @type {{readonly: any, optional?: string, binding: any, bindingOptional?: string}} */
+    let {
+        readonly,
+        optional = 'foo',
+        binding = $bindable(),
+        bindingOptional = $bindable('bar')
+    } = $props();
+</script>
+
+{readonly}
+{optional}
+<input bind:value={binding} />
+<input bind:value={bindingOptional} />
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/slots/input.svelte b/packages/svelte/tests/migrate/samples/slots/input.svelte
new file mode 100644
index 0000000000..e71004fcfe
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/slots/input.svelte
@@ -0,0 +1,7 @@
+<button><slot /></button>
+
+{#if foo}
+	<slot name="foo" {foo} />
+{/if}
+
+<slot name="dashed-name" />
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/slots/output.svelte b/packages/svelte/tests/migrate/samples/slots/output.svelte
new file mode 100644
index 0000000000..790be7e3a1
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/slots/output.svelte
@@ -0,0 +1,12 @@
+<script>
+	/** @type {{children?: import('svelte').Snippet, foo_1?: import('svelte').Snippet<[any]>, dashed_name?: import('svelte').Snippet}} */
+	let { children, foo_1, dashed_name } = $props();
+</script>
+
+<button>{@render children?.()}</button>
+
+{#if foo}
+	{@render foo_1?.({ foo, })}
+{/if}
+
+{@render dashed_name?.()}
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/test.ts b/packages/svelte/tests/migrate/test.ts
new file mode 100644
index 0000000000..a3c247245c
--- /dev/null
+++ b/packages/svelte/tests/migrate/test.ts
@@ -0,0 +1,30 @@
+import * as fs from 'node:fs';
+import { assert } from 'vitest';
+import { migrate } from 'svelte/compiler';
+import { try_read_file } from '../helpers.js';
+import { suite, type BaseTest } from '../suite.js';
+
+interface ParserTest extends BaseTest {}
+
+const { test, run } = suite<ParserTest>(async (config, cwd) => {
+	const input = fs
+		.readFileSync(`${cwd}/input.svelte`, 'utf-8')
+		.replace(/\s+$/, '')
+		.replace(/\r/g, '');
+
+	const actual = migrate(input).code;
+
+	// run `UPDATE_SNAPSHOTS=true pnpm test migrate` to update parser tests
+	if (process.env.UPDATE_SNAPSHOTS || !fs.existsSync(`${cwd}/output.svelte`)) {
+		fs.writeFileSync(`${cwd}/output.svelte`, actual);
+	} else {
+		fs.writeFileSync(`${cwd}/_actual.svelte`, actual);
+
+		const expected = try_read_file(`${cwd}/output.svelte`);
+		assert.deepEqual(actual, expected);
+	}
+});
+
+export { test };
+
+await run(__dirname);
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 9540b52e57..e3d07e836a 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -1086,6 +1086,14 @@ declare module 'svelte/compiler' {
 	 * https://svelte.dev/docs/svelte-compiler#svelte-version
 	 * */
 	export const VERSION: string;
+	/**
+	 * Does a best-effort migration of Svelte code towards using runes, event attributes and render tags.
+	 * May throw an error if the code is too complex to migrate automatically.
+	 *
+	 * */
+	export function migrate(source: string): {
+		code: string;
+	};
 	class Scope {
 		
 		constructor(root: ScopeRoot, parent: Scope | null, porous: boolean);
@@ -1959,6 +1967,12 @@ declare module 'svelte/legacy' {
 	 *
 	 * */
 	export function asClassComponent<Props extends Record<string, any>, Exports extends Record<string, any>, Events extends Record<string, any>, Slots extends Record<string, any>>(component: import("svelte").SvelteComponent<Props, Events, Slots>): import("svelte").ComponentType<import("svelte").SvelteComponent<Props, Events, Slots> & Exports>;
+	/**
+	 * Runs the given function once immediately on the server, and works like `$effect.pre` on the client.
+	 *
+	 * @deprecated Use this only as a temporary solution to migrate your component code to Svelte 5.
+	 * */
+	export function run(fn: () => void | (() => void)): void;
 }
 
 declare module 'svelte/motion' {
diff --git a/playgrounds/sandbox/run.js b/playgrounds/sandbox/run.js
index d292d640ba..a6589e993d 100644
--- a/playgrounds/sandbox/run.js
+++ b/playgrounds/sandbox/run.js
@@ -3,7 +3,7 @@ import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import glob from 'tiny-glob/sync.js';
 import minimist from 'minimist';
-import { compile, compileModule, parse } from 'svelte/compiler';
+import { compile, compileModule, parse, migrate } from 'svelte/compiler';
 
 const argv = minimist(process.argv.slice(2));
 
@@ -47,6 +47,13 @@ for (const generate of ['client', 'server']) {
 			});
 
 			fs.writeFileSync(`${cwd}/output/${file}.json`, JSON.stringify(ast, null, '\t'));
+
+			try {
+				const migrated = migrate(source);
+				fs.writeFileSync(`${cwd}/output/${file}.migrated.svelte`, migrated);
+			} catch (e) {
+				console.warn(`Error migrating ${file}`, e);
+			}
 		}
 
 		const compiled = compile(source, {
diff --git a/sites/svelte-5-preview/src/lib/Input/ComponentSelector.svelte b/sites/svelte-5-preview/src/lib/Input/ComponentSelector.svelte
index 71cd9241b8..c63ca416cf 100644
--- a/sites/svelte-5-preview/src/lib/Input/ComponentSelector.svelte
+++ b/sites/svelte-5-preview/src/lib/Input/ComponentSelector.svelte
@@ -3,6 +3,7 @@
 	import { get_full_filename } from '$lib/utils.js';
 	import { createEventDispatcher, tick } from 'svelte';
 	import RunesInfo from './RunesInfo.svelte';
+	import Migrate from './Migrate.svelte';
 
 	/** @type {boolean}  */
 	export let show_modified;
@@ -296,6 +297,8 @@
 	</button>
 
 	<div class="runes-info"><RunesInfo {runes} /></div>
+
+	<div class="migrate-info"><Migrate /></div>
 </div>
 
 <style>
@@ -413,6 +416,13 @@
 		justify-content: flex-end;
 	}
 
+	.migrate-info {
+		flex: 0 1 0;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
 	.drag-handle {
 		cursor: move;
 		width: 5px;
diff --git a/sites/svelte-5-preview/src/lib/Input/Migrate.svelte b/sites/svelte-5-preview/src/lib/Input/Migrate.svelte
new file mode 100644
index 0000000000..e268f3838e
--- /dev/null
+++ b/sites/svelte-5-preview/src/lib/Input/Migrate.svelte
@@ -0,0 +1,22 @@
+<script>
+	import { get_repl_context } from '$lib/context.js';
+
+	const { migrate } = get_repl_context();
+</script>
+
+<div class="container">
+	<button on:click={migrate} title="Migrate this component towards the new syntax">migrate</button>
+</div>
+
+<style>
+	button {
+		position: relative;
+		display: flex;
+		text-transform: uppercase;
+		font-size: 1.4rem;
+		padding: 0.8rem;
+		gap: 0.5rem;
+		margin-right: 0.3rem;
+		z-index: 9999;
+	}
+</style>
diff --git a/sites/svelte-5-preview/src/lib/Output/Compiler.js b/sites/svelte-5-preview/src/lib/Output/Compiler.js
index da11186a2f..ae36368241 100644
--- a/sites/svelte-5-preview/src/lib/Output/Compiler.js
+++ b/sites/svelte-5-preview/src/lib/Output/Compiler.js
@@ -67,6 +67,24 @@ export default class Compiler {
 		});
 	}
 
+	/**
+	 * @param {import('$lib/types').File} file
+	 * @returns {Promise<import('$lib/workers/workers').MigrateMessageData>}
+	 */
+	migrate(file) {
+		return new Promise((fulfil) => {
+			const id = uid++;
+
+			this.handlers.set(id, fulfil);
+
+			this.worker.postMessage({
+				id,
+				type: 'migrate',
+				source: file.source
+			});
+		});
+	}
+
 	destroy() {
 		this.worker.terminate();
 	}
diff --git a/sites/svelte-5-preview/src/lib/Repl.svelte b/sites/svelte-5-preview/src/lib/Repl.svelte
index fd30aca10e..80a2b7ff61 100644
--- a/sites/svelte-5-preview/src/lib/Repl.svelte
+++ b/sites/svelte-5-preview/src/lib/Repl.svelte
@@ -137,6 +137,7 @@
 		EDITOR_STATE_MAP,
 
 		rebundle,
+		migrate,
 		clear_state,
 		go_to_warning_pos,
 		handle_change,
@@ -156,6 +157,27 @@
 		resolver();
 	}
 
+	async function migrate() {
+		if (!compiler || $selected?.type !== 'svelte') return;
+
+		const result = await compiler.migrate($selected);
+		if (result.error) {
+			// TODO show somehow
+			return;
+		}
+
+		const new_files = $files.map((file) => {
+			if (file.name === $selected?.name) {
+				return {
+					...file,
+					source: result.result.code
+				};
+			}
+			return file;
+		});
+		set({ files: new_files });
+	}
+
 	let is_select_changing = false;
 
 	/**
diff --git a/sites/svelte-5-preview/src/lib/types.d.ts b/sites/svelte-5-preview/src/lib/types.d.ts
index 7f978aec69..a758846d29 100644
--- a/sites/svelte-5-preview/src/lib/types.d.ts
+++ b/sites/svelte-5-preview/src/lib/types.d.ts
@@ -65,6 +65,7 @@ export type ReplContext = {
 
 	// Methods
 	rebundle(): Promise<void>;
+	migrate(): Promise<void>;
 	handle_select(filename: string): Promise<void>;
 	handle_change(
 		event: CustomEvent<{
diff --git a/sites/svelte-5-preview/src/lib/workers/compiler/index.js b/sites/svelte-5-preview/src/lib/workers/compiler/index.js
index b5bf92e646..83dffe1856 100644
--- a/sites/svelte-5-preview/src/lib/workers/compiler/index.js
+++ b/sites/svelte-5-preview/src/lib/workers/compiler/index.js
@@ -41,6 +41,11 @@ self.addEventListener(
 				await ready;
 				postMessage(compile(event.data));
 				break;
+
+			case 'migrate':
+				await ready;
+				postMessage(migrate(event.data));
+				break;
 		}
 	}
 );
@@ -128,3 +133,24 @@ function compile({ id, source, options, return_ast }) {
 		};
 	}
 }
+
+/** @param {import("../workers").MigrateMessageData} param0 */
+function migrate({ id, source }) {
+	try {
+		const result = svelte.migrate(source);
+
+		return {
+			id,
+			result
+		};
+	} catch (err) {
+		// @ts-ignore
+		let message = `/*\nError migrating ${err.filename ?? 'component'}:\n${err.message}\n*/`;
+
+		return {
+			id,
+			result: { code: source },
+			error: message
+		};
+	}
+}
diff --git a/sites/svelte-5-preview/src/lib/workers/workers.d.ts b/sites/svelte-5-preview/src/lib/workers/workers.d.ts
index 47238b4812..2c0015cf32 100644
--- a/sites/svelte-5-preview/src/lib/workers/workers.d.ts
+++ b/sites/svelte-5-preview/src/lib/workers/workers.d.ts
@@ -26,3 +26,9 @@ export type BundleMessageData = {
 	svelte_url: string;
 	files: File[];
 };
+
+export type MigrateMessageData = {
+	id: number;
+	result: { code: string };
+	error?: string;
+};

From d3949a6e71a2526aa2893814b479b51f3d79c74c Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Sat, 27 Apr 2024 12:37:12 +0200
Subject: [PATCH 24/27] fix: hr, script and template as valid select children
 (#11344)

Closes #11342
---------

Co-authored-by: Jeremiasz Major <jrh.mjr@gmail.com>
---
 .changeset/cyan-squids-drive.md                      |  5 +++++
 packages/svelte/src/constants.js                     |  9 ++++++++-
 .../samples/invalid-node-placement-3/errors.json     |  1 +
 .../samples/invalid-node-placement-3/input.svelte    | 12 ++++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/cyan-squids-drive.md
 create mode 100644 packages/svelte/tests/validator/samples/invalid-node-placement-3/errors.json
 create mode 100644 packages/svelte/tests/validator/samples/invalid-node-placement-3/input.svelte

diff --git a/.changeset/cyan-squids-drive.md b/.changeset/cyan-squids-drive.md
new file mode 100644
index 0000000000..ae01d66fed
--- /dev/null
+++ b/.changeset/cyan-squids-drive.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: make hr, script and template valid select children
diff --git a/packages/svelte/src/constants.js b/packages/svelte/src/constants.js
index 7755872ba5..376809fb76 100644
--- a/packages/svelte/src/constants.js
+++ b/packages/svelte/src/constants.js
@@ -158,7 +158,14 @@ export function is_tag_valid_with_parent(tag, parent_tag) {
 	switch (parent_tag) {
 		// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inselect
 		case 'select':
-			return tag === 'option' || tag === 'optgroup' || tag === '#text';
+			return (
+				tag === 'option' ||
+				tag === 'optgroup' ||
+				tag === '#text' ||
+				tag === 'hr' ||
+				tag === 'script' ||
+				tag === 'template'
+			);
 		case 'optgroup':
 			return tag === 'option' || tag === '#text';
 		// Strictly speaking, seeing an <option> doesn't mean we're in a <select>
diff --git a/packages/svelte/tests/validator/samples/invalid-node-placement-3/errors.json b/packages/svelte/tests/validator/samples/invalid-node-placement-3/errors.json
new file mode 100644
index 0000000000..fe51488c70
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/invalid-node-placement-3/errors.json
@@ -0,0 +1 @@
+[]
diff --git a/packages/svelte/tests/validator/samples/invalid-node-placement-3/input.svelte b/packages/svelte/tests/validator/samples/invalid-node-placement-3/input.svelte
new file mode 100644
index 0000000000..23c8edbbdf
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/invalid-node-placement-3/input.svelte
@@ -0,0 +1,12 @@
+<script>
+</script>
+
+<select>
+	<option value="0">The</option>
+	<hr>
+	<script>
+		console.log("hei");
+	</script>
+	<template>Cool</template>
+	<option value="1">bug</option>
+</select>
\ No newline at end of file

From 7d19e5b1a4ecf631490d6a96be724f7c8c68c3e9 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sat, 27 Apr 2024 12:37:30 +0200
Subject: [PATCH 25/27] fix: disallow mounting a snippet (#11347)

fixes #11264
---
 .changeset/itchy-panthers-shave.md                 |  5 +++++
 packages/svelte/src/internal/client/render.js      |  9 +++++++++
 .../samples/mount-snippet-error/_config.js         | 12 ++++++++++++
 .../samples/mount-snippet-error/main.svelte        | 14 ++++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 .changeset/itchy-panthers-shave.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/mount-snippet-error/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/mount-snippet-error/main.svelte

diff --git a/.changeset/itchy-panthers-shave.md b/.changeset/itchy-panthers-shave.md
new file mode 100644
index 0000000000..c47ab1f61c
--- /dev/null
+++ b/.changeset/itchy-panthers-shave.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: disallow mounting a snippet
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index c0d449f35b..bafaadf2b8 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -21,6 +21,7 @@ import { handle_event_propagation } from './dom/elements/events.js';
 import { reset_head_anchor } from './dom/blocks/svelte-head.js';
 import * as w from './warnings.js';
 import * as e from './errors.js';
+import { validate_component } from '../shared/validate.js';
 
 /** @type {Set<string>} */
 export const all_registered_events = new Set();
@@ -102,6 +103,10 @@ export function stringify(value) {
  * @returns {Exports}
  */
 export function mount(component, options) {
+	if (DEV) {
+		validate_component(component);
+	}
+
 	const anchor = options.anchor ?? options.target.appendChild(empty());
 	// Don't flush previous effects to ensure order of outer effects stays consistent
 	return flush_sync(() => _mount(component, { ...options, anchor }), false);
@@ -125,6 +130,10 @@ export function mount(component, options) {
  * @returns {Exports}
  */
 export function hydrate(component, options) {
+	if (DEV) {
+		validate_component(component);
+	}
+
 	const target = options.target;
 	const previous_hydrate_nodes = hydrate_nodes;
 
diff --git a/packages/svelte/tests/runtime-runes/samples/mount-snippet-error/_config.js b/packages/svelte/tests/runtime-runes/samples/mount-snippet-error/_config.js
new file mode 100644
index 0000000000..3ba2b358ea
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/mount-snippet-error/_config.js
@@ -0,0 +1,12 @@
+import { test } from '../../test';
+
+export default test({
+	compileOptions: {
+		dev: true
+	},
+	async test({ assert, target }) {
+		const div = target.querySelector('div');
+		assert.htmlEqual(div?.innerHTML || '', '');
+	},
+	runtime_error: 'snippet_used_as_component\nA snippet must be rendered with `{@render ...}`'
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/mount-snippet-error/main.svelte b/packages/svelte/tests/runtime-runes/samples/mount-snippet-error/main.svelte
new file mode 100644
index 0000000000..075fbba24e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/mount-snippet-error/main.svelte
@@ -0,0 +1,14 @@
+<script>
+    import { onMount, mount } from 'svelte';
+
+    let el;
+
+    onMount(() => {
+        mount(foo, { target: el });
+    });
+</script>
+
+<div bind:this={el}></div>
+{#snippet foo()}
+    shouldnt be rendered
+{/snippet}
\ No newline at end of file

From bda32edb1a4f2d383d96071750d6bfa9421b2175 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 27 Apr 2024 08:27:55 -0400
Subject: [PATCH 26/27] docs: on:keydown -> onkeydown (#11343)

---
 .../docs/content/02-examples/02-fine-grained-reactivity.md  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sites/svelte-5-preview/src/routes/docs/content/02-examples/02-fine-grained-reactivity.md b/sites/svelte-5-preview/src/routes/docs/content/02-examples/02-fine-grained-reactivity.md
index f257769adf..6c804b03ac 100644
--- a/sites/svelte-5-preview/src/routes/docs/content/02-examples/02-fine-grained-reactivity.md
+++ b/sites/svelte-5-preview/src/routes/docs/content/02-examples/02-fine-grained-reactivity.md
@@ -28,7 +28,7 @@ In Svelte 4, reactivity centres on the _component_ and the top-level state decla
 	}
 </script>
 
-<input on:keydown={addTodo} />
+<input onkeydown={addTodo} />
 
 {#each todos as todo}
 	<div>
@@ -40,7 +40,7 @@ In Svelte 4, reactivity centres on the _component_ and the top-level state decla
 <p>{remaining(todos)} remaining</p>
 ```
 
-...editing any individual `todo` will invalidate the entire list. You can see this for yourself by [opening the playground](/#H4sIAAAAAAAAE2VSy27jMAz8FVV7cAIE8t21DfSwf7C3OgdVohOhCmXIdLaF4H9fPewE6N7I0ZAzpBj4aCzMvHkPHOUNeMPfpomfOH1PKZnvYAliPrvFq4S0s_Jmon7AgSwQI6fdzDr2fn6NUATHBRUZh8zDTRo0eDlkzpGF9DyQcjg7C8K6y6HyoKRVi5UUidXxtVA80OKx9BbRIYHPTVjXs5cUCO0QjsICXuiai9Yf6lLrP5F4gDsgPbTNyAoiPuGbvXQdq35j7F4dWdHchhjoMVdJBxJCZOy0A2EPBkpuGjZKO8PpiRJ8UcOKHEl_ARJ3aRfYGWsJzg_N_6nRQFXt87X1c_fYGpwWYg6bOIl2f7EL28grqzMj_AKprtsHyTkHWbLV5t4Xxa3Lh0HdZMEu5PUm61ufJyvdRDdwdQX1-eG-Bl7qcg56q0yr2CvbuiiFOjnJP9ROffh5GOvzVNp66uO13Zw2owHNG_ILrOf1H3DaaQeoAgAA), adding some todos, and watching the console in the bottom right. `remaining(todos)` is recalculated every time we edit the `text` of a todo, even though it can't possibly affect the result.
+...editing any individual `todo` will invalidate the entire list. You can see this for yourself by [opening the playground](/#H4sIAAAAAAAAE2VSy27jMAz8FVV7cAIE8t21DfSwf7C3OgdVohOhCmXIdLaF4H9fPewE6N7I0ZAzpBj4aCzMvHkPHOUNeMPfpomfOH1PKZnvYAliPrvFq4S0s_Jmon7AgSwQI6fdzDr2fn6NUATHBRUZh8zDTRo0eDlkzpGF9DyQcjg7C8K6y6HyoKRVi5UUidXxtVA80OKx9BbRIYHPTVjXs5cUCO0QjsICXuiai9Yf6lLrP5F4gDsgPbTNyAoiPuGbvXQdq35j7F4dWdHchhjoMVdJBxJCZOy0A2EPBkpuGjZKO8PpiRJ8UcOKHEl_ARJ3aRfYGWsJzg_N_6nRQFXt87X1c_fYGpwWYg7jINr9xS5sE6-szoTwC6S6bv8j5xxkxVabe18EtyYfBnWT9bqQt5ucb32erHQS3cDVFdTnh_saeKnLOeitMm1ir2zrohTq5CR_UDv14eddrM9Laeupj8d2c9qMBjRvyC-wntd_ggUqOqcCAAA=), adding some todos, and watching the console in the bottom right. `remaining(todos)` is recalculated every time we edit the `text` of a todo, even though it can't possibly affect the result.
 
 Worse, everything inside the `each` block needs to be checked for updates. When a list gets large enough, this behaviour has the potential to cause performance headaches.
 
@@ -76,4 +76,4 @@ With runes, it's easy to make reactivity _fine-grained_, meaning that things wil
 </script>
 ```
 
-In [this version of the app](/#H4sIAAAAAAAAE2VSy07EMAz8lRCQ2kqovZe2Egf-gBvlEBJ3N9qsUyXuAqr67-TRZSW4xfZ4xh5n5ZM24Hn7tnIUZ-Atf55n_sjpe46Bv4AhCLG3i5Mx03np9EzDiCMZIEZWWc969uBJEJRv79VTKIXitKAkbZE5OAuNGg9lwlZsjeWRpEVvDdTGHsrCgRRGLkZQABaJI0Ac0OIwa9RhUgKXSFg_sLv4qJVFqGoDeKBjatr-qAulXgOwhAsg_WrrieVMfYJvdtf3rHjBwF5ULGvuS4yUtefFH8u9d6Qo2rJJGA-P1xzBF7Usc5JwB6D6IswCub5Vv4T_IcG9orgO3zU3g7HTOC_ELLZhTGU_sV_3fTbWJMR6D0Ie9ysInx7RAuqUvgxZcWf50KjaJNivybs48s5zQ8XD9yOXR5CnD_s18tyXYlB7ZzTg2tk1WWlt4iTJ_m4e1r9X327_oGvmIXyps1V60qB4S26B7X37AXGd34ONAgAA), editing the `text` of a todo won't cause unrelated things to be updated.
+In [this version of the app](/#H4sIAAAAAAAAE2VSy07EMAz8lRCQ2kqovZe2Egf-gBvlEBJ3N9qsUyXuAqr67-TRZSW4xfZ4Zmxn5ZM24Hn7tnIUZ-Atf55n_sjpe46Bv4AhCLG3i5Mx03np9EzDiCMZIEZWWc969uBJEJRv79VTKIXitKAkbZE5OAuNGg9lwlZsjeWRpEVvDdTGHsrCgRRGLkZQABaJI0Ac0OIwa9TBKYFLJKwf2F181MoiVLUBPNAxNW1_1IVSrwFYwgWQfrX1xHKmPsE3u-t7VrxgYC8qljX3IUbK2vPij-XeO1IUbdkkjIfHa47gi1qWOUm4A1B9EWaBXN-qX8L_kLC9oria75rbgrHTOC_ELAaXyn5iv-7jbKxJgPUehDzuRxA-PeIGqFP6MmTBneRDo2qTXr-m1UXHO88NFe_ej1weQZ4-7NfIc1-KQe2dcf5rZ9dkpbWJTtL2u3lY_x59u32DrpmH8KPOVulJg-ItuQW29-0HkdosMowCAAA=), editing the `text` of a todo won't cause unrelated things to be updated.

From 68071f7c0658e72c2dc0b8cd0bb81a4bd39127f0 Mon Sep 17 00:00:00 2001
From: Caique Torres <56696506+caiquetorres@users.noreply.github.com>
Date: Sun, 28 Apr 2024 17:43:07 -0300
Subject: [PATCH 27/27] fix: disallow mixing event-handling syntaxes (#11295)

Closes #11262

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/cool-poems-watch.md                |  5 +++++
 .../messages/compile-errors/template.md       |  4 ++++
 packages/svelte/src/compiler/errors.js        | 10 +++++++++
 .../src/compiler/phases/2-analyze/index.js    | 21 +++++++++++++++++++
 .../compiler/phases/2-analyze/validation.js   |  1 +
 .../svelte/src/compiler/phases/types.d.ts     |  5 +++++
 .../event-attribute-delegation-2/main.svelte  |  2 +-
 .../Component.svelte                          |  7 +++++++
 .../event-attribute-delegation-4/main.svelte  |  5 +++--
 .../Button.svelte                             |  7 +++++++
 .../Component.svelte                          |  7 +++++++
 .../event-attribute-delegation-5/main.svelte  | 15 ++++++++-----
 .../Button.svelte                             |  7 +++++++
 .../main.svelte                               | 17 ++++++++-------
 .../input.svelte                              |  4 ++--
 .../warnings.json                             |  2 +-
 .../errors.json                               | 14 +++++++++++++
 .../input.svelte                              | 11 ++++++++++
 .../runes-legacy-syntax-warnings/input.svelte |  3 +--
 .../warnings.json                             | 12 +++++------
 20 files changed, 132 insertions(+), 27 deletions(-)
 create mode 100644 .changeset/cool-poems-watch.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Button.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/Button.svelte
 create mode 100644 packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/errors.json
 create mode 100644 packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/input.svelte

diff --git a/.changeset/cool-poems-watch.md b/.changeset/cool-poems-watch.md
new file mode 100644
index 0000000000..34527ad16f
--- /dev/null
+++ b/.changeset/cool-poems-watch.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: disallow mixing on:click and onclick syntax
diff --git a/packages/svelte/messages/compile-errors/template.md b/packages/svelte/messages/compile-errors/template.md
index c1b8c5f3c3..293d4845cd 100644
--- a/packages/svelte/messages/compile-errors/template.md
+++ b/packages/svelte/messages/compile-errors/template.md
@@ -172,6 +172,10 @@
 
 > `let:` directive at invalid position
 
+## mixed_event_handler_syntaxes
+
+> Mixing old (on:%name%) and new syntaxes for event handling is not allowed. Use only the on%name% syntax.
+
 ## node_invalid_placement
 
 > %thing% is invalid inside <%parent%>
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index a00a2cd593..d2834d03d4 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -918,6 +918,16 @@ export function let_directive_invalid_placement(node) {
 	e(node, "let_directive_invalid_placement", "`let:` directive at invalid position");
 }
 
+/**
+ * Mixing old (on:%name%) and new syntaxes for event handling is not allowed. Use only the on%name% syntax.
+ * @param {null | number | NodeLike} node
+ * @param {string} name
+ * @returns {never}
+ */
+export function mixed_event_handler_syntaxes(node, name) {
+	e(node, "mixed_event_handler_syntaxes", `Mixing old (on:${name}) and new syntaxes for event handling is not allowed. Use only the on${name} syntax.`);
+}
+
 /**
  * %thing% is invalid inside <%parent%>
  * @param {null | number | NodeLike} node
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 2ed2288a8e..8d3088806d 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -372,6 +372,8 @@ export function analyze_component(root, source, options) {
 		uses_render_tags: false,
 		needs_context: false,
 		needs_props: false,
+		event_directive_node: null,
+		uses_event_attributes: false,
 		custom_element: options.customElementOptions ?? options.customElement,
 		inject_styles: options.css === 'injected' || options.customElement,
 		accessors: options.customElement
@@ -494,6 +496,13 @@ export function analyze_component(root, source, options) {
 		analysis.reactive_statements = order_reactive_statements(analysis.reactive_statements);
 	}
 
+	if (analysis.event_directive_node && analysis.uses_event_attributes) {
+		e.mixed_event_handler_syntaxes(
+			analysis.event_directive_node,
+			analysis.event_directive_node.name
+		);
+	}
+
 	if (analysis.uses_render_tags && (analysis.uses_slots || analysis.slot_names.size > 0)) {
 		e.slot_snippet_conflict(analysis.slot_names.values().next().value);
 	}
@@ -1153,6 +1162,11 @@ const common_visitors = {
 		});
 
 		if (is_event_attribute(node)) {
+			const parent = context.path.at(-1);
+			if (parent?.type === 'RegularElement' || parent?.type === 'SvelteElement') {
+				context.state.analysis.uses_event_attributes = true;
+			}
+
 			const expression = node.value[0].expression;
 
 			const delegated_event = get_delegated_event(node.name.slice(2), expression, context);
@@ -1286,6 +1300,13 @@ const common_visitors = {
 
 		context.next();
 	},
+	OnDirective(node, { state, path, next }) {
+		const parent = path.at(-1);
+		if (parent?.type === 'SvelteElement' || parent?.type === 'RegularElement') {
+			state.analysis.event_directive_node ??= node;
+		}
+		next();
+	},
 	BindDirective(node, context) {
 		let i = context.path.length;
 		while (i--) {
diff --git a/packages/svelte/src/compiler/phases/2-analyze/validation.js b/packages/svelte/src/compiler/phases/2-analyze/validation.js
index 4f68b5f9ed..ab793bf1a7 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/validation.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/validation.js
@@ -8,6 +8,7 @@ import * as e from '../../errors.js';
 import {
 	extract_identifiers,
 	get_parent,
+	is_event_attribute,
 	is_expression_attribute,
 	is_text_attribute,
 	object,
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index 3e892fefef..ae346068c4 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -2,6 +2,7 @@ import type {
 	Binding,
 	Css,
 	Fragment,
+	OnDirective,
 	RegularElement,
 	SlotElement,
 	SvelteElement,
@@ -59,6 +60,10 @@ export interface ComponentAnalysis extends Analysis {
 	uses_render_tags: boolean;
 	needs_context: boolean;
 	needs_props: boolean;
+	/** Set to the first event directive (on:x) found on a DOM element in the code */
+	event_directive_node: OnDirective | null;
+	/** true if uses event attributes (onclick) on a DOM element */
+	uses_event_attributes: boolean;
 	custom_element: boolean | SvelteOptions['customElement'];
 	/** If `true`, should append styles through JavaScript */
 	inject_styles: boolean;
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte
index 2a18005538..3e803a6283 100644
--- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte
@@ -1,4 +1,4 @@
-<div on:click={(e) => { console.log('clicked div') }}>
+<div onclick={(e) => { console.log('clicked div') }}>
 	<button onclick={(e) => { console.log('clicked button'); e.stopPropagation() }}>
 		Button
 	</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/Component.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/Component.svelte
new file mode 100644
index 0000000000..d096bacaac
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/Component.svelte
@@ -0,0 +1,7 @@
+<script>
+	const { children, ...props } = $props();
+</script>
+
+<div {...props} on:click>
+	{@render children()}
+</div>
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte
index 9697540e18..b7b3300168 100644
--- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte
@@ -1,12 +1,13 @@
 <script>
+	import Component from "./Component.svelte";
 	import Sub from "./sub.svelte";
 </script>
 
 <svelte:window onclick="{() => console.log('window main')}" />
 <svelte:document onclick="{() => console.log('document main')}" />
 
-<div on:click={() => console.log('div main 1')} on:click={() => console.log('div main 2')}>
+<Component on:click={() => console.log('div main 1')} on:click={() => console.log('div main 2')}>
 	<button onclick={() => console.log('button main')}>main</button>
-</div>
+</Component>
 
 <Sub />
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Button.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Button.svelte
new file mode 100644
index 0000000000..3de20765c2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Button.svelte
@@ -0,0 +1,7 @@
+<script>
+	const { children, ...props } = $props();
+</script>
+
+<button {...props} on:click>
+	{@render children()}
+</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Component.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Component.svelte
new file mode 100644
index 0000000000..d096bacaac
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/Component.svelte
@@ -0,0 +1,7 @@
+<script>
+	const { children, ...props } = $props();
+</script>
+
+<div {...props} on:click>
+	{@render children()}
+</div>
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte
index 6df18bff43..d7d70c0b0d 100644
--- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte
@@ -1,5 +1,10 @@
-<div onclick={() => console.log('outer div onclick')}>
-	<div on:click={() => console.log('inner div on:click')}>
-		<button onclick={() => console.log('button onclick')} on:click={() => console.log('button on:click')}>main</button>
-	</div>
-</div>
+<script>
+	import Component from "./Component.svelte";
+	import Button from "./Button.svelte";
+</script>
+
+<Component onclick={() => console.log('outer div onclick')}>
+	<Component on:click={() => console.log('inner div on:click')}>
+		<Button onclick={() => console.log('button onclick')} on:click={() => console.log('button on:click')}>main</Button>
+	</Component>
+</Component>
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/Button.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/Button.svelte
new file mode 100644
index 0000000000..3de20765c2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/Button.svelte
@@ -0,0 +1,7 @@
+<script>
+	const { children, ...props } = $props();
+</script>
+
+<button {...props} on:click>
+	{@render children()}
+</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/main.svelte
index de589e3e40..b80782b28f 100644
--- a/packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-spread-collision/main.svelte
@@ -1,21 +1,22 @@
 <script>
+	import Button from './Button.svelte';
 	let text = $state('click me');
 	let text2 = $state('');
 	let spread = { onclick: () => text = 'click spread' };
 </script>
 
-<button onclick={() => text = 'click onclick'} {...spread}>
+<Button onclick={() => text = 'click onclick'} {...spread}>
 	{text}
-</button>
+</Button>
 
-<button {...spread} onclick={() => text = 'click onclick'}>
+<Button {...spread} onclick={() => text = 'click onclick'}>
 	{text}
-</button>
+</Button>
 
-<button onclick={() => text = 'click onclick'} {...spread} on:click={() => text2 = '!'}>
+<Button onclick={() => text = 'click onclick'} {...spread} on:click={() => text2 = '!'}>
 	{text}{text2}
-</button>
+</Button>
 
-<button on:click={() => text2 = '?'} {...spread} onclick={() => text = 'click onclick'}>
+<Button on:click={() => text2 = '?'} {...spread} onclick={() => text = 'click onclick'}>
 	{text}{text2}
-</button>
+</Button>
diff --git a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
index 4f23811a01..37df598129 100644
--- a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/input.svelte
@@ -25,7 +25,7 @@
 <!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
 <footer on:click={noop}></footer>
 <!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
-<footer onclick={noop}></footer>
+<footer on:click={noop}></footer>
 
 <!-- should not warn -->
 <div class="foo"></div>
@@ -68,7 +68,7 @@
 <div on:click={noop} role="presentation"></div>
 <div on:click={noop} role="none"></div>
 <div on:click={noop} role={dynamicRole}></div>
-<div onclick={noop} role={dynamicRole}></div>
+<div on:click={noop} role={dynamicRole}></div>
 
 <!-- svelte-ignore a11y_no_static_element_interactions -->
 <svelte:element this={Math.random() ? 'button' : 'div'} on:click={noop} />
diff --git a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
index 00adecd2ea..ec348e03ea 100644
--- a/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-click-events-have-key-events/warnings.json
@@ -92,7 +92,7 @@
 		},
 		"end": {
 			"line": 28,
-			"column": 32
+			"column": 33
 		}
 	}
 ]
diff --git a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/errors.json b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/errors.json
new file mode 100644
index 0000000000..6a60c09003
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/errors.json
@@ -0,0 +1,14 @@
+[
+	{
+		"code": "mixed_event_handler_syntaxes",
+		"message": "Mixing old (on:click) and new syntaxes for event handling is not allowed. Use only the onclick syntax.",
+		"start": {
+			"line": 11,
+			"column": 8
+		},
+		"end": {
+			"line": 11,
+			"column": 22
+		}
+	}
+]
diff --git a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/input.svelte b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/input.svelte
new file mode 100644
index 0000000000..c6df239137
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings-2/input.svelte
@@ -0,0 +1,11 @@
+<script>
+	let { foo } = $props();
+</script>
+
+<!-- ok -->
+<button onclick={foo}>click me</button>
+<Button on:click={foo}>click me</Button>
+<Button on:click={foo}>click me</Button>
+
+<!-- error -->
+<button on:click={foo}>click me</button>
diff --git a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/input.svelte b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/input.svelte
index e1d0afed49..5576328509 100644
--- a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/input.svelte
+++ b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/input.svelte
@@ -3,8 +3,7 @@
 </script>
 
 <!-- ok -->
-<button onclick={foo}>click me</button>
-<Button onclick={foo}>click me</Button>
+<Button on:click={foo}>click me</Button>
 <Button on:click={foo}>click me</Button>
 
 <!-- warn -->
diff --git a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
index b667f2e2dd..90fc8fe6f7 100644
--- a/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
+++ b/packages/svelte/tests/validator/samples/runes-legacy-syntax-warnings/warnings.json
@@ -3,36 +3,36 @@
 		"code": "slot_element_deprecated",
 		"end": {
 			"column": 13,
-			"line": 11
+			"line": 10
 		},
 		"message": "Using `<slot>` to render parent content is deprecated. Use `{@render ...}` tags instead.",
 		"start": {
 			"column": 0,
-			"line": 11
+			"line": 10
 		}
 	},
 	{
 		"code": "slot_element_deprecated",
 		"end": {
 			"column": 24,
-			"line": 12
+			"line": 11
 		},
 		"message": "Using `<slot>` to render parent content is deprecated. Use `{@render ...}` tags instead.",
 		"start": {
 			"column": 0,
-			"line": 12
+			"line": 11
 		}
 	},
 	{
 		"code": "event_directive_deprecated",
 		"end": {
 			"column": 22,
-			"line": 13
+			"line": 12
 		},
 		"message": "Using `on:click` to listen to the click event is deprecated. Use the event attribute `onclick` instead.",
 		"start": {
 			"column": 8,
-			"line": 13
+			"line": 12
 		}
 	}
 ]