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 1/4] 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 2/4] 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 3/4] 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 4/4] 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;