replace transformPage with transformPageChunk

.changeset/nasty-seahorses-know.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[breaking] replace transformPage with transformPageChunk

documentation/docs/06-hooks.md

@@ -67,15 +67,15 @@ You can add call multiple `handle` functions with [the `sequence` helper functio
 `resolve` also supports a second, optional parameter that gives you more control over how the response will be rendered. That parameter is an object that can have the following fields:
 
 - `ssr: boolean` (default `true`) — if `false`, renders an empty 'shell' page instead of server-side rendering
-- `transformPage(opts: { html: string }): string` — applies custom transforms to HTML
+- `transformPageChunk(opts: { html: string, done: boolean }): string` — applies custom transforms to HTML. If `done` is true, it's the final chunk
 
 ```js
 /// file: src/hooks.js
 /** @type {import('@sveltejs/kit').Handle} */
 export async function handle({ event, resolve }) {
 	const response = await resolve(event, {
 		ssr: !event.url.pathname.startsWith('/admin'),
-		transformPage: ({ html }) => html.replace('old', 'new')
+		transformPageChunk: ({ html }) => html.replace('old', 'new')
 	});
 
 	return response;

documentation/docs/17-seo.md

@@ -105,15 +105,19 @@ const config = {
 export default config;
 ```
 
-...and transforming the HTML using `transformPage` along with `transform` imported from `@sveltejs/amp`:
+...and transforming the HTML using `transformPageChunk` along with `transform` imported from `@sveltejs/amp`:
 
 ```js
 import * as amp from '@sveltejs/amp';
 
 /** @type {import('@sveltejs/kit').Handle} */
 export async function handle({ event, resolve }) {
+	let buffer = '';
 	return resolve(event, {
-		transformPage: ({ html }) => amp.transform(html)
+		transformPageChunk: ({ html, done }) => {
+			buffer += html;
+			if (done) return amp.transform(html);
+		}
 	});
 }
 ```

packages/kit/src/runtime/server/index.js

@@ -171,7 +171,7 @@ export async function respond(request, options, state) {
 	/** @type {import('types').RequiredResolveOptions} */
 	let resolve_opts = {
 		ssr: true,
-		transformPage: default_transform
+		transformPageChunk: default_transform
 	};
 
 	// TODO match route before calling handle?
@@ -181,9 +181,17 @@ export async function respond(request, options, state) {
 			event,
 			resolve: async (event, opts) => {
 				if (opts) {
+					// TODO remove for 1.0
+					// @ts-expect-error
+					if (opts.transformPage) {
+						throw new Error(
+							'transformPage has been replaced by transformPageChunk — see https://github.com/sveltejs/kit/pull/5657 for more information'
+						);
+					}
+
 					resolve_opts = {
 						ssr: opts.ssr !== false,
-						transformPage: opts.transformPage || default_transform
+						transformPageChunk: opts.transformPageChunk || default_transform
 					};
 				}
 

packages/kit/src/runtime/server/page/render.js

@@ -291,9 +291,12 @@ export async function render_response({
 	const assets =
 		options.paths.assets || (segments.length > 0 ? segments.map(() => '..').join('/') : '.');
 
-	const html = await resolve_opts.transformPage({
-		html: options.template({ head, body, assets, nonce: /** @type {string} */ (csp.nonce) })
-	});
+	// TODO flush chunks as early as we can
+	const html =
+		(await resolve_opts.transformPageChunk({
+			html: options.template({ head, body, assets, nonce: /** @type {string} */ (csp.nonce) }),
+			done: true
+		})) || '';
 
 	const headers = new Headers({
 		'content-type': 'text/html',

packages/kit/test/apps/amp/src/hooks.js

@@ -3,22 +3,28 @@ import * as amp from '@sveltejs/amp';
 
 /** @type {import('@sveltejs/kit').Handle} */
 export async function handle({ event, resolve }) {
+	let buffer = '';
+
 	const response = await resolve(event, {
-		transformPage: ({ html }) => {
-			html = amp.transform(html);
+		transformPageChunk: ({ html, done }) => {
+			buffer += html;
+
+			if (done) {
+				const html = amp.transform(buffer);
 
-			// remove unused CSS
-			let css = '';
-			const markup = html.replace(
-				/<style amp-custom([^>]*?)>([^]+?)<\/style>/,
-				(match, attributes, contents) => {
-					css = contents;
-					return `<style amp-custom${attributes}></style>`;
-				}
-			);
+				// remove unused CSS
+				let css = '';
+				const markup = html.replace(
+					/<style amp-custom([^>]*?)>([^]+?)<\/style>/,
+					(match, attributes, contents) => {
+						css = contents;
+						return `<style amp-custom${attributes}></style>`;
+					}
+				);
 
-			css = purify(markup, css);
-			return markup.replace('</style>', `${css}</style>`);
+				css = purify(markup, css);
+				return markup.replace('</style>', `${css}</style>`);
+			}
 		}
 	});
 

packages/kit/test/apps/basics/src/hooks.js

@@ -47,7 +47,7 @@ export const handle = sequence(
 
 		const response = await resolve(event, {
 			ssr: !event.url.pathname.startsWith('/no-ssr'),
-			transformPage: event.url.pathname.startsWith('/transform-page')
+			transformPageChunk: event.url.pathname.startsWith('/transform-page-chunk')
 				? ({ html }) => html.replace('__REPLACEME__', 'Worked!')
 				: undefined
 		});

packages/kit/test/apps/basics/test/test.js

@@ -1009,8 +1009,8 @@ test.describe('Page options', () => {
 		}
 	});
 
-	test('transformPage can change the html output', async ({ page }) => {
-		await page.goto('/transform-page');
+	test('transformPageChunk can change the html output', async ({ page }) => {
+		await page.goto('/transform-page-chunk');
 		expect(await page.getAttribute('meta[name="transform-page"]', 'content')).toBe('Worked!');
 	});
 

packages/kit/test/prerendering/basics/src/hooks.js

@@ -2,13 +2,14 @@ import { prerendering } from '$app/env';
 
 const initial_prerendering = prerendering;
 
+/** @type {import('@sveltejs/kit').Handle} */
 export const handle = async ({ event, resolve }) => {
 	if (event.url.pathname === '/prerendering-true' && prerendering) {
 		return await resolve(event, {
-			transformPage: ({ html }) =>
+			transformPageChunk: ({ html }) =>
 				html
-					.replace('__INITIAL_PRERENDERING__', initial_prerendering)
-					.replace('__PRERENDERING__', prerendering)
+					.replace('__INITIAL_PRERENDERING__', String(initial_prerendering))
+					.replace('__PRERENDERING__', String(prerendering))
 		});
 	}
 	return await resolve(event);

packages/kit/types/index.d.ts

@@ -261,7 +261,7 @@ export interface RequestHandlerOutput<Output = ResponseBody> {
 
 export interface ResolveOptions {
 	ssr?: boolean;
-	transformPage?: ({ html }: { html: string }) => MaybePromise<string>;
+	transformPageChunk?: (input: { html: string; done: boolean }) => MaybePromise<string | undefined>;
 }
 
 export type ResponseBody = JSONValue | Uint8Array | ReadableStream | Error;