void 0.7.4 → 0.7.6

package/dist/pages/client.d.mts

@@ -1,4 +1,4 @@
-import { t as PageObject } from "../protocol-CK4OFwfR.mjs";
+import { t as PageObject } from "../protocol-COz1NHxc.mjs";
 import { CacheForInput, CacheForResult } from "./prefetch.mjs";
 
 //#region src/pages/action-result.d.ts
@@ -147,6 +147,7 @@ interface VoidRouter {
   readonly url: URL;
   readonly path: string;
   readonly query: URLSearchParams;
+  readonly params: Record<string, string>;
   visit(url: string | URL, options?: VisitOptions): Promise<unknown>;
   refresh(options?: VisitOptions): Promise<unknown>;
   prefetch(url: string | URL, options?: PrefetchOptions): Promise<unknown>;
@@ -178,8 +179,8 @@ interface VoidRouterConfig {
   onNavigationChange?(navigation: NavigationState): void;
 }
 declare function idleNavigationState(): NavigationState;
-declare function createRouterFacade(router: VoidRouter, getCurrentUrl: () => string): VoidRouter;
-declare function createSsrRouter(url?: string): VoidRouter;
+declare function createRouterFacade(router: VoidRouter, getCurrentUrl: () => string, getCurrentParams?: () => Record<string, string>): VoidRouter;
+declare function createSsrRouter(url?: string, params?: Record<string, string>): VoidRouter;
 declare function isFile(value: unknown): boolean;
 declare function hasFiles(data: unknown): boolean;
 declare function objectToFormData(source: Record<string, unknown>, form?: FormData, parentKey?: string): FormData;

package/dist/pages/client.mjs

@@ -756,7 +756,7 @@ function idleNavigationState() {
 		method: null
 	};
 }
-function createRouterFacade(router, getCurrentUrl) {
+function createRouterFacade(router, getCurrentUrl, getCurrentParams = () => router.params) {
 	return {
 		get _hoverDelay() {
 			return router._hoverDelay;
@@ -770,6 +770,9 @@ function createRouterFacade(router, getCurrentUrl) {
 		get query() {
 			return this.url.searchParams;
 		},
+		get params() {
+			return getCurrentParams();
+		},
 		visit(url, options = {}) {
 			return router.visit(url, options);
 		},
@@ -787,7 +790,7 @@ function createRouterFacade(router, getCurrentUrl) {
 		}
 	};
 }
-function createSsrRouter(url = "/") {
+function createSsrRouter(url = "/", params = {}) {
 	return {
 		_hoverDelay: 75,
 		get url() {
@@ -799,6 +802,9 @@ function createSsrRouter(url = "/") {
 		get query() {
 			return this.url.searchParams;
 		},
+		get params() {
+			return params;
+		},
 		visit() {
 			throw new Error("Void Router: visit() is not available during SSR.");
 		},
@@ -870,9 +876,11 @@ async function createVoidRouter(config) {
 	{
 		const engine = await createPageNavigationEngine(config);
 		let routeUrl = currentUrl();
+		let routeParams = engine.initialPageData.params ?? {};
 		let activeNavigationId = null;
-		const setRouteUrl = (url) => {
+		const setRouteState = (url, params = routeParams) => {
 			routeUrl = url;
+			routeParams = params;
 			config.onRouteChange?.(url);
 		};
 		const setNavigation = (navigation) => {
@@ -884,11 +892,12 @@ async function createVoidRouter(config) {
 			try {
 				const result = await resource.shell;
 				if (!result) return;
+				setRouteState(result.pageData.url || resource.fetchUrl + resource.hash, result.pageData.params ?? {});
 				const applyUpdate = () => config.adapter.applyUpdate(result.pageData, result.component, result.layouts);
 				if ((resource.options.viewTransition ?? config.viewTransitions) && document.startViewTransition) await document.startViewTransition(() => applyUpdate()).updateCallbackDone;
 				else await applyUpdate();
 				await resource.commit();
-				if (activeNavigationId === resource.id) setRouteUrl(currentUrl());
+				if (activeNavigationId === resource.id) setRouteState(currentUrl(), result.pageData.params ?? {});
 				return result.pageData;
 			} catch (error) {
 				if (resource.method.toUpperCase() === "GET" && !resource.options._resolveOnShell && isAbortError(error)) return;
@@ -896,7 +905,7 @@ async function createVoidRouter(config) {
 			} finally {
 				if (activeNavigationId === resource.id) {
 					activeNavigationId = null;
-					setRouteUrl(currentUrl());
+					setRouteState(currentUrl());
 					setNavigation(idleNavigationState());
 				}
 			}
@@ -912,6 +921,9 @@ async function createVoidRouter(config) {
 			get query() {
 				return this.url.searchParams;
 			},
+			get params() {
+				return routeParams;
+			},
 			visit(url, options = {}) {
 				return applyNavigationResource(engine.prepareVisit(normalizeUrl(url), options));
 			},
@@ -932,7 +944,7 @@ async function createVoidRouter(config) {
 				engine.flushAll();
 			}
 		};
-		const router = createRouterFacade(rawRouter, () => routeUrl);
+		const router = createRouterFacade(rawRouter, () => routeUrl, () => routeParams);
 		engine.setPopStateHandler((url, options) => {
 			router.visit(url, options);
 		});

package/dist/pages/index.d.mts

@@ -1,5 +1,5 @@
 import { a as renderHtmlAttrs, i as renderHeadToString, n as HeadDescriptor, o as resolveHead, r as renderBodyAttrs, t as HeadConfig } from "../head-CZGAunBV.mjs";
-import { i as PageScanResult, n as NamedLayoutDefinition, r as PageDefinition, t as LayoutDefinition } from "../types-AdKzPp2C.mjs";
+import { a as PageScanResult, i as PageDefinition, n as LayoutDefinition, r as NamedLayoutDefinition } from "../types-D6AuY5Bf.mjs";
 import { serializePageData } from "./serialize.mjs";
 
 //#region src/pages/layout-resolution.d.ts

package/dist/pages/islands-plugin.d.mts

@@ -1,4 +1,4 @@
-import { i as PageScanResult } from "../types-AdKzPp2C.mjs";
+import { a as PageScanResult } from "../types-D6AuY5Bf.mjs";
 import { ResolvedConfig, ViteDevServer } from "vite";
 
 //#region src/pages/islands-plugin.d.ts
@@ -17,8 +17,6 @@ declare function resolveSpecifier(specifier: string, importerDir: string, extens
 * or any .md file has a `<script>` block.
 */
 declare function needsIslandClientBundle(dir: string, islandFilePattern: RegExp, checkStyleBlocks: boolean): boolean;
-/** Check if a file has CSS import statements (JS-style imports). */
-declare function fileHasCssImports(filePath: string): boolean;
 /**
 * Rewrite a matched CSS import line so relative specifiers resolve from the
 * virtual module. Absolute and bare specifiers are kept as-is.
@@ -26,16 +24,9 @@ declare function fileHasCssImports(filePath: string): boolean;
 declare function rewriteCssImportForVirtualModule(matchedLine: string, specifier: string, sourceFilePath: string): string;
 /** Extract CSS import statements from a file and return them as @import rules. */
 declare function extractCssImports(filePath: string): string;
-/** Rebuild islandCssMap from current file contents. */
-declare function rebuildIslandCssMap(pageScan: PageScanResult, pagesDir: string, islandCssMap: Map<string, Array<string>>, fileHasCssFn: (filePath: string) => boolean): void;
 /** Compute which island pages need client-side JavaScript. */
 declare function computePagesNeedingClientJS(pageScan: PageScanResult, pagesDir: string, resolvedConfig: ResolvedConfig | null): Set<string>;
 /**
-* Configure the Vite dev server for island CSS serving.
-* Sets up file watching and a middleware for serving virtual CSS modules.
-*/
-declare function configureIslandCssServer(server: ViteDevServer, islandCssFiles: Set<string>, viteRoot: string, rebuildCssMap: () => void): void;
-/**
 * Watch the pages directory for structural changes (add/remove) and .md content
 * changes (frontmatter layout field) so that new layouts and named layouts are
 * picked up without a dev server restart.
@@ -47,4 +38,4 @@ declare function watchPagesForRescan(server: ViteDevServer, pagesDir: string, ro
   flush: () => Promise<void>;
 };
 //#endregion
-export { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, IslandEntry, computePagesNeedingClientJS, configureIslandCssServer, extractCssImports, fileHasCssImports, needsIslandClientBundle, rebuildIslandCssMap, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan };
+export { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, IslandEntry, computePagesNeedingClientJS, extractCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan };

package/dist/pages/islands-plugin.mjs

@@ -43,15 +43,6 @@ function needsIslandClientBundle(dir, islandFilePattern, checkStyleBlocks) {
 	} catch {}
 	return false;
 }
-/** Check if a file has CSS import statements (JS-style imports). */
-function fileHasCssImports(filePath) {
-	try {
-		const code = readFileSync(filePath, "utf-8");
-		return /import\b[^"']*["'][^"']+\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)["']/.test(code);
-	} catch {
-		return false;
-	}
-}
 /**
 * Rewrite a matched CSS import line so relative specifiers resolve from the
 * virtual module. Absolute and bare specifiers are kept as-is.
@@ -72,22 +63,6 @@ function extractCssImports(filePath) {
 	while ((match = re.exec(code)) !== null) imports.push(`@import ${JSON.stringify(match[1])};`);
 	return imports.join("\n");
 }
-/** Rebuild islandCssMap from current file contents. */
-function rebuildIslandCssMap(pageScan, pagesDir, islandCssMap, fileHasCssFn) {
-	islandCssMap.clear();
-	for (const page of pageScan.pages) {
-		if (!page.island) continue;
-		const cssPaths = [];
-		const layoutChain = resolveEffectiveLayoutChain(page, pageScan.layouts, pageScan.namedLayouts);
-		for (const layout of layoutChain) {
-			const layoutPath = resolve(pagesDir, layout.filePath);
-			if (fileHasCssFn(layoutPath)) cssPaths.push(layoutPath);
-		}
-		const pagePath = resolve(pagesDir, page.componentPath);
-		if (fileHasCssFn(pagePath)) cssPaths.push(pagePath);
-		if (cssPaths.length > 0) islandCssMap.set(page.componentId, cssPaths);
-	}
-}
 /** Compute which island pages need client-side JavaScript. */
 function computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig) {
 	const mdPlugin = resolvedConfig?.plugins?.find((plugin) => plugin.name === "void-md");
@@ -122,43 +97,6 @@ function computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig) {
 	return result;
 }
 /**
-* Configure the Vite dev server for island CSS serving.
-* Sets up file watching and a middleware for serving virtual CSS modules.
-*/
-function configureIslandCssServer(server, islandCssFiles, viteRoot, rebuildCssMap) {
-	server.watcher.on("change", (path) => {
-		const normalizedPath = normalizePath(path);
-		if (!islandCssFiles.has(normalizedPath)) return;
-		rebuildCssMap();
-		for (const env of Object.values(server.environments)) {
-			const mod = env.moduleGraph.getModuleById("\0" + ISLANDS_RENDERER_ID);
-			if (mod) env.moduleGraph.invalidateModule(mod);
-		}
-		const cssMod = server.environments.client?.moduleGraph.getModuleById(normalizedPath + ".css");
-		if (cssMod) server.environments.client.moduleGraph.invalidateModule(cssMod);
-	});
-	server.middlewares.use(async (req, res, next) => {
-		if (!req.url) return next();
-		const url = req.url.split("?")[0];
-		if (!url.endsWith(".css")) return next();
-		const srcPath = normalizePath(resolve(viteRoot, url.slice(1, -4)));
-		if (!islandCssFiles.has(srcPath)) return next();
-		try {
-			const result = await server.environments.client.transformRequest(url);
-			if (result) {
-				const m = result.code.match(/\b__vite__css\s*=\s*("(?:[^"\\]|\\.)*")/) || result.code.match(/export\s+default\s+("(?:[^"\\]|\\.)*")/);
-				if (m) {
-					res.setHeader("Content-Type", "text/css");
-					res.statusCode = 200;
-					res.end(JSON.parse(m[1]));
-					return;
-				}
-			}
-		} catch {}
-		next();
-	});
-}
-/**
 * Watch the pages directory for structural changes (add/remove) and .md content
 * changes (frontmatter layout field) so that new layouts and named layouts are
 * picked up without a dev server restart.
@@ -192,4 +130,4 @@ function watchPagesForRescan(server, pagesDir, root, onRescan) {
 	return { flush: () => pending ?? Promise.resolve() };
 }
 //#endregion
-export { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, configureIslandCssServer, extractCssImports, fileHasCssImports, needsIslandClientBundle, rebuildIslandCssMap, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan };
+export { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, extractCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan };

package/dist/pages/protocol.d.mts

@@ -1,3 +1,3 @@
 import { S as ValidationError } from "../handler-dKQWyF-G.mjs";
-import { a as handlePageMutation, i as handlePageGet, n as PageRenderResult, o as safeJsonStringify, r as flattenValidationErrors, t as PageObject } from "../protocol-CK4OFwfR.mjs";
+import { a as handlePageMutation, i as handlePageGet, n as PageRenderResult, o as safeJsonStringify, r as flattenValidationErrors, t as PageObject } from "../protocol-COz1NHxc.mjs";
 export { PageObject, PageRenderResult, ValidationError, flattenValidationErrors, handlePageGet, handlePageMutation, safeJsonStringify };

package/dist/pages/protocol.mjs

@@ -3,6 +3,7 @@ import { i as ValidationError, r as separateDeferred, t as DEFERRED } from "../d
 import { resolveHead } from "./head.mjs";
 //#region src/pages/protocol.ts
 const POWERED_BY = { "X-Powered-By": "Void" };
+const RENDER_ERROR_ASSET_TAGS_KEY = "__voidPageAssetTags";
 /** Escape characters that are unsafe inside inline <script> tags to prevent XSS. */
 function safeJsonStringify(value) {
 	return (JSON.stringify(value) ?? "null").replaceAll("<", "\\u003c").replaceAll(">", "\\u003e").replaceAll("&", "\\u0026").replaceAll("\u2028", "\\u2028").replaceAll("\u2029", "\\u2029");
@@ -15,6 +16,85 @@ function pageResponseHeaders(c, headers) {
 	for (const [key, value] of Object.entries(headers)) out.set(key, value);
 	return out;
 }
+function escapeHtmlAttr(value) {
+	return value.replaceAll("&", "&amp;").replaceAll("\"", "&quot;").replaceAll("<", "&lt;");
+}
+function serializeStyleCss(css) {
+	return css.replace(/<\/style/gi, "<\\/style");
+}
+function serializeDevCssAssets(assets, nonce) {
+	return assets.map((asset) => `<style data-vite-dev-id="${escapeHtmlAttr(asset.id ?? asset.url)}" nonce="${escapeHtmlAttr(nonce)}">${serializeStyleCss(asset.css)}</style>`).join("\n");
+}
+function hasCompatibleStyleSource(value, nonceSource) {
+	return value === "'unsafe-inline'" || value === nonceSource;
+}
+function adjustCspValue(value, nonce) {
+	const nonceSource = `'nonce-${nonce}'`;
+	const parsed = value.split(";").map((part) => part.trim()).filter(Boolean).map((directive) => {
+		const [name = "", ...sources] = directive.split(/\s+/);
+		return {
+			name: name.toLowerCase(),
+			originalName: name,
+			sources
+		};
+	});
+	const styleElem = parsed.find((directive) => directive.name === "style-src-elem");
+	if (styleElem) {
+		if (!styleElem.sources.some((source) => hasCompatibleStyleSource(source, nonceSource))) styleElem.sources.push(nonceSource);
+		return parsed.map((directive) => [directive.originalName, ...directive.sources].join(" ")).join("; ");
+	}
+	const style = parsed.find((directive) => directive.name === "style-src");
+	if (style) {
+		if (!style.sources.some((source) => hasCompatibleStyleSource(source, nonceSource))) style.sources.push(nonceSource);
+		return parsed.map((directive) => [directive.originalName, ...directive.sources].join(" ")).join("; ");
+	}
+	const defaultSrc = parsed.find((directive) => directive.name === "default-src");
+	if (defaultSrc) {
+		parsed.push({
+			name: "style-src",
+			originalName: "style-src",
+			sources: [...defaultSrc.sources, nonceSource]
+		});
+		return parsed.map((directive) => [directive.originalName, ...directive.sources].join(" ")).join("; ");
+	}
+	parsed.push({
+		name: "style-src",
+		originalName: "style-src",
+		sources: [nonceSource]
+	});
+	return parsed.map((directive) => [directive.originalName, ...directive.sources].join(" ")).join("; ");
+}
+function adjustDevCssCsp(headers, nonce) {
+	if (!nonce) return headers;
+	const csp = headers.get("content-security-policy");
+	if (csp) headers.set("content-security-policy", adjustCspValue(csp, nonce));
+	const cspReportOnly = headers.get("content-security-policy-report-only");
+	if (cspReportOnly) headers.set("content-security-policy-report-only", adjustCspValue(cspReportOnly, nonce));
+	return headers;
+}
+function prepareAssetTags(assetTags) {
+	if (!assetTags.devCss || assetTags.devCss.length === 0) return assetTags;
+	const nonce = crypto.randomUUID().replaceAll("-", "");
+	return {
+		...assetTags,
+		css: [assetTags.css, serializeDevCssAssets(assetTags.devCss, nonce)].filter(Boolean).join("\n"),
+		devCssNonce: nonce
+	};
+}
+function attachRenderErrorAssetTags(error, assetTags) {
+	if ((typeof error === "object" || typeof error === "function") && error !== null) Object.defineProperty(error, RENDER_ERROR_ASSET_TAGS_KEY, {
+		configurable: true,
+		value: assetTags
+	});
+	throw error;
+}
+async function renderWithAssetTags(renderFn, pageObj, assetTags) {
+	try {
+		return await renderFn(pageObj, assetTags);
+	} catch (error) {
+		attachRenderErrorAssetTags(error, assetTags);
+	}
+}
 function pageJsonResponse(c, pageObj) {
 	return Response.json(pageObj, { headers: pageResponseHeaders(c, {
 		"X-VoidPages": "true",
@@ -25,6 +105,9 @@ function pageJsonResponse(c, pageObj) {
 function requestPathWithSearch(c) {
 	return c.req.path + new URL(c.req.url).search;
 }
+function requestParams(c) {
+	return c.req.param();
+}
 /** Extract props from a handler result, handling Response wrapping from withValidator */
 async function extractProps(result) {
 	if (result instanceof Response) {
@@ -62,14 +145,14 @@ async function writeRenderResult(writer, encoder, result) {
 		await writer.write(value);
 	}
 }
-function renderedResponse(c, result, contentType) {
-	return new Response(result, { headers: pageResponseHeaders(c, {
+function renderedResponse(c, result, contentType, assetTags) {
+	return new Response(result, { headers: adjustDevCssCsp(pageResponseHeaders(c, {
 		"content-type": contentType,
 		...POWERED_BY
-	}) });
+	}), assetTags?.devCssNonce) });
 }
 /** Build a streaming response that sends an initial chunk then streams deferred results. */
-function streamDeferredResponse(initialChunk, deferredMap, c, contentType, formatResolved, formatRejected) {
+function streamDeferredResponse(initialChunk, deferredMap, c, contentType, formatResolved, formatRejected, assetTags) {
 	const encoder = new TextEncoder();
 	const { readable, writable } = new TransformStream();
 	const writer = writable.getWriter();
@@ -81,10 +164,10 @@ function streamDeferredResponse(initialChunk, deferredMap, c, contentType, forma
 	})().catch((error) => {
 		writer.abort(error).catch(() => {});
 	});
-	return new Response(readable, { headers: pageResponseHeaders(c, {
+	return new Response(readable, { headers: adjustDevCssCsp(pageResponseHeaders(c, {
 		"content-type": contentType,
 		...POWERED_BY
-	}) });
+	}), assetTags?.devCssNonce) });
 }
 /** Handle GET page request — run handler, return page object or SSR HTML */
 async function handlePageGet(handler, headFn, c, componentId, renderFn, getAssetTags, configHead, island) {
@@ -107,6 +190,7 @@ async function handlePageGet(handler, headFn, c, componentId, renderFn, getAsset
 	const pageObj = {
 		component: componentId,
 		props: immediateProps,
+		params: requestParams(c),
 		shared,
 		url: requestPathWithSearch(c),
 		errors: null,
@@ -146,9 +230,10 @@ async function handlePageGet(handler, headFn, c, componentId, renderFn, getAsset
 			error
 		}) + "\n");
 	}
-	const html = await renderFn(pageObj, await getAssetTags(c.req.raw, c.env, componentId));
-	if (!hasDeferred) return renderedResponse(c, html, "text/html; charset=utf-8");
-	return streamDeferredResponse(html, deferredMap, c, "text/html; charset=utf-8", (group, data) => `\n<script>window.__resolveDeferred?window.__resolveDeferred(${safeJsonStringify(group)},${safeJsonStringify(data)}):(window.__deferredQueue??=[]).push([${safeJsonStringify(group)},${safeJsonStringify(data)}])<\/script>`, (group, error) => `\n<script>window.__rejectDeferred?window.__rejectDeferred(${safeJsonStringify(group)},${safeJsonStringify(error)}):(window.__deferredQueue??=[]).push([${safeJsonStringify(group)},0,${safeJsonStringify(error)}])<\/script>`);
+	const assetTags = prepareAssetTags(await getAssetTags(c.req.raw, c.env, componentId));
+	const html = await renderWithAssetTags(renderFn, pageObj, assetTags);
+	if (!hasDeferred) return renderedResponse(c, html, "text/html; charset=utf-8", assetTags);
+	return streamDeferredResponse(html, deferredMap, c, "text/html; charset=utf-8", (group, data) => `\n<script>window.__resolveDeferred?window.__resolveDeferred(${safeJsonStringify(group)},${safeJsonStringify(data)}):(window.__deferredQueue??=[]).push([${safeJsonStringify(group)},${safeJsonStringify(data)}])<\/script>`, (group, error) => `\n<script>window.__rejectDeferred?window.__rejectDeferred(${safeJsonStringify(group)},${safeJsonStringify(error)}):(window.__deferredQueue??=[]).push([${safeJsonStringify(group)},0,${safeJsonStringify(error)}])<\/script>`, assetTags);
 }
 /** Handle POST/PUT/DELETE page request — run mutation, then re-run GET or redirect */
 async function handlePageMutation(mutationHandler, getHandler, headFn, c, componentId, renderFn, getAssetTags, configHead, island) {
@@ -159,6 +244,7 @@ async function handlePageMutation(mutationHandler, getHandler, headFn, c, compon
 		return {
 			component: componentId,
 			props,
+			params: requestParams(c),
 			shared,
 			url: requestPathWithSearch(c),
 			errors,
@@ -173,7 +259,8 @@ async function handlePageMutation(mutationHandler, getHandler, headFn, c, compon
 			if (island) return Response.json({ errors: e.errors }, { status: 422 });
 			const pageObj = buildMutationPageObj(stripDeferred(getHandler ? await extractProps(await getHandler(c)) : {}), e.errors);
 			if (isPagesRequest(c)) return pageJsonResponse(c, pageObj);
-			return renderedResponse(c, await renderFn(pageObj, await getAssetTags(c.req.raw, c.env, componentId)), "text/html; charset=utf-8");
+			const assetTags = prepareAssetTags(await getAssetTags(c.req.raw, c.env, componentId));
+			return renderedResponse(c, await renderWithAssetTags(renderFn, pageObj, assetTags), "text/html; charset=utf-8", assetTags);
 		}
 		throw e;
 	}
@@ -185,14 +272,16 @@ async function handlePageMutation(mutationHandler, getHandler, headFn, c, compon
 			if (island) return Response.json({ errors }, { status: 422 });
 			const pageObj = buildMutationPageObj(stripDeferred(getHandler ? await extractProps(await getHandler(c)) : {}), errors);
 			if (isPagesRequest(c)) return pageJsonResponse(c, pageObj);
-			return renderedResponse(c, await renderFn(pageObj, await getAssetTags(c.req.raw, c.env, componentId)), "text/html; charset=utf-8");
+			const assetTags = prepareAssetTags(await getAssetTags(c.req.raw, c.env, componentId));
+			return renderedResponse(c, await renderWithAssetTags(renderFn, pageObj, assetTags), "text/html; charset=utf-8", assetTags);
 		}
 		if (status !== 204) return result;
 	}
 	if (island) return Response.json({ success: true });
 	const pageObj = buildMutationPageObj(stripDeferred(getHandler ? await extractProps(await getHandler(c)) : {}), null);
 	if (isPagesRequest(c)) return pageJsonResponse(c, pageObj);
-	return renderedResponse(c, await renderFn(pageObj, await getAssetTags(c.req.raw, c.env, componentId)), "text/html; charset=utf-8");
+	const assetTags = prepareAssetTags(await getAssetTags(c.req.raw, c.env, componentId));
+	return renderedResponse(c, await renderWithAssetTags(renderFn, pageObj, assetTags), "text/html; charset=utf-8", assetTags);
 }
 //#endregion
 export { ValidationError, flattenValidationErrors, handlePageGet, handlePageMutation, safeJsonStringify };