chore: flatten SSRManifest

.changeset/flat-cases-see.md

@@ -2,5 +2,4 @@
 "@sveltejs/kit": major
 ---
 
-breaking: remove `SSRManifest` from public types
-
+breaking: remove `Server` constructor and `SSRManifest` from public types

packages/kit/src/core/generate_manifest/index.js

@@ -105,46 +105,45 @@ export function generate_manifest({
 	/** @template {import('types').SSRManifest} T */
 	const manifest_expr = dedent`
 		{
-			appDir: ${s(build_data.app_dir)},
-			appPath: ${s(build_data.app_path)},
+			app_dir: ${s(build_data.app_dir)},
+			app_path: ${s(build_data.app_path)},
 			assets: new Set(${s(assets)}),
-			mimeTypes: ${s(mime_types)},
-			_: {
-				client: ${uneval(build_data.client)},
-				nodes: [
-					${(node_paths).map(loader).join(',\n')}
-				],
-				remotes: {
-					${remotes.map((remote) => `'${remote.hash}': ${loader(join_relative(relative_path, `chunks/remote-${remote.hash}.js`))}`).join(',\n')}
-				},
-				routes: [
-					${routes.map(route => {
-						if (!route.page && !route.endpoint) return;
-
-						return dedent`
-							{
-								id: ${s(route.id)},
-								pattern: ${route.pattern},
-								params: ${s(route.params)},
-								page: ${route.page ? `{ layouts: ${get_nodes(route.page.layouts)}, errors: ${get_nodes(route.page.errors)}, leaf: ${reindexed.get(route.page.leaf)} }` : 'null'},
-								endpoint: ${route.endpoint ? loader(join_relative(relative_path, resolve_symlinks(build_data.server_manifest, route.endpoint.file, root).chunk.file)) : 'null'}
-							}
-						`;
-					}).filter(Boolean).join(',\n')}
-				],
-				prerendered_routes: new Set(${s(prerendered)}),
-				matchers: async () => {
-					${
-						uses_matchers && build_data.manifest_data.params
-							? dedent`
-								const { params } = await import('${join_relative(relative_path, '/entries/params.js')}');
-								return params;
-							`
-							: 'return {};'
-					}
-				},
-				server_assets: ${s(files)}
-			}
+			mime_types: ${s(mime_types)},
+			client: ${uneval(build_data.client)},
+
+			nodes: [
+				${(node_paths).map(loader).join(',\n')}
+			],
+			remotes: {
+				${remotes.map((remote) => `'${remote.hash}': ${loader(join_relative(relative_path, `chunks/remote-${remote.hash}.js`))}`).join(',\n')}
+			},
+			routes: [
+				${routes.map(route => {
+					if (!route.page && !route.endpoint) return;
+
+					return dedent`
+						{
+							id: ${s(route.id)},
+							pattern: ${route.pattern},
+							params: ${s(route.params)},
+							page: ${route.page ? `{ layouts: ${get_nodes(route.page.layouts)}, errors: ${get_nodes(route.page.errors)}, leaf: ${reindexed.get(route.page.leaf)} }` : 'null'},
+							endpoint: ${route.endpoint ? loader(join_relative(relative_path, resolve_symlinks(build_data.server_manifest, route.endpoint.file, root).chunk.file)) : 'null'}
+						}
+					`;
+				}).filter(Boolean).join(',\n')}
+			],
+			prerendered_routes: new Set(${s(prerendered)}),
+			matchers: async () => {
+				${
+					uses_matchers && build_data.manifest_data.params
+						? dedent`
+							const { params } = await import('${join_relative(relative_path, '/entries/params.js')}');
+							return params;
+						`
+						: 'return {};'
+				}
+			},
+			server_assets: ${s(files)}
 		}
 	`;
 

packages/kit/src/core/postbuild/analyse.js

@@ -65,7 +65,7 @@ async function analyse({
 		remotes: new Map()
 	};
 
-	const nodes = await Promise.all(manifest._.nodes.map((loader) => loader()));
+	const nodes = await Promise.all(manifest.nodes.map((loader) => loader()));
 
 	// analyse nodes
 	for (const node of nodes) {
@@ -88,7 +88,7 @@ async function analyse({
 	}
 
 	// analyse routes
-	for (const route of manifest._.routes) {
+	for (const route of manifest.routes) {
 		const page =
 			route.page &&
 			analyse_page(
@@ -147,7 +147,7 @@ async function analyse({
 
 	// analyse remotes
 	for (const remote of remotes) {
-		const loader = manifest._.remotes[remote.hash];
+		const loader = manifest.remotes[remote.hash];
 		const { default: functions } = await loader();
 
 		const exports = new Map();

packages/kit/src/core/postbuild/prerender.js

@@ -659,7 +659,7 @@ async function prerender({
 	/** @type {Array<import('types').RemotePrerenderInternals>} */
 	const prerender_functions = [];
 
-	for (const loader of Object.values(manifest._.remotes)) {
+	for (const loader of Object.values(manifest.remotes)) {
 		const module = await loader();
 
 		for (const fn of Object.values(module.default)) {

packages/kit/src/exports/public.d.ts

@@ -12,7 +12,7 @@ import {
 	RequestOptions,
 	RouteSegment
 } from '../types/private.js';
-import { SSRManifest, ValidatedConfig } from 'types';
+import { ValidatedConfig } from 'types';
 import { Plugin } from 'vite';
 import { RouteId as AppRouteId, LayoutParams as AppLayoutParams } from '$app/types';
 import { StandardSchemaV1 } from '@standard-schema/spec';
@@ -681,8 +681,7 @@ export interface RouteDefinition<Config = any> {
 	config: Config;
 }
 
-export class Server {
-	constructor(manifest: SSRManifest);
+export interface Server {
 	init(options: ServerInitOptions): Promise<void>;
 	respond(request: Request, options: RequestOptions): Promise<Response>;
 }