From 204d405c4d498be39e37f0dc918648fe1778b193 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Fri, 28 Feb 2025 16:44:32 -0700
Subject: [PATCH 1/7] fix: Always include root layout/error nodes in manifest

---
 packages/kit/src/core/generate_manifest/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js
index 5db569b5c8d8..28ed06baf453 100644
--- a/packages/kit/src/core/generate_manifest/index.js
+++ b/packages/kit/src/core/generate_manifest/index.js
@@ -32,7 +32,7 @@ export function generate_manifest({ build_data, prerendered, relative_path, rout
 	 * Else, root layout/error is always included as they are needed for 404 and root errors.
 	 * @type {Set<any>}
 	 */
-	const used_nodes = new Set(routes.length > 0 ? [0, 1] : []);
+	const used_nodes = new Set([0, 1]);
 
 	const server_assets = find_server_assets(build_data, routes);
 

From 4ac136055e878e957096b4c6a78045a292fd3933 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Mon, 3 Mar 2025 21:29:14 -0700
Subject: [PATCH 2/7] tests

---
 package.json                                  |   5 ++--
 .../prerendered-app-error-pages/.gitignore    |   3 ++
 .../prerendered-app-error-pages/README.md     |   1 +
 .../prerendered-app-error-pages/jsconfig.json |  19 ++++++++++++
 .../prerendered-app-error-pages/package.json  |  27 ++++++++++++++++++
 .../playwright.config.js                      |   1 +
 .../prerendered-app-error-pages/src/app.d.ts  |  13 +++++++++
 .../prerendered-app-error-pages/src/app.html  |  12 ++++++++
 .../src/routes/+error.svelte                  |   1 +
 .../src/routes/+layout.ts                     |   1 +
 .../src/routes/+page.svelte                   |   4 +++
 .../src/routes/thrown-error/+page.js          |   5 ++++
 .../static/favicon.png                        | Bin 0 -> 1571 bytes
 .../svelte.config.js                          |  13 +++++++++
 .../prerendered-app-error-pages/test/test.js  |  14 +++++++++
 .../vite.config.js                            |  12 ++++++++
 pnpm-lock.yaml                                |  27 ++++++++++++++++++
 17 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/.gitignore
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/README.md
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/jsconfig.json
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/package.json
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/playwright.config.js
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/src/app.d.ts
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/src/app.html
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/src/routes/+error.svelte
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/src/routes/+layout.ts
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/src/routes/+page.svelte
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/static/favicon.png
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/test/test.js
 create mode 100644 packages/kit/test/apps/prerendered-app-error-pages/vite.config.js

diff --git a/package.json b/package.json
index ca29cdf8c5a1..e83a46934587 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
 	"pnpm": {
 		"onlyBuiltDependencies": [
 			"svelte-preprocess",
-			"workerd"
+			"workerd",
+			"esbuild"
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/.gitignore b/packages/kit/test/apps/prerendered-app-error-pages/.gitignore
new file mode 100644
index 000000000000..fad4d3e1518d
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/.gitignore
@@ -0,0 +1,3 @@
+/test/errors.json
+!/.env
+/src/routes/routing/symlink-from
\ No newline at end of file
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/README.md b/packages/kit/test/apps/prerendered-app-error-pages/README.md
new file mode 100644
index 000000000000..412cb451affc
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/README.md
@@ -0,0 +1 @@
+Please do not edit this app unless you're absolutely sure it's not going to affect the tests.
\ No newline at end of file
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/jsconfig.json b/packages/kit/test/apps/prerendered-app-error-pages/jsconfig.json
new file mode 100644
index 000000000000..0b2d8865f4ef
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/jsconfig.json
@@ -0,0 +1,19 @@
+{
+	"extends": "./.svelte-kit/tsconfig.json",
+	"compilerOptions": {
+		"allowJs": true,
+		"checkJs": true,
+		"esModuleInterop": true,
+		"forceConsistentCasingInFileNames": true,
+		"resolveJsonModule": true,
+		"skipLibCheck": true,
+		"sourceMap": true,
+		"strict": true,
+		"moduleResolution": "bundler"
+	}
+	// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
+	// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
+	//
+	// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
+	// from the referenced tsconfig.json - TypeScript does not merge them in
+}
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/package.json b/packages/kit/test/apps/prerendered-app-error-pages/package.json
new file mode 100644
index 000000000000..2618c7ecc74a
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/package.json
@@ -0,0 +1,27 @@
+{
+	"name": "test-prerendered-app-error-pages",
+	"private": true,
+	"version": "0.0.1",
+	"type": "module",
+	"scripts": {
+		"dev": "vite dev",
+		"build": "vite build",
+		"preview": "vite preview",
+		"prepare": "svelte-kit sync || echo ''",
+		"check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json",
+		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch",
+		"test": "pnpm test:dev && pnpm test:build",
+		"test:dev": "cross-env DEV=true playwright test",
+		"test:build": "playwright test"
+	},
+	"devDependencies": {
+		"@sveltejs/kit": "workspace:^",
+		"@sveltejs/adapter-auto": "workspace:^",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
+		"cross-env": "^7.0.3",
+		"svelte": "^5.2.9",
+		"svelte-check": "^4.1.1",
+		"typescript": "^5.5.4",
+		"vite": "^6.0.11"
+	}
+}
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/playwright.config.js b/packages/kit/test/apps/prerendered-app-error-pages/playwright.config.js
new file mode 100644
index 000000000000..33d36b651014
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/playwright.config.js
@@ -0,0 +1 @@
+export { config as default } from '../../utils.js';
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/app.d.ts b/packages/kit/test/apps/prerendered-app-error-pages/src/app.d.ts
new file mode 100644
index 000000000000..da08e6da592d
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/src/app.d.ts
@@ -0,0 +1,13 @@
+// See https://svelte.dev/docs/kit/types#app.d.ts
+// for information about these interfaces
+declare global {
+	namespace App {
+		// interface Error {}
+		// interface Locals {}
+		// interface PageData {}
+		// interface PageState {}
+		// interface Platform {}
+	}
+}
+
+export {};
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/app.html b/packages/kit/test/apps/prerendered-app-error-pages/src/app.html
new file mode 100644
index 000000000000..77a5ff52c923
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/src/app.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		%sveltekit.head%
+	</head>
+	<body data-sveltekit-preload-data="hover">
+		<div style="display: contents">%sveltekit.body%</div>
+	</body>
+</html>
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+error.svelte b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+error.svelte
new file mode 100644
index 000000000000..5b44aeb7a686
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+error.svelte
@@ -0,0 +1 @@
+<p>This is your custom error page.</p>
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+layout.ts b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+layout.ts
new file mode 100644
index 000000000000..189f71e2e1b3
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+layout.ts
@@ -0,0 +1 @@
+export const prerender = true;
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+page.svelte b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+page.svelte
new file mode 100644
index 000000000000..e7b3bd731833
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/+page.svelte
@@ -0,0 +1,4 @@
+<p>
+	This app exists to assert that an app with only prerendered routes successfully renders custom
+	error pages.
+</p>
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
new file mode 100644
index 000000000000..88533314c47f
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
@@ -0,0 +1,5 @@
+import { error } from "@sveltejs/kit";
+
+export function load() {
+  error(404, 'Not found');
+}
\ No newline at end of file
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/static/favicon.png b/packages/kit/test/apps/prerendered-app-error-pages/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..825b9e65af7c104cfb07089bb28659393b4f2097
GIT binary patch
literal 1571
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
VHuiSbmk|H}002ovPDHLkV1f%e^4kCa

literal 0
HcmV?d00001

diff --git a/packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js b/packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js
new file mode 100644
index 000000000000..10c4eeb27703
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js
@@ -0,0 +1,13 @@
+import adapter from '@sveltejs/adapter-auto';
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+	kit: {
+		// adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
+		// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
+		// See https://svelte.dev/docs/kit/adapters for more information about adapters.
+		adapter: adapter()
+	}
+};
+
+export default config;
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/test/test.js b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
new file mode 100644
index 000000000000..59658c4184e8
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
@@ -0,0 +1,14 @@
+import { expect } from '@playwright/test';
+import { test } from '../../../utils.js';
+
+test.describe.configure({ mode: 'parallel' });
+
+test('renders error page on nonexistent route', async ({ page }) => {
+  await page.goto('/nonexistent');
+  expect(await page.textContent('p')).toBe('This is your custom error page.');
+});
+
+test('renders error page on manually 404ing route', async ({ page }) => {
+  await page.goto('/thrown-error');
+  expect(await page.textContent('p')).toBe('This is your custom error page.');
+});
\ No newline at end of file
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/vite.config.js b/packages/kit/test/apps/prerendered-app-error-pages/vite.config.js
new file mode 100644
index 000000000000..02d484743bc6
--- /dev/null
+++ b/packages/kit/test/apps/prerendered-app-error-pages/vite.config.js
@@ -0,0 +1,12 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+import path from 'node:path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+	plugins: [sveltekit()],
+		server: {
+		fs: {
+			allow: [path.resolve('../../../src')]
+		}
+	}
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 009f9699b389..b2226360e015 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -644,6 +644,33 @@ importers:
         specifier: ^6.0.11
         version: 6.0.11(@types/node@18.19.50)(lightningcss@1.24.1)
 
+  packages/kit/test/apps/prerendered-app-error-pages:
+    devDependencies:
+      '@sveltejs/adapter-auto':
+        specifier: workspace:^
+        version: link:../../../../adapter-auto
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      '@sveltejs/vite-plugin-svelte':
+        specifier: ^5.0.1
+        version: 5.0.1(svelte@5.2.9)(vite@6.0.11(@types/node@18.19.50)(lightningcss@1.24.1))
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      svelte:
+        specifier: ^5.2.9
+        version: 5.2.9
+      svelte-check:
+        specifier: ^4.1.1
+        version: 4.1.1(picomatch@4.0.2)(svelte@5.2.9)(typescript@5.6.3)
+      typescript:
+        specifier: ^5.5.4
+        version: 5.6.3
+      vite:
+        specifier: ^6.0.11
+        version: 6.0.11(@types/node@18.19.50)(lightningcss@1.24.1)
+
   packages/kit/test/apps/writes:
     devDependencies:
       '@sveltejs/kit':

From f39fd50ec6f0552e3415660d8629149c7b1342bd Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Mon, 3 Mar 2025 22:04:03 -0700
Subject: [PATCH 3/7] format

---
 .../test/apps/prerendered-app-error-pages/README.md    |  2 +-
 .../src/routes/thrown-error/+page.js                   |  6 +++---
 .../test/apps/prerendered-app-error-pages/test/test.js | 10 +++++-----
 .../apps/prerendered-app-error-pages/vite.config.js    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/kit/test/apps/prerendered-app-error-pages/README.md b/packages/kit/test/apps/prerendered-app-error-pages/README.md
index 412cb451affc..89bb2b9c5308 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/README.md
+++ b/packages/kit/test/apps/prerendered-app-error-pages/README.md
@@ -1 +1 @@
-Please do not edit this app unless you're absolutely sure it's not going to affect the tests.
\ No newline at end of file
+Please do not edit this app unless you're absolutely sure it's not going to affect the tests.
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
index 88533314c47f..34be726e305c 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
+++ b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
@@ -1,5 +1,5 @@
-import { error } from "@sveltejs/kit";
+import { error } from '@sveltejs/kit';
 
 export function load() {
-  error(404, 'Not found');
-}
\ No newline at end of file
+	error(404, 'Not found');
+}
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/test/test.js b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
index 59658c4184e8..b25a29d722c9 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
+++ b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
@@ -4,11 +4,11 @@ import { test } from '../../../utils.js';
 test.describe.configure({ mode: 'parallel' });
 
 test('renders error page on nonexistent route', async ({ page }) => {
-  await page.goto('/nonexistent');
-  expect(await page.textContent('p')).toBe('This is your custom error page.');
+	await page.goto('/nonexistent');
+	expect(await page.textContent('p')).toBe('This is your custom error page.');
 });
 
 test('renders error page on manually 404ing route', async ({ page }) => {
-  await page.goto('/thrown-error');
-  expect(await page.textContent('p')).toBe('This is your custom error page.');
-});
\ No newline at end of file
+	await page.goto('/thrown-error');
+	expect(await page.textContent('p')).toBe('This is your custom error page.');
+});
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/vite.config.js b/packages/kit/test/apps/prerendered-app-error-pages/vite.config.js
index 02d484743bc6..438fa14111b7 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/vite.config.js
+++ b/packages/kit/test/apps/prerendered-app-error-pages/vite.config.js
@@ -4,7 +4,7 @@ import { defineConfig } from 'vite';
 
 export default defineConfig({
 	plugins: [sveltekit()],
-		server: {
+	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
 		}

From 0967a24cc8c66f779d9a27b8eb621c845f5754fa Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Mon, 3 Mar 2025 22:22:54 -0700
Subject: [PATCH 4/7] remove

---
 .../src/routes/thrown-error/+page.js                       | 5 -----
 .../kit/test/apps/prerendered-app-error-pages/test/test.js | 7 +------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js

diff --git a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js b/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
deleted file mode 100644
index 34be726e305c..000000000000
--- a/packages/kit/test/apps/prerendered-app-error-pages/src/routes/thrown-error/+page.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { error } from '@sveltejs/kit';
-
-export function load() {
-	error(404, 'Not found');
-}
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/test/test.js b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
index b25a29d722c9..b8000c7acf2e 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
+++ b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
@@ -4,11 +4,6 @@ import { test } from '../../../utils.js';
 test.describe.configure({ mode: 'parallel' });
 
 test('renders error page on nonexistent route', async ({ page }) => {
-	await page.goto('/nonexistent');
-	expect(await page.textContent('p')).toBe('This is your custom error page.');
-});
-
-test('renders error page on manually 404ing route', async ({ page }) => {
-	await page.goto('/thrown-error');
+	await page.goto('/nonexistent', { wait_for_started: false});
 	expect(await page.textContent('p')).toBe('This is your custom error page.');
 });

From 649ecd44c84ba4913b42355eb1655e017751473a Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Mon, 3 Mar 2025 22:24:13 -0700
Subject: [PATCH 5/7] changeset

---
 .changeset/long-hounds-listen.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/long-hounds-listen.md

diff --git a/.changeset/long-hounds-listen.md b/.changeset/long-hounds-listen.md
new file mode 100644
index 000000000000..b3f7ec486efd
--- /dev/null
+++ b/.changeset/long-hounds-listen.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: Include root layout and error nodes even when apps have only prerendered pages

From 76996c98785aa3543baff41a8b1e7e9b07aa05cc Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Mon, 3 Mar 2025 22:24:39 -0700
Subject: [PATCH 6/7] lint

---
 packages/kit/test/apps/prerendered-app-error-pages/test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/test/apps/prerendered-app-error-pages/test/test.js b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
index b8000c7acf2e..c1328e6aa556 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
+++ b/packages/kit/test/apps/prerendered-app-error-pages/test/test.js
@@ -4,6 +4,6 @@ import { test } from '../../../utils.js';
 test.describe.configure({ mode: 'parallel' });
 
 test('renders error page on nonexistent route', async ({ page }) => {
-	await page.goto('/nonexistent', { wait_for_started: false});
+	await page.goto('/nonexistent', { wait_for_started: false });
 	expect(await page.textContent('p')).toBe('This is your custom error page.');
 });

From c93558fa835a35c8196e8aa8d7117a0570cb8362 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 4 Mar 2025 12:50:20 +0100
Subject: [PATCH 7/7] tweak

---
 packages/kit/src/core/generate_manifest/index.js         | 4 +---
 .../test/apps/prerendered-app-error-pages/package.json   | 1 -
 .../apps/prerendered-app-error-pages/svelte.config.js    | 9 +--------
 pnpm-lock.yaml                                           | 3 ---
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js
index 28ed06baf453..eaaf9e6cd38e 100644
--- a/packages/kit/src/core/generate_manifest/index.js
+++ b/packages/kit/src/core/generate_manifest/index.js
@@ -27,9 +27,7 @@ export function generate_manifest({ build_data, prerendered, relative_path, rout
 	const reindexed = new Map();
 	/**
 	 * All nodes actually used in the routes definition (prerendered routes are omitted).
-	 * If `routes` is empty, it means that this manifest is only used for server-side resolution
-	 * and the root layout/error is therefore not needed.
-	 * Else, root layout/error is always included as they are needed for 404 and root errors.
+	 * Root layout/error is always included as they are needed for 404 and root errors.
 	 * @type {Set<any>}
 	 */
 	const used_nodes = new Set([0, 1]);
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/package.json b/packages/kit/test/apps/prerendered-app-error-pages/package.json
index 2618c7ecc74a..0bc92bb67968 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/package.json
+++ b/packages/kit/test/apps/prerendered-app-error-pages/package.json
@@ -16,7 +16,6 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/adapter-auto": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"cross-env": "^7.0.3",
 		"svelte": "^5.2.9",
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js b/packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js
index 10c4eeb27703..821c14379ec8 100644
--- a/packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js
+++ b/packages/kit/test/apps/prerendered-app-error-pages/svelte.config.js
@@ -1,13 +1,6 @@
-import adapter from '@sveltejs/adapter-auto';
-
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
-	kit: {
-		// adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
-		// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
-		// See https://svelte.dev/docs/kit/adapters for more information about adapters.
-		adapter: adapter()
-	}
+	kit: {}
 };
 
 export default config;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b2226360e015..238943790dea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -646,9 +646,6 @@ importers:
 
   packages/kit/test/apps/prerendered-app-error-pages:
     devDependencies:
-      '@sveltejs/adapter-auto':
-        specifier: workspace:^
-        version: link:../../../../adapter-auto
       '@sveltejs/kit':
         specifier: workspace:^
         version: link:../../..