@sveltejs/kit 1.2.10 → 1.3.1

package/types/internal.d.ts

@@ -1,4 +1,4 @@
-import { OutputAsset, OutputChunk } from 'rollup';
+import { OutputChunk } from 'rollup';
 import { SvelteComponent } from 'svelte/internal';
 import {
 	Config,
@@ -7,7 +7,6 @@ import {
 	HandleServerError,
 	KitConfig,
 	Load,
-	RequestEvent,
 	RequestHandler,
 	ResolveOptions,
 	Server,
@@ -49,22 +48,13 @@ export interface BuildData {
 	app_path: string;
 	manifest_data: ManifestData;
 	service_worker: string | null;
-	client: {
-		assets: OutputAsset[];
-		chunks: OutputChunk[];
-		entry: {
-			file: string;
-			imports: string[];
-			stylesheets: string[];
-			fonts: string[];
-		};
-		vite_manifest: import('vite').Manifest;
-	};
-	server: {
-		chunks: OutputChunk[];
-		methods: Record<string, HttpMethod[]>;
-		vite_manifest: import('vite').Manifest;
-	};
+	client_entry: {
+		file: string;
+		imports: string[];
+		stylesheets: string[];
+		fonts: string[];
+	} | null;
+	server_manifest: import('vite').Manifest;
 }
 
 export interface CSRPageNode {
@@ -73,7 +63,6 @@ export interface CSRPageNode {
 		load?: Load;
 		trailingSlash?: TrailingSlash;
 	};
-	has_server_load: boolean;
 }
 
 export type CSRPageNodeLoader = () => Promise<CSRPageNode>;
@@ -244,6 +233,17 @@ export interface ServerErrorNode {
 	status?: number;
 }
 
+export interface ServerMetadata {
+	nodes: Array<{ has_server_load: boolean }>;
+	routes: Map<
+		string,
+		{
+			prerender: PrerenderOption | undefined;
+			methods: HttpMethod[];
+		}
+	>;
+}
+
 export interface SSRComponent {
 	default: {
 		render(props: Record<string, any>): {
@@ -261,7 +261,7 @@ export type SSRComponentLoader = () => Promise<SSRComponent>;
 
 export interface SSRNode {
 	component: SSRComponentLoader;
-	/** index into the `components` array in client-manifest.js */
+	/** index into the `components` array in client/manifest.js */
 	index: number;
 	/** client-side module URL for this component */
 	file: string;

package/src/core/postbuild/index.js

@@ -1,113 +0,0 @@
-import { writeFileSync } from 'fs';
-import { join } from 'path';
-import { pathToFileURL } from 'url';
-import { get_option } from '../../runtime/server/utils.js';
-import {
-	validate_common_exports,
-	validate_page_server_exports,
-	validate_server_exports
-} from '../../utils/exports.js';
-import { load_config } from '../config/index.js';
-import { prerender } from './prerender.js';
-
-const [, , client_out_dir, manifest_path, results_path, verbose, env_json] = process.argv;
-const env = JSON.parse(env_json);
-
-/** @type {import('types').SSRManifest} */
-const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
-
-/** @type {import('types').PrerenderMap} */
-const prerender_map = new Map();
-
-/** @type {import('types').ValidatedKitConfig} */
-const config = (await load_config()).kit;
-
-const server_root = join(config.outDir, 'output');
-
-/** @type {import('types').ServerInternalModule} */
-const internal = await import(pathToFileURL(`${server_root}/server/internal.js`).href);
-
-/** @type {import('types').ServerModule} */
-const { Server } = await import(pathToFileURL(`${server_root}/server/index.js`).href);
-
-// configure `import { building } from '$app/environment'` —
-// essential we do this before analysing the code
-internal.set_building(true);
-
-// set env, in case it's used in initialisation
-const entries = Object.entries(env);
-const prefix = config.env.publicPrefix;
-internal.set_private_env(Object.fromEntries(entries.filter(([k]) => !k.startsWith(prefix))));
-internal.set_public_env(Object.fromEntries(entries.filter(([k]) => k.startsWith(prefix))));
-
-// analyse routes
-for (const route of manifest._.routes) {
-	if (route.endpoint) {
-		const mod = await route.endpoint();
-		if (mod.prerender !== undefined) {
-			validate_server_exports(mod, route.id);
-
-			if (mod.prerender && (mod.POST || mod.PATCH || mod.PUT || mod.DELETE)) {
-				throw new Error(
-					`Cannot prerender a +server file with POST, PATCH, PUT, or DELETE (${route.id})`
-				);
-			}
-
-			prerender_map.set(route.id, mod.prerender);
-		}
-	}
-
-	if (route.page) {
-		const nodes = await Promise.all(
-			[...route.page.layouts, route.page.leaf].map((n) => {
-				if (n !== undefined) return manifest._.nodes[n]();
-			})
-		);
-
-		const layouts = nodes.slice(0, -1);
-		const page = nodes.at(-1);
-
-		for (const layout of layouts) {
-			if (layout) {
-				validate_common_exports(layout.server, route.id);
-				validate_common_exports(layout.universal, route.id);
-			}
-		}
-
-		if (page) {
-			validate_page_server_exports(page.server, route.id);
-			validate_common_exports(page.universal, route.id);
-		}
-
-		const should_prerender = get_option(nodes, 'prerender');
-		const prerender =
-			should_prerender === true ||
-			// Try prerendering if ssr is false and no server needed. Set it to 'auto' so that
-			// the route is not removed from the manifest, there could be a server load function.
-			// People can opt out of this behavior by explicitly setting prerender to false
-			(should_prerender !== false && get_option(nodes, 'ssr') === false && !page?.server?.actions
-				? 'auto'
-				: should_prerender ?? false);
-
-		prerender_map.set(route.id, prerender);
-	}
-}
-
-const { prerendered } = await prerender({
-	Server,
-	internal,
-	manifest,
-	prerender_map,
-	client_out_dir,
-	verbose,
-	env
-});
-
-writeFileSync(
-	results_path,
-	JSON.stringify({ prerendered, prerender_map }, (_key, value) =>
-		value instanceof Map ? Array.from(value.entries()) : value
-	)
-);
-
-process.exit(0);

package/src/core/sync/write_matchers.js

@@ -1,25 +0,0 @@
-import { s } from '../../utils/misc.js';
-import { relative_path } from '../../utils/filesystem.js';
-import { write_if_changed } from './utils.js';
-
-/**
- * @param {import('types').ManifestData} manifest_data
- * @param {string} output
- */
-export function write_matchers(manifest_data, output) {
-	const imports = [];
-	const matchers = [];
-
-	for (const key in manifest_data.matchers) {
-		const src = manifest_data.matchers[key];
-
-		imports.push(`import { match as ${key} } from ${s(relative_path(output, src))};`);
-		matchers.push(key);
-	}
-
-	const module = imports.length
-		? `${imports.join('\n')}\n\nexport const matchers = { ${matchers.join(', ')} };`
-		: 'export const matchers = {};';
-
-	write_if_changed(`${output}/client-matchers.js`, module);
-}