From 777bc3efc3061de8a10005182f15f4f693626219 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 12 Apr 2024 17:50:31 -0400
Subject: [PATCH 1/3] add `npx svelte-migrate self-closing-tag`

---
 .changeset/cyan-snails-unite.md               |   5 +
 .../migrations/self-closing-tags/index.js     |  34 +++++
 .../migrations/self-closing-tags/migrate.js   | 117 ++++++++++++++++++
 .../self-closing-tags/migrate.spec.js         |  22 ++++
 4 files changed, 178 insertions(+)
 create mode 100644 .changeset/cyan-snails-unite.md
 create mode 100644 packages/migrate/migrations/self-closing-tags/index.js
 create mode 100644 packages/migrate/migrations/self-closing-tags/migrate.js
 create mode 100644 packages/migrate/migrations/self-closing-tags/migrate.spec.js

diff --git a/.changeset/cyan-snails-unite.md b/.changeset/cyan-snails-unite.md
new file mode 100644
index 000000000000..7315f82f197b
--- /dev/null
+++ b/.changeset/cyan-snails-unite.md
@@ -0,0 +1,5 @@
+---
+'svelte-migrate': minor
+---
+
+feat: add self-closing-tags migration
diff --git a/packages/migrate/migrations/self-closing-tags/index.js b/packages/migrate/migrations/self-closing-tags/index.js
new file mode 100644
index 000000000000..a129cf8ab59d
--- /dev/null
+++ b/packages/migrate/migrations/self-closing-tags/index.js
@@ -0,0 +1,34 @@
+import colors from 'kleur';
+import fs from 'node:fs';
+import prompts from 'prompts';
+import glob from 'tiny-glob/sync.js';
+import { remove_self_closing_tags } from './migrate.js';
+
+export async function migrate() {
+	console.log(
+		colors.bold().yellow('\nThis will update .svelte files inside the current directory\n')
+	);
+
+	const response = await prompts({
+		type: 'confirm',
+		name: 'value',
+		message: 'Continue?',
+		initial: false
+	});
+
+	if (!response.value) {
+		process.exit(1);
+	}
+
+	const files = glob('**/*.svelte')
+		.map((file) => file.replace(/\\/g, '/'))
+		.filter((file) => !file.includes('/node_modules/'));
+
+	for (const file of files) {
+		const code = remove_self_closing_tags(fs.readFileSync(file, 'utf-8'));
+		fs.writeFileSync(file, code);
+	}
+
+	console.log(colors.bold().green('✔ Your project has been updated'));
+	console.log('  If using Prettier, please upgrade to the latest prettier-plugin-svelte version');
+}
diff --git a/packages/migrate/migrations/self-closing-tags/migrate.js b/packages/migrate/migrations/self-closing-tags/migrate.js
new file mode 100644
index 000000000000..60be9a672f40
--- /dev/null
+++ b/packages/migrate/migrations/self-closing-tags/migrate.js
@@ -0,0 +1,117 @@
+const VoidElements = [
+	'area',
+	'base',
+	'br',
+	'col',
+	'embed',
+	'hr',
+	'img',
+	'input',
+	'keygen',
+	'link',
+	'menuitem',
+	'meta',
+	'param',
+	'source',
+	'track',
+	'wbr'
+];
+
+const SVGElements = [
+	'altGlyph',
+	'altGlyphDef',
+	'altGlyphItem',
+	'animate',
+	'animateColor',
+	'animateMotion',
+	'animateTransform',
+	'circle',
+	'clipPath',
+	'color-profile',
+	'cursor',
+	'defs',
+	'desc',
+	'discard',
+	'ellipse',
+	'feBlend',
+	'feColorMatrix',
+	'feComponentTransfer',
+	'feComposite',
+	'feConvolveMatrix',
+	'feDiffuseLighting',
+	'feDisplacementMap',
+	'feDistantLight',
+	'feDropShadow',
+	'feFlood',
+	'feFuncA',
+	'feFuncB',
+	'feFuncG',
+	'feFuncR',
+	'feGaussianBlur',
+	'feImage',
+	'feMerge',
+	'feMergeNode',
+	'feMorphology',
+	'feOffset',
+	'fePointLight',
+	'feSpecularLighting',
+	'feSpotLight',
+	'feTile',
+	'feTurbulence',
+	'filter',
+	'font',
+	'font-face',
+	'font-face-format',
+	'font-face-name',
+	'font-face-src',
+	'font-face-uri',
+	'foreignObject',
+	'g',
+	'glyph',
+	'glyphRef',
+	'hatch',
+	'hatchpath',
+	'hkern',
+	'image',
+	'line',
+	'linearGradient',
+	'marker',
+	'mask',
+	'mesh',
+	'meshgradient',
+	'meshpatch',
+	'meshrow',
+	'metadata',
+	'missing-glyph',
+	'mpath',
+	'path',
+	'pattern',
+	'polygon',
+	'polyline',
+	'radialGradient',
+	'rect',
+	'set',
+	'solidcolor',
+	'stop',
+	'svg',
+	'switch',
+	'symbol',
+	'text',
+	'textPath',
+	'tref',
+	'tspan',
+	'unknown',
+	'use',
+	'view',
+	'vkern'
+];
+
+/**
+ * @param {string} code
+ */
+export function remove_self_closing_tags(code) {
+	return code.replace(/<([a-z-]+)(\s[^>]+?)? ?\/>/g, (match, name, attributes = '') => {
+		if (VoidElements.includes(name) || SVGElements.includes(name)) return match;
+		return `<${name}${attributes}></${name}>`;
+	});
+}
diff --git a/packages/migrate/migrations/self-closing-tags/migrate.spec.js b/packages/migrate/migrations/self-closing-tags/migrate.spec.js
new file mode 100644
index 000000000000..c85e20c371ac
--- /dev/null
+++ b/packages/migrate/migrations/self-closing-tags/migrate.spec.js
@@ -0,0 +1,22 @@
+import { assert, test } from 'vitest';
+import { remove_self_closing_tags } from './migrate.js';
+
+/** @type {Record<string, string>} */
+const tests = {
+	'<div/>': '<div></div>',
+	'<div />': '<div></div>',
+	'<div class="foo"/>': '<div class="foo"></div>',
+	'<div class="foo" />': '<div class="foo"></div>',
+	'\t<div\n\t\tonclick={blah}\n\t/>': '\t<div\n\t\tonclick={blah}\n\t></div>',
+	'<foo-bar/>': '<foo-bar></foo-bar>',
+	'<link/>': '<link/>',
+	'<link />': '<link />',
+	'<svg><g /></svg>': '<svg><g /></svg>'
+};
+
+for (const input in tests) {
+	test(input, () => {
+		const output = tests[input];
+		assert.equal(remove_self_closing_tags(input), output);
+	});
+}

From 4bd3a2da60c5a225017b591d5c8bf5fbdcc62395 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 12 Apr 2024 17:55:15 -0400
Subject: [PATCH 2/3] bump prettier-plugin-svelte

---
 packages/create-svelte/package.json                  |  2 +-
 packages/create-svelte/shared/+prettier/package.json |  2 +-
 pnpm-lock.yaml                                       | 12 ++++++------
 sites/kit.svelte.dev/package.json                    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
index 94a07347f49f..b91f56328240 100644
--- a/packages/create-svelte/package.json
+++ b/packages/create-svelte/package.json
@@ -20,7 +20,7 @@
 		"@types/gitignore-parser": "^0.0.3",
 		"gitignore-parser": "^0.0.2",
 		"prettier": "^3.1.1",
-		"prettier-plugin-svelte": "^3.1.2",
+		"prettier-plugin-svelte": "^3.2.3",
 		"sucrase": "^3.34.0",
 		"svelte": "^4.2.10",
 		"tiny-glob": "^0.2.9",
diff --git a/packages/create-svelte/shared/+prettier/package.json b/packages/create-svelte/shared/+prettier/package.json
index e772fe047ced..7d2f27d4a660 100644
--- a/packages/create-svelte/shared/+prettier/package.json
+++ b/packages/create-svelte/shared/+prettier/package.json
@@ -1,6 +1,6 @@
 {
 	"devDependencies": {
 		"prettier": "^3.1.1",
-		"prettier-plugin-svelte": "^3.1.2"
+		"prettier-plugin-svelte": "^3.2.3"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 988c6f20c559..0e02f8861eb5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -319,8 +319,8 @@ importers:
         specifier: ^3.1.1
         version: 3.2.5
       prettier-plugin-svelte:
-        specifier: ^3.1.2
-        version: 3.1.2(prettier@3.2.5)(svelte@4.2.10)
+        specifier: ^3.2.3
+        version: 3.2.3(prettier@3.2.5)(svelte@4.2.10)
       sucrase:
         specifier: ^3.34.0
         version: 3.35.0
@@ -1258,8 +1258,8 @@ importers:
         specifier: ^3.1.1
         version: 3.2.5
       prettier-plugin-svelte:
-        specifier: ^3.1.2
-        version: 3.1.2(prettier@3.2.5)(svelte@4.2.10)
+        specifier: ^3.2.3
+        version: 3.2.3(prettier@3.2.5)(svelte@4.2.10)
       prism-svelte:
         specifier: ^0.5.0
         version: 0.5.0
@@ -5846,8 +5846,8 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /prettier-plugin-svelte@3.1.2(prettier@3.2.5)(svelte@4.2.10):
-    resolution: {integrity: sha512-7xfMZtwgAWHMT0iZc8jN4o65zgbAQ3+O32V6W7pXrqNvKnHnkoyQCGCbKeUyXKZLbYE0YhFRnamfxfkEGxm8qA==}
+  /prettier-plugin-svelte@3.2.3(prettier@3.2.5)(svelte@4.2.10):
+    resolution: {integrity: sha512-wJq8RunyFlWco6U0WJV5wNCM7zpBFakS76UBSbmzMGpncpK98NZABaE+s7n8/APDCEVNHXC5Mpq+MLebQtsRlg==}
     peerDependencies:
       prettier: ^3.0.0
       svelte: ^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index a111a4b8e2e6..4d531bbe2ba3 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -26,7 +26,7 @@
 		"lightningcss": "^1.22.1",
 		"marked": "^12.0.0",
 		"prettier": "^3.1.1",
-		"prettier-plugin-svelte": "^3.1.2",
+		"prettier-plugin-svelte": "^3.2.3",
 		"prism-svelte": "^0.5.0",
 		"prismjs": "^1.29.0",
 		"shiki-twoslash": "^3.1.2",

From db6b295c3022ec1878368075a0e87e6faaa482fa Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 12 Apr 2024 17:56:17 -0400
Subject: [PATCH 3/3] run migration

---
 .../test/apps/prerendered/src/routes/+layout.svelte             | 2 +-
 packages/adapter-static/test/apps/spa/src/routes/+layout.svelte | 2 +-
 .../create-svelte/templates/default/src/routes/+layout.svelte   | 2 +-
 .../templates/default/src/routes/sverdle/+page.svelte           | 2 +-
 packages/kit/src/runtime/components/layout.svelte               | 2 +-
 packages/kit/test/apps/amp/src/routes/+layout.svelte            | 2 +-
 packages/kit/test/apps/basics/src/routes/+layout.svelte         | 2 +-
 .../test/apps/basics/src/routes/accessibility/+layout.svelte    | 2 +-
 .../basics/src/routes/accessibility/autofocus/+layout.svelte    | 2 +-
 .../anchor-with-manual-scroll/anchor-afternavigate/+page.svelte | 2 +-
 .../anchor-with-manual-scroll/anchor-onmount/+page.svelte       | 2 +-
 .../apps/basics/src/routes/cookies/set-in-layout/+layout.svelte | 2 +-
 .../apps/basics/src/routes/data-sveltekit/noscroll/+page.svelte | 2 +-
 .../src/routes/data-sveltekit/noscroll/target/+page.svelte      | 2 +-
 .../basics/src/routes/encoded/escape-sequences/+layout.svelte   | 2 +-
 packages/kit/test/apps/basics/src/routes/errors/+layout.svelte  | 2 +-
 .../apps/basics/src/routes/headers/set-cookie/+layout.svelte    | 2 +-
 .../apps/basics/src/routes/iframes/nested/parent/+page.svelte   | 2 +-
 .../apps/basics/src/routes/load/change-detection/+layout.svelte | 2 +-
 .../src/routes/load/invalidation/forced-goto/+layout.svelte     | 2 +-
 .../basics/src/routes/load/invalidation/forced/+layout.svelte   | 2 +-
 .../basics/src/routes/load/invalidation/multiple/+layout.svelte | 2 +-
 .../basics/src/routes/load/invalidation/params/+layout.svelte   | 2 +-
 .../src/routes/load/invalidation/route/server/+layout.svelte    | 2 +-
 .../src/routes/load/invalidation/route/shared/+layout.svelte    | 2 +-
 .../apps/basics/src/routes/load/no-server-load/+layout.svelte   | 2 +-
 .../apps/basics/src/routes/load/parent/server/+layout.svelte    | 2 +-
 .../basics/src/routes/load/parent/server/[x]/+layout.svelte     | 2 +-
 .../basics/src/routes/load/parent/server/[x]/[y]/+layout.svelte | 2 +-
 .../apps/basics/src/routes/load/parent/shared/+layout.svelte    | 2 +-
 .../basics/src/routes/load/parent/shared/[x]/+layout.svelte     | 2 +-
 .../basics/src/routes/load/parent/shared/[x]/[y]/+layout.svelte | 2 +-
 .../load/server-data-reuse/with-changing-parent/+layout.svelte  | 2 +-
 .../apps/basics/src/routes/load/unchanged-parent/+layout.svelte | 2 +-
 .../test/apps/basics/src/routes/load/unchanged/+layout.svelte   | 2 +-
 .../test/apps/basics/src/routes/nested-layout/+layout.svelte    | 2 +-
 .../apps/basics/src/routes/nested-layout/foo/+layout.svelte     | 2 +-
 .../apps/basics/src/routes/nested-layout/foo/bar/+layout.svelte | 2 +-
 .../apps/basics/src/routes/nested-layout/reset/+layout@.svelte  | 2 +-
 packages/kit/test/apps/basics/src/routes/no-ssr/+layout.svelte  | 2 +-
 .../kit/test/apps/basics/src/routes/no-ssr/margin/+page.svelte  | 2 +-
 .../src/routes/no-ssr/ssr-page-config/layout/+layout.svelte     | 2 +-
 .../test/apps/basics/src/routes/prerendering/env/+layout.svelte | 2 +-
 packages/kit/test/apps/basics/src/routes/routing/+page.svelte   | 2 +-
 .../apps/basics/src/routes/routing/cancellation/+layout.svelte  | 2 +-
 .../test/apps/basics/src/routes/routing/matched/+layout.svelte  | 2 +-
 .../basics/src/routes/routing/rest/non-greedy/+layout.svelte    | 2 +-
 .../apps/basics/src/routes/routing/rest/path/+layout.svelte     | 2 +-
 .../src/routes/routing/trailing-slash-server/+layout.svelte     | 2 +-
 .../basics/src/routes/routing/trailing-slash/+layout.svelte     | 2 +-
 .../apps/basics/src/routes/scroll/cross-document/a/+page.svelte | 2 +-
 .../kit/test/apps/basics/src/routes/selection/+layout.svelte    | 2 +-
 .../test/apps/basics/src/routes/shadowed/parent/+layout.svelte  | 2 +-
 .../basics/src/routes/shallow-routing/push-state/+layout.svelte | 2 +-
 .../src/routes/shallow-routing/replace-state/+layout.svelte     | 2 +-
 .../kit/test/apps/basics/src/routes/snapshot/+layout.svelte     | 2 +-
 .../kit/test/apps/basics/src/routes/store/data/+layout.svelte   | 2 +-
 .../basics/src/routes/store/data/store-update/+layout.svelte    | 2 +-
 .../test/apps/basics/src/routes/store/navigating/+layout.svelte | 2 +-
 packages/kit/test/apps/dev-only/src/routes/+layout.svelte       | 2 +-
 packages/kit/test/apps/embed/src/routes/+layout.svelte          | 2 +-
 packages/kit/test/apps/no-ssr/src/routes/+layout.svelte         | 2 +-
 packages/kit/test/apps/options-2/src/routes/+layout.svelte      | 2 +-
 packages/kit/test/apps/options/source/pages/+layout.svelte      | 2 +-
 .../apps/options/source/pages/custom-extensions/+layout.svelte  | 2 +-
 packages/kit/test/apps/writes/src/routes/+layout.svelte         | 2 +-
 packages/kit/test/prerendering/basics/src/routes/+layout.svelte | 2 +-
 .../basics/src/routes/trailing-slash/+layout.svelte             | 2 +-
 .../kit/test/prerendering/options/src/routes/+layout.svelte     | 2 +-
 .../kit/test/prerendering/paths-base/src/routes/+layout.svelte  | 2 +-
 .../package/test/fixtures/emitTypes-false/expected/Test.svelte  | 2 +-
 .../package/test/fixtures/emitTypes-false/src/lib/Test.svelte   | 2 +-
 packages/package/test/fixtures/javascript/expected/Test.svelte  | 2 +-
 packages/package/test/fixtures/javascript/src/lib/Test.svelte   | 2 +-
 .../package/test/fixtures/svelte-3-types/expected/Test.svelte   | 2 +-
 .../package/test/fixtures/svelte-3-types/src/lib/Test.svelte    | 2 +-
 packages/package/test/fixtures/svelte-kit/expected/Test.svelte  | 2 +-
 .../package/test/fixtures/svelte-kit/src/kitlib/Test.svelte     | 2 +-
 .../test/fixtures/typescript-esnext/expected/Test.svelte        | 2 +-
 .../package/test/fixtures/typescript-esnext/src/lib/Test.svelte | 2 +-
 .../test/fixtures/typescript-nodenext/expected/Test.svelte      | 2 +-
 .../test/fixtures/typescript-nodenext/src/lib/Test.svelte       | 2 +-
 sites/kit.svelte.dev/src/routes/+layout.svelte                  | 2 +-
 sites/kit.svelte.dev/src/routes/docs/+layout.svelte             | 2 +-
 sites/kit.svelte.dev/src/routes/home/Video.svelte               | 2 +-
 85 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/packages/adapter-static/test/apps/prerendered/src/routes/+layout.svelte b/packages/adapter-static/test/apps/prerendered/src/routes/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/adapter-static/test/apps/prerendered/src/routes/+layout.svelte
+++ b/packages/adapter-static/test/apps/prerendered/src/routes/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/adapter-static/test/apps/spa/src/routes/+layout.svelte b/packages/adapter-static/test/apps/spa/src/routes/+layout.svelte
index 439e52c54c97..23e8bfb4e719 100644
--- a/packages/adapter-static/test/apps/spa/src/routes/+layout.svelte
+++ b/packages/adapter-static/test/apps/spa/src/routes/+layout.svelte
@@ -3,4 +3,4 @@
 	<a href="/about">about</a>
 </nav>
 
-<slot />
+<slot></slot>
diff --git a/packages/create-svelte/templates/default/src/routes/+layout.svelte b/packages/create-svelte/templates/default/src/routes/+layout.svelte
index 9c7445f55ec8..8bb03b6b4aec 100644
--- a/packages/create-svelte/templates/default/src/routes/+layout.svelte
+++ b/packages/create-svelte/templates/default/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
 	<Header />
 
 	<main>
-		<slot />
+		<slot></slot>
 	</main>
 
 	<footer>
diff --git a/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte b/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte
index 68ab6400de82..42d987106d37 100644
--- a/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte
+++ b/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte
@@ -200,7 +200,7 @@
 			stageHeight: window.innerHeight,
 			colors: ['#ff3e00', '#40b3ff', '#676778']
 		}}
-	/>
+	></div>
 {/if}
 
 <style>
diff --git a/packages/kit/src/runtime/components/layout.svelte b/packages/kit/src/runtime/components/layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/src/runtime/components/layout.svelte
+++ b/packages/kit/src/runtime/components/layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/amp/src/routes/+layout.svelte b/packages/kit/test/apps/amp/src/routes/+layout.svelte
index 3d931ed395d6..f7c91b7e246a 100644
--- a/packages/kit/test/apps/amp/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/amp/src/routes/+layout.svelte
@@ -1,4 +1,4 @@
-<slot />
+<slot></slot>
 <footer>footer</footer>
 
 <style>
diff --git a/packages/kit/test/apps/basics/src/routes/+layout.svelte b/packages/kit/test/apps/basics/src/routes/+layout.svelte
index 6272671c81ae..3a614dba8d57 100644
--- a/packages/kit/test/apps/basics/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
 	setup();
 </script>
 
-<slot />
+<slot></slot>
 
 <footer>{data.foo.bar}</footer>
 
diff --git a/packages/kit/test/apps/basics/src/routes/accessibility/+layout.svelte b/packages/kit/test/apps/basics/src/routes/accessibility/+layout.svelte
index af1a961365f4..7858f1c8d1e3 100644
--- a/packages/kit/test/apps/basics/src/routes/accessibility/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/accessibility/+layout.svelte
@@ -7,4 +7,4 @@
 	<a href="/accessibility/autofocus/b">autofocus/b</a>
 </nav>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/accessibility/autofocus/+layout.svelte b/packages/kit/test/apps/basics/src/routes/accessibility/autofocus/+layout.svelte
index 3945963313dd..ef211344a0a7 100644
--- a/packages/kit/test/apps/basics/src/routes/accessibility/autofocus/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/accessibility/autofocus/+layout.svelte
@@ -1,4 +1,4 @@
-<slot />
+<slot></slot>
 
 <!-- svelte-ignore a11y-autofocus -->
 <input autofocus />
diff --git a/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-afternavigate/+page.svelte b/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-afternavigate/+page.svelte
index 7ea7c31a836a..7f0601b547b1 100644
--- a/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-afternavigate/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-afternavigate/+page.svelte
@@ -12,6 +12,6 @@
 	<p id="go-to-element">The browser scrolls to me</p>
 </div>
 <p id="abcde" style="height: 180vh; background-color: hotpink;">I take precedence</p>
-<div />
+<div></div>
 
 <a href="/anchor-with-manual-scroll/anchor-afternavigate?x=y#go-to-element">reload me</a>
diff --git a/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-onmount/+page.svelte b/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-onmount/+page.svelte
index be660c5859b2..99386edf895b 100644
--- a/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-onmount/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/anchor-with-manual-scroll/anchor-onmount/+page.svelte
@@ -13,4 +13,4 @@
 	<p id="go-to-element">The browser scrolls to me</p>
 </div>
 <p id="abcde" style="height: 180vh; background-color: hotpink;">I take precedence</p>
-<div />
+<div></div>
diff --git a/packages/kit/test/apps/basics/src/routes/cookies/set-in-layout/+layout.svelte b/packages/kit/test/apps/basics/src/routes/cookies/set-in-layout/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/cookies/set-in-layout/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/cookies/set-in-layout/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/+page.svelte b/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/+page.svelte
index e9ad0b2d6b0d..55e457aebfdf 100644
--- a/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/+page.svelte
@@ -1,4 +1,4 @@
-<div style="height: 2000px; background: palegoldenrod" />
+<div style="height: 2000px; background: palegoldenrod"></div>
 
 <a id="one" href="/data-sveltekit/noscroll/target" data-sveltekit-noscroll>one</a>
 
diff --git a/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/target/+page.svelte b/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/target/+page.svelte
index a0c3426c8a59..4089ce715737 100644
--- a/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/target/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/data-sveltekit/noscroll/target/+page.svelte
@@ -1,3 +1,3 @@
-<div style="height: 2000px; background: palegoldenrod" />
+<div style="height: 2000px; background: palegoldenrod"></div>
 
 <h1>target</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/encoded/escape-sequences/+layout.svelte b/packages/kit/test/apps/basics/src/routes/encoded/escape-sequences/+layout.svelte
index 47f4385e87b1..17bd82efe1fd 100644
--- a/packages/kit/test/apps/basics/src/routes/encoded/escape-sequences/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/encoded/escape-sequences/+layout.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <h1>{decodeURIComponent($page.url.pathname.split('/').pop())}</h1>
-<slot />
+<slot></slot>
 
 <a href="/encoded/escape-sequences/:-)">:-)</a>
 <a href="/encoded/escape-sequences/%23">#</a>
diff --git a/packages/kit/test/apps/basics/src/routes/errors/+layout.svelte b/packages/kit/test/apps/basics/src/routes/errors/+layout.svelte
index 0edcae4bf71e..a278dd09dd18 100644
--- a/packages/kit/test/apps/basics/src/routes/errors/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/errors/+layout.svelte
@@ -1 +1 @@
-<slot />;
+<slot></slot>;
diff --git a/packages/kit/test/apps/basics/src/routes/headers/set-cookie/+layout.svelte b/packages/kit/test/apps/basics/src/routes/headers/set-cookie/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/headers/set-cookie/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/headers/set-cookie/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/iframes/nested/parent/+page.svelte b/packages/kit/test/apps/basics/src/routes/iframes/nested/parent/+page.svelte
index 90cc91d81d6c..bc6abe33cf83 100644
--- a/packages/kit/test/apps/basics/src/routes/iframes/nested/parent/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/iframes/nested/parent/+page.svelte
@@ -1 +1 @@
-<iframe title="Child content" src="./child" />
+<iframe title="Child content" src="./child"></iframe>
diff --git a/packages/kit/test/apps/basics/src/routes/load/change-detection/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/change-detection/+layout.svelte
index 8ba1567c45c9..c415dccc192f 100644
--- a/packages/kit/test/apps/basics/src/routes/load/change-detection/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/change-detection/+layout.svelte
@@ -4,4 +4,4 @@
 </script>
 
 <h1>{data.type} loads: {data.loads}</h1>
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/invalidation/forced-goto/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/invalidation/forced-goto/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/invalidation/forced-goto/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/invalidation/forced-goto/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/invalidation/forced/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/invalidation/forced/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/invalidation/forced/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/invalidation/forced/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/invalidation/multiple/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/invalidation/multiple/+layout.svelte
index f9cc3bd4be3f..b0ec12c23e1a 100644
--- a/packages/kit/test/apps/basics/src/routes/load/invalidation/multiple/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/invalidation/multiple/+layout.svelte
@@ -26,4 +26,4 @@
 
 <p>layout: {$page.data.count_layout}, page: {$page.data.count_page}</p>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/invalidation/params/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/invalidation/params/+layout.svelte
index 9b3472274380..f133555b49f8 100644
--- a/packages/kit/test/apps/basics/src/routes/load/invalidation/params/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/invalidation/params/+layout.svelte
@@ -3,7 +3,7 @@
 	export let data;
 </script>
 
-<slot />
+<slot></slot>
 
 <pre>{JSON.stringify({
 		a: data.a,
diff --git a/packages/kit/test/apps/basics/src/routes/load/invalidation/route/server/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/invalidation/route/server/+layout.svelte
index 928ce8bdd81d..0cc8a0341bdf 100644
--- a/packages/kit/test/apps/basics/src/routes/load/invalidation/route/server/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/invalidation/route/server/+layout.svelte
@@ -4,7 +4,7 @@
 </script>
 
 <h1>route.id: {data.route.id}</h1>
-<slot />
+<slot></slot>
 
 <a href="/load/invalidation/route/server/a">/load/invalidation/route/server/a</a>
 <a href="/load/invalidation/route/server/b">/load/invalidation/route/server/b</a>
diff --git a/packages/kit/test/apps/basics/src/routes/load/invalidation/route/shared/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/invalidation/route/shared/+layout.svelte
index cc42a422028e..a666d93e1198 100644
--- a/packages/kit/test/apps/basics/src/routes/load/invalidation/route/shared/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/invalidation/route/shared/+layout.svelte
@@ -5,7 +5,7 @@
 
 <h1>route.id: {data.route.id}</h1>
 <h2>random id: {data.random}</h2>
-<slot />
+<slot></slot>
 
 <a href="/load/invalidation/route/shared/a">/load/invalidation/route/shared/a</a>
 <a href="/load/invalidation/route/shared/b">/load/invalidation/route/shared/b</a>
diff --git a/packages/kit/test/apps/basics/src/routes/load/no-server-load/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/no-server-load/+layout.svelte
index c551b102286f..39f1bc37ab55 100644
--- a/packages/kit/test/apps/basics/src/routes/load/no-server-load/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/no-server-load/+layout.svelte
@@ -1,4 +1,4 @@
 <a href="/load/no-server-load/a">a</a>
 <a href="/load/no-server-load/b">b</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/parent/server/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/parent/server/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/parent/server/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/parent/server/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/[y]/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/[y]/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/[y]/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/parent/server/[x]/[y]/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/parent/shared/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/parent/shared/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/parent/shared/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/parent/shared/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/[y]/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/[y]/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/[y]/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/parent/shared/[x]/[y]/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/server-data-reuse/with-changing-parent/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/server-data-reuse/with-changing-parent/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/load/server-data-reuse/with-changing-parent/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/server-data-reuse/with-changing-parent/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/load/unchanged-parent/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/unchanged-parent/+layout.svelte
index fff80915ef60..ef55ca8c1ec2 100644
--- a/packages/kit/test/apps/basics/src/routes/load/unchanged-parent/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/unchanged-parent/+layout.svelte
@@ -1,5 +1,5 @@
 <!-- TODO remove this file post-https://github.com/sveltejs/kit/issues/5967 -->
-<slot />
+<slot></slot>
 
 <ul>
 	<li><a href="/load/unchanged-parent/isolated/a">/load/unchanged-parent/isolated/a</a></li>
diff --git a/packages/kit/test/apps/basics/src/routes/load/unchanged/+layout.svelte b/packages/kit/test/apps/basics/src/routes/load/unchanged/+layout.svelte
index 5a9f45ce3ac4..482eea115407 100644
--- a/packages/kit/test/apps/basics/src/routes/load/unchanged/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/unchanged/+layout.svelte
@@ -1,5 +1,5 @@
 <!-- TODO remove this file post-https://github.com/sveltejs/kit/issues/5967 -->
-<slot />
+<slot></slot>
 
 <ul>
 	<li><a href="/load/unchanged/isolated/a">/load/unchanged/isolated/a</a></li>
diff --git a/packages/kit/test/apps/basics/src/routes/nested-layout/+layout.svelte b/packages/kit/test/apps/basics/src/routes/nested-layout/+layout.svelte
index a32fdaf35dfa..fa9967201073 100644
--- a/packages/kit/test/apps/basics/src/routes/nested-layout/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/nested-layout/+layout.svelte
@@ -1,2 +1,2 @@
-<slot />
+<slot></slot>
 <p id="nested">This is a nested layout component</p>
diff --git a/packages/kit/test/apps/basics/src/routes/nested-layout/foo/+layout.svelte b/packages/kit/test/apps/basics/src/routes/nested-layout/foo/+layout.svelte
index 0a6727ef00fc..badf55425927 100644
--- a/packages/kit/test/apps/basics/src/routes/nested-layout/foo/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/nested-layout/foo/+layout.svelte
@@ -1,2 +1,2 @@
-<slot />
+<slot></slot>
 <p id="nested-foo">Nested layout foo</p>
diff --git a/packages/kit/test/apps/basics/src/routes/nested-layout/foo/bar/+layout.svelte b/packages/kit/test/apps/basics/src/routes/nested-layout/foo/bar/+layout.svelte
index bfc006f15362..30358a5ba292 100644
--- a/packages/kit/test/apps/basics/src/routes/nested-layout/foo/bar/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/nested-layout/foo/bar/+layout.svelte
@@ -1,2 +1,2 @@
-<slot />
+<slot></slot>
 <p id="nested-bar">Nested layout bar</p>
diff --git a/packages/kit/test/apps/basics/src/routes/nested-layout/reset/+layout@.svelte b/packages/kit/test/apps/basics/src/routes/nested-layout/reset/+layout@.svelte
index 9b905e83425a..aaac2e0c9709 100644
--- a/packages/kit/test/apps/basics/src/routes/nested-layout/reset/+layout@.svelte
+++ b/packages/kit/test/apps/basics/src/routes/nested-layout/reset/+layout@.svelte
@@ -1,2 +1,2 @@
 <h1>Layout reset</h1>
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/no-ssr/+layout.svelte b/packages/kit/test/apps/basics/src/routes/no-ssr/+layout.svelte
index 0edcae4bf71e..a278dd09dd18 100644
--- a/packages/kit/test/apps/basics/src/routes/no-ssr/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/no-ssr/+layout.svelte
@@ -1 +1 @@
-<slot />;
+<slot></slot>;
diff --git a/packages/kit/test/apps/basics/src/routes/no-ssr/margin/+page.svelte b/packages/kit/test/apps/basics/src/routes/no-ssr/margin/+page.svelte
index 982a04c9defb..cc72f72fbda4 100644
--- a/packages/kit/test/apps/basics/src/routes/no-ssr/margin/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/no-ssr/margin/+page.svelte
@@ -1,6 +1,6 @@
 <div class="container">
 	<span> ^this is not the top of the screen</span>
-	<div class="spacer" />
+	<div class="spacer"></div>
 </div>
 
 <style>
diff --git a/packages/kit/test/apps/basics/src/routes/no-ssr/ssr-page-config/layout/+layout.svelte b/packages/kit/test/apps/basics/src/routes/no-ssr/ssr-page-config/layout/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/apps/basics/src/routes/no-ssr/ssr-page-config/layout/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/no-ssr/ssr-page-config/layout/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/prerendering/env/+layout.svelte b/packages/kit/test/apps/basics/src/routes/prerendering/env/+layout.svelte
index 9fd745e3ba79..34b50e279dc1 100644
--- a/packages/kit/test/apps/basics/src/routes/prerendering/env/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/prerendering/env/+layout.svelte
@@ -1,4 +1,4 @@
 <a href="/prerendering/env/prerendered">prerendered</a>
 <a href="/prerendering/env/dynamic">dynamic</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/+page.svelte b/packages/kit/test/apps/basics/src/routes/routing/+page.svelte
index 1d300bf63df1..ed56fb4855eb 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/+page.svelte
@@ -12,4 +12,4 @@
 
 <a href="/routing/b" data-sveltekit-reload>b</a>
 
-<div class="hydrate-test" />
+<div class="hydrate-test"></div>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/cancellation/+layout.svelte b/packages/kit/test/apps/basics/src/routes/routing/cancellation/+layout.svelte
index 5de33b7bffc4..7a04256ede3d 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/cancellation/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/cancellation/+layout.svelte
@@ -1,4 +1,4 @@
-<slot />
+<slot></slot>
 
 <a href="/routing/cancellation/a">a</a>
 <a href="/routing/cancellation/b">b</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/matched/+layout.svelte b/packages/kit/test/apps/basics/src/routes/routing/matched/+layout.svelte
index a1283be99692..4c84d90ca97c 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/matched/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/matched/+layout.svelte
@@ -3,4 +3,4 @@
 <a href="/routing/matched/1">/routing/matched/1</a>
 <a href="/routing/matched/everything-else">/routing/matched/everything-else</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/+layout.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/+layout.svelte
index 1cfb53f35bbb..1599a5b49a94 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/+layout.svelte
@@ -1,6 +1,6 @@
 <h1>non-greedy</h1>
 
-<slot />
+<slot></slot>
 
 <a href="/routing/rest/non-greedy/foo/one/two">foo/one/two</a>
 <a href="/routing/rest/non-greedy/food/one/two">food/one/two</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/path/+layout.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/path/+layout.svelte
index 4b33b116570c..d27665ca2d00 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/path/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/path/+layout.svelte
@@ -4,4 +4,4 @@
 <a href="/routing/rest/path/four">four</a>
 <a href="/routing/rest/path/five">five</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/trailing-slash-server/+layout.svelte b/packages/kit/test/apps/basics/src/routes/routing/trailing-slash-server/+layout.svelte
index 332e638ff7f0..06f8d6e9eac9 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/trailing-slash-server/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/trailing-slash-server/+layout.svelte
@@ -14,4 +14,4 @@
 <p data-test-id="pathname-store">{$page.url.pathname}</p>
 <p data-test-id="pathname-data">{data.pathname}</p>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/trailing-slash/+layout.svelte b/packages/kit/test/apps/basics/src/routes/routing/trailing-slash/+layout.svelte
index d9e54145e6ff..23de75b2729e 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/trailing-slash/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/trailing-slash/+layout.svelte
@@ -10,4 +10,4 @@
 
 <p>{$page.url.pathname}</p>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/scroll/cross-document/a/+page.svelte b/packages/kit/test/apps/basics/src/routes/scroll/cross-document/a/+page.svelte
index 356bf895e9d4..d7d6ddccf205 100644
--- a/packages/kit/test/apps/basics/src/routes/scroll/cross-document/a/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/scroll/cross-document/a/+page.svelte
@@ -1,5 +1,5 @@
 <h1>a</h1>
 
-<div style="height: 200vh; background: teal" />
+<div style="height: 200vh; background: teal"></div>
 
 <a data-sveltekit-reload href="/scroll/cross-document/b">b</a>
diff --git a/packages/kit/test/apps/basics/src/routes/selection/+layout.svelte b/packages/kit/test/apps/basics/src/routes/selection/+layout.svelte
index f182115ccad7..2c3625591ee7 100644
--- a/packages/kit/test/apps/basics/src/routes/selection/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/selection/+layout.svelte
@@ -1,3 +1,3 @@
 <nav><a href="/selection/a">a</a> <a href="/selection/b">b</a></nav>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/shadowed/parent/+layout.svelte b/packages/kit/test/apps/basics/src/routes/shadowed/parent/+layout.svelte
index 931dbd597f3a..5cd79e82f856 100644
--- a/packages/kit/test/apps/basics/src/routes/shadowed/parent/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/shadowed/parent/+layout.svelte
@@ -6,4 +6,4 @@
 <a href="/shadowed/parent?test">Reload</a>
 <a href="/shadowed/parent/sub">Sub</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/shallow-routing/push-state/+layout.svelte b/packages/kit/test/apps/basics/src/routes/shallow-routing/push-state/+layout.svelte
index 28de28c4ab08..b8546b84fb52 100644
--- a/packages/kit/test/apps/basics/src/routes/shallow-routing/push-state/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/shallow-routing/push-state/+layout.svelte
@@ -2,4 +2,4 @@
 <a href="/shallow-routing/push-state/a">a</a>
 <a href="/shallow-routing/push-state/b">b</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/shallow-routing/replace-state/+layout.svelte b/packages/kit/test/apps/basics/src/routes/shallow-routing/replace-state/+layout.svelte
index 7e6089f7721f..f131b37b8225 100644
--- a/packages/kit/test/apps/basics/src/routes/shallow-routing/replace-state/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/shallow-routing/replace-state/+layout.svelte
@@ -2,4 +2,4 @@
 <a href="/shallow-routing/replace-state/a">a</a>
 <a href="/shallow-routing/replace-state/b">b</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/snapshot/+layout.svelte b/packages/kit/test/apps/basics/src/routes/snapshot/+layout.svelte
index 84cdf156497f..7fa9702e75bf 100644
--- a/packages/kit/test/apps/basics/src/routes/snapshot/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/snapshot/+layout.svelte
@@ -2,4 +2,4 @@
 <a href="/snapshot/b">b</a>
 <a href="/snapshot/c" data-sveltekit-reload>c</a>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte b/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte
index ee85d2efaf6c..3d99455de98f 100644
--- a/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte
@@ -11,4 +11,4 @@
 	<a href="/store/data/zzz">zzz</a> <a href="/store/data/foo">foo</a>
 </nav>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/store/data/store-update/+layout.svelte b/packages/kit/test/apps/basics/src/routes/store/data/store-update/+layout.svelte
index c64728ad22d0..36ec58919fec 100644
--- a/packages/kit/test/apps/basics/src/routes/store/data/store-update/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/data/store-update/+layout.svelte
@@ -12,4 +12,4 @@
 <p>$page.data was updated {count} time(s)</p>
 <a href="/store/data/store-updates/a">a</a>
 <a href="/store/data/store-updates/b">b</a>
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/basics/src/routes/store/navigating/+layout.svelte b/packages/kit/test/apps/basics/src/routes/store/navigating/+layout.svelte
index c15660dbf490..620b5e0a5b18 100644
--- a/packages/kit/test/apps/basics/src/routes/store/navigating/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/navigating/+layout.svelte
@@ -18,4 +18,4 @@
 	{/if}
 </div>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/dev-only/src/routes/+layout.svelte b/packages/kit/test/apps/dev-only/src/routes/+layout.svelte
index 5e1f1fed86c2..89349b3bd9bc 100644
--- a/packages/kit/test/apps/dev-only/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/dev-only/src/routes/+layout.svelte
@@ -4,4 +4,4 @@
 	setup();
 </script>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/embed/src/routes/+layout.svelte b/packages/kit/test/apps/embed/src/routes/+layout.svelte
index 5e1f1fed86c2..89349b3bd9bc 100644
--- a/packages/kit/test/apps/embed/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/embed/src/routes/+layout.svelte
@@ -4,4 +4,4 @@
 	setup();
 </script>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/no-ssr/src/routes/+layout.svelte b/packages/kit/test/apps/no-ssr/src/routes/+layout.svelte
index 5e1f1fed86c2..89349b3bd9bc 100644
--- a/packages/kit/test/apps/no-ssr/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/no-ssr/src/routes/+layout.svelte
@@ -4,4 +4,4 @@
 	setup();
 </script>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/options-2/src/routes/+layout.svelte b/packages/kit/test/apps/options-2/src/routes/+layout.svelte
index 5e1f1fed86c2..89349b3bd9bc 100644
--- a/packages/kit/test/apps/options-2/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/options-2/src/routes/+layout.svelte
@@ -4,4 +4,4 @@
 	setup();
 </script>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/options/source/pages/+layout.svelte b/packages/kit/test/apps/options/source/pages/+layout.svelte
index 5e1f1fed86c2..89349b3bd9bc 100644
--- a/packages/kit/test/apps/options/source/pages/+layout.svelte
+++ b/packages/kit/test/apps/options/source/pages/+layout.svelte
@@ -4,4 +4,4 @@
 	setup();
 </script>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/apps/options/source/pages/custom-extensions/+layout.svelte b/packages/kit/test/apps/options/source/pages/custom-extensions/+layout.svelte
index 839e4e610c88..16570aa79ee9 100644
--- a/packages/kit/test/apps/options/source/pages/custom-extensions/+layout.svelte
+++ b/packages/kit/test/apps/options/source/pages/custom-extensions/+layout.svelte
@@ -6,6 +6,6 @@
 	}
 </script>
 
-<slot />
+<slot></slot>
 
 <footer>Custom layout</footer>
diff --git a/packages/kit/test/apps/writes/src/routes/+layout.svelte b/packages/kit/test/apps/writes/src/routes/+layout.svelte
index 5e1f1fed86c2..89349b3bd9bc 100644
--- a/packages/kit/test/apps/writes/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/writes/src/routes/+layout.svelte
@@ -4,4 +4,4 @@
 	setup();
 </script>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/prerendering/basics/src/routes/+layout.svelte b/packages/kit/test/prerendering/basics/src/routes/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/prerendering/basics/src/routes/+layout.svelte
+++ b/packages/kit/test/prerendering/basics/src/routes/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/prerendering/basics/src/routes/trailing-slash/+layout.svelte b/packages/kit/test/prerendering/basics/src/routes/trailing-slash/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/prerendering/basics/src/routes/trailing-slash/+layout.svelte
+++ b/packages/kit/test/prerendering/basics/src/routes/trailing-slash/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/prerendering/options/src/routes/+layout.svelte b/packages/kit/test/prerendering/options/src/routes/+layout.svelte
index cbf29e45ad4f..889a3e15842b 100644
--- a/packages/kit/test/prerendering/options/src/routes/+layout.svelte
+++ b/packages/kit/test/prerendering/options/src/routes/+layout.svelte
@@ -2,4 +2,4 @@
 	<link rel="alternate" href="/path-base/rss.xml" />
 </svelte:head>
 
-<slot />
+<slot></slot>
diff --git a/packages/kit/test/prerendering/paths-base/src/routes/+layout.svelte b/packages/kit/test/prerendering/paths-base/src/routes/+layout.svelte
index 4fa864ce7aa9..13e0e91ed627 100644
--- a/packages/kit/test/prerendering/paths-base/src/routes/+layout.svelte
+++ b/packages/kit/test/prerendering/paths-base/src/routes/+layout.svelte
@@ -1 +1 @@
-<slot />
+<slot></slot>
diff --git a/packages/package/test/fixtures/emitTypes-false/expected/Test.svelte b/packages/package/test/fixtures/emitTypes-false/expected/Test.svelte
index e60789af6a74..551b94ab6431 100644
--- a/packages/package/test/fixtures/emitTypes-false/expected/Test.svelte
+++ b/packages/package/test/fixtures/emitTypes-false/expected/Test.svelte
@@ -9,4 +9,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/emitTypes-false/src/lib/Test.svelte b/packages/package/test/fixtures/emitTypes-false/src/lib/Test.svelte
index e60789af6a74..551b94ab6431 100644
--- a/packages/package/test/fixtures/emitTypes-false/src/lib/Test.svelte
+++ b/packages/package/test/fixtures/emitTypes-false/src/lib/Test.svelte
@@ -9,4 +9,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/javascript/expected/Test.svelte b/packages/package/test/fixtures/javascript/expected/Test.svelte
index e60789af6a74..551b94ab6431 100644
--- a/packages/package/test/fixtures/javascript/expected/Test.svelte
+++ b/packages/package/test/fixtures/javascript/expected/Test.svelte
@@ -9,4 +9,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/javascript/src/lib/Test.svelte b/packages/package/test/fixtures/javascript/src/lib/Test.svelte
index e60789af6a74..551b94ab6431 100644
--- a/packages/package/test/fixtures/javascript/src/lib/Test.svelte
+++ b/packages/package/test/fixtures/javascript/src/lib/Test.svelte
@@ -9,4 +9,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/svelte-3-types/expected/Test.svelte b/packages/package/test/fixtures/svelte-3-types/expected/Test.svelte
index 661b1b8276b0..1208eb31ba9c 100644
--- a/packages/package/test/fixtures/svelte-3-types/expected/Test.svelte
+++ b/packages/package/test/fixtures/svelte-3-types/expected/Test.svelte
@@ -5,4 +5,4 @@ const dispatch = createEventDispatcher();
 dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/svelte-3-types/src/lib/Test.svelte b/packages/package/test/fixtures/svelte-3-types/src/lib/Test.svelte
index 9ad736f2323d..55ad5979d196 100644
--- a/packages/package/test/fixtures/svelte-3-types/src/lib/Test.svelte
+++ b/packages/package/test/fixtures/svelte-3-types/src/lib/Test.svelte
@@ -6,4 +6,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/svelte-kit/expected/Test.svelte b/packages/package/test/fixtures/svelte-kit/expected/Test.svelte
index e60789af6a74..551b94ab6431 100644
--- a/packages/package/test/fixtures/svelte-kit/expected/Test.svelte
+++ b/packages/package/test/fixtures/svelte-kit/expected/Test.svelte
@@ -9,4 +9,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/svelte-kit/src/kitlib/Test.svelte b/packages/package/test/fixtures/svelte-kit/src/kitlib/Test.svelte
index e60789af6a74..551b94ab6431 100644
--- a/packages/package/test/fixtures/svelte-kit/src/kitlib/Test.svelte
+++ b/packages/package/test/fixtures/svelte-kit/src/kitlib/Test.svelte
@@ -9,4 +9,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/typescript-esnext/expected/Test.svelte b/packages/package/test/fixtures/typescript-esnext/expected/Test.svelte
index 661b1b8276b0..1208eb31ba9c 100644
--- a/packages/package/test/fixtures/typescript-esnext/expected/Test.svelte
+++ b/packages/package/test/fixtures/typescript-esnext/expected/Test.svelte
@@ -5,4 +5,4 @@ const dispatch = createEventDispatcher();
 dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/typescript-esnext/src/lib/Test.svelte b/packages/package/test/fixtures/typescript-esnext/src/lib/Test.svelte
index 9ad736f2323d..55ad5979d196 100644
--- a/packages/package/test/fixtures/typescript-esnext/src/lib/Test.svelte
+++ b/packages/package/test/fixtures/typescript-esnext/src/lib/Test.svelte
@@ -6,4 +6,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/typescript-nodenext/expected/Test.svelte b/packages/package/test/fixtures/typescript-nodenext/expected/Test.svelte
index 661b1b8276b0..1208eb31ba9c 100644
--- a/packages/package/test/fixtures/typescript-nodenext/expected/Test.svelte
+++ b/packages/package/test/fixtures/typescript-nodenext/expected/Test.svelte
@@ -5,4 +5,4 @@ const dispatch = createEventDispatcher();
 dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/packages/package/test/fixtures/typescript-nodenext/src/lib/Test.svelte b/packages/package/test/fixtures/typescript-nodenext/src/lib/Test.svelte
index 9ad736f2323d..55ad5979d196 100644
--- a/packages/package/test/fixtures/typescript-nodenext/src/lib/Test.svelte
+++ b/packages/package/test/fixtures/typescript-nodenext/src/lib/Test.svelte
@@ -6,4 +6,4 @@
 	dispatch('event', true);
 </script>
 
-<slot {astring} />
+<slot {astring}></slot>
diff --git a/sites/kit.svelte.dev/src/routes/+layout.svelte b/sites/kit.svelte.dev/src/routes/+layout.svelte
index bd1c304ee826..966841b4321c 100644
--- a/sites/kit.svelte.dev/src/routes/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/+layout.svelte
@@ -61,7 +61,7 @@
 			</svelte:fragment>
 		</Nav>
 
-		<slot />
+		<slot></slot>
 
 		<Banners slot="banner-bottom" data={data.banner} />
 	</Shell>
diff --git a/sites/kit.svelte.dev/src/routes/docs/+layout.svelte b/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
index d95c0a861249..304859aa52ae 100644
--- a/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
@@ -12,7 +12,7 @@
 		{#if category}
 			<p class="category">{category}</p>
 		{/if}
-		<slot />
+		<slot></slot>
 	</div>
 
 	<div class="toc-container">
diff --git a/sites/kit.svelte.dev/src/routes/home/Video.svelte b/sites/kit.svelte.dev/src/routes/home/Video.svelte
index 6426d2636424..057e118794c5 100644
--- a/sites/kit.svelte.dev/src/routes/home/Video.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Video.svelte
@@ -120,7 +120,7 @@
 	</video>
 
 	{#if d}
-		<div class="progress-bar" style={`width: ${(t / d) * 100}%`} />
+		<div class="progress-bar" style={`width: ${(t / d) * 100}%`}></div>
 	{/if}
 
 	<div class="top-controls">