@voltro/web 0.52.0 → 0.54.0

package/dist/ssr.d.ts

@@ -94,12 +94,25 @@ export declare interface DeferralTarget {
      * Absent for every full-page render, where `renderMode` alone decides.
      */
     readonly layoutShell?: 'stream' | 'artefact' | undefined;
+    /**
+     * Partial prerendering: the page EXPORTED `ppr = true`. Makes `defer()` on
+     * `renderMode: 'isr'` legal — the cached SHELL renders the eager fields plus
+     * each `<Await>` fallback (credential-free, fail-closed), and the deferred
+     * HOLES run per request with the full request context, appended to the same
+     * response as registry settle scripts. The client reveals them through
+     * hydration — no React resume, no cached reveal scripts.
+     */
+    readonly ppr?: boolean;
 }
 
 /** Brand key on the object `defer()` returns. A single explicit container
  *  check — NOT a scan of arbitrary loader results for markers by shape. */
 declare const DEFERRED_RESULT_TAG: "__voltroDeferredLoaderResult";
 
+/** Stable registry id for one deferred field. `scope` is `'page'` or the
+ *  layout's chain index — the same index the router-state payload keys by. */
+export declare const deferredId: (scope: "page" | number, key: string) => string;
+
 /** What a loader returns when it defers part of its data. Opaque to user
  *  code: build it with {@link defer}, read it with `useLoaderData()`. */
 declare interface DeferredLoaderResult<TEager extends object = object, TDeferred extends Record<string, Promise<unknown>> = Record<string, Promise<unknown>>> {
@@ -112,6 +125,9 @@ declare interface DeferredLoaderResult<TEager extends object = object, TDeferred
     readonly deferred: TDeferred;
 }
 
+/** The body of the `<script>` `<Await>` emits when its promise resolves. */
+export declare const deferredSettleScript: (id: string, value: unknown) => string;
+
 /** Build the wire payload from what the server render was given. */
 export declare const encodeRouterState: (input: RouterStateInput) => InlinedRouterState;
 
@@ -373,6 +389,19 @@ declare interface PageDescriptor<TLoaderData = unknown> {
      *  set this to `'islands'` so only marked interactive zones
      *  hydrate; the rest stays pure static HTML. */
     readonly interactive?: InteractiveMode | undefined;
+    /**
+     * Intercepting route (modal-with-URL): when a SOFT navigation reaches this
+     * page FROM one of the `from` route patterns, the page renders as an
+     * OVERLAY above the still-mounted origin page instead of replacing it —
+     * URL changes, Back closes the overlay, a hard load of the same URL
+     * renders the page standalone. `from` is one or more route PATTERNS
+     * (`'/photos'`, `'/albums/[id]'`); a soft navigation from any other route
+     * renders standalone. Full-hydration pages only (`interactive: 'full'`) —
+     * islands/none pages have no client router to intercept with.
+     */
+    readonly intercept?: {
+        readonly from: string | ReadonlyArray<string>;
+    } | undefined;
 }
 
 declare interface PageMeta {
@@ -572,10 +601,24 @@ export declare interface RenderPageStreamOptions extends RenderPageOptions {
     /** Bootstrap `<script>` module URLs injected by React at the end of the
      *  shell — the client bundle that hydrates the streamed HTML. */
     readonly bootstrapModules?: ReadonlyArray<string>;
-    /** Per-request CSP nonce — React stamps it onto every script IT emits
-     *  (bootstrap modules, Suspense settle scripts). The shell's own tags are
-     *  stamped by the CLI's `stampScriptNonce`; the POLICY header is the
-     *  middleware's (plan 08 §7). */
+    /**
+     * Per-request CSP nonce (plan 08 §7). The POLICY header is the middleware's.
+     *
+     * React stamps this onto the scripts REACT ITSELF INJECTS — the bootstrap
+     * modules and its own Suspense completion scripts. Read that boundary
+     * strictly: it does NOT cover a `<script>` element in the rendered TREE, so
+     * the settle script `<Await>` emits inside a resolved boundary goes out bare.
+     * The CLI's `stampScriptNonce` covers the document the CLI assembles — the
+     * shell plus the `<head>` injection — and cannot see into React's stream
+     * either. Nothing currently stamps the settle script, which is why `defer()`
+     * and a nonce'd CSP do not compose; it is stated in the middleware docs rather
+     * than left for a reader to discover as a boundary that silently never
+     * resolves.
+     *
+     * The previous version of this comment said "bootstrap modules, Suspense
+     * settle scripts" and read as covering both, which is exactly the belief that
+     * let both boot paths pass the nonce HERE and nowhere else.
+     */
     readonly nonce?: string;
 }
 

package/dist/ssr.js

@@ -1,31 +1,31 @@
 import { s as e } from "./defaultFallbacks-SQ45vAhz.js";
-import { _ as t, a as n, g as r, m as i, n as a, p as o, s, t as c } from "./routerState-DAT472IC.js";
-import { C as l, a as u, c as d, o as f, t as p, x as m } from "./serverContext-CzmZZwuQ.js";
-import { createElement as h } from "react";
-import { ServerRequestContext as g, makePreloadSeedBag as _, makeStoreSeedBag as v, seedPreloadedSubscription as y, seedPreloadedSubscriptionFailure as b, setPreloadSeedResolver as x, setStoreSeedResolver as S } from "@voltro/client";
-import { renderToPipeableStream as C, renderToString as w } from "react-dom/server";
-import { AsyncLocalStorage as T } from "node:async_hooks";
+import { _ as t, a as n, f as r, h as i, m as a, n as o, s, t as c, u as l, v as u } from "./routerState-Cr6fTbka.js";
+import { C as d, a as f, c as p, o as m, t as h, x as g } from "./serverContext-BwzZ6Q7d.js";
+import { createElement as _ } from "react";
+import { ServerRequestContext as v, makePreloadSeedBag as y, makeStoreSeedBag as b, seedPreloadedSubscription as x, seedPreloadedSubscriptionFailure as S, setPreloadSeedResolver as C, setStoreSeedResolver as w } from "@voltro/client";
+import { renderToPipeableStream as T, renderToString as E } from "react-dom/server";
+import { AsyncLocalStorage as D } from "node:async_hooks";
 //#region src/storeSeedScope.ts
-var E = new T();
-S(() => E.getStore()?.store ?? null), x(() => E.getStore()?.preload ?? null);
-var D = async (e) => {
+var O = new D();
+w(() => O.getStore()?.store ?? null), C(() => O.getStore()?.preload ?? null);
+var k = async (e) => {
 	let t = {
-		store: v(),
-		preload: _()
+		store: b(),
+		preload: y()
 	};
 	return {
-		result: await E.run(t, e),
+		result: await O.run(t, e),
 		storeSeeds: t.store.seeds,
 		preloadSeeds: t.preload.seeds
 	};
-}, O = () => {
+}, A = () => {
 	let e = {
-		store: v(),
-		preload: _()
+		store: b(),
+		preload: y()
 	};
-	return E.enterWith(e), e.store;
-}, k = () => E.getStore()?.store.seeds ?? null, A = () => E.getStore()?.preload.seeds ?? null, j = (e) => {
-	let t = k(), r = A(), i = e.storeSeeds !== void 0 || t === null || t.length === 0 ? e : {
+	return O.enterWith(e), e.store;
+}, j = () => O.getStore()?.store.seeds ?? null, M = () => O.getStore()?.preload.seeds ?? null, N = (e) => {
+	let t = j(), r = M(), i = e.storeSeeds !== void 0 || t === null || t.length === 0 ? e : {
 		...e,
 		storeSeeds: t
 	};
@@ -33,19 +33,19 @@ var D = async (e) => {
 		...i,
 		preloadSeeds: r
 	});
-}, M = (e, t, n, r, i) => {
-	let a = h(u.Provider, { value: i ? n : f }, h(e));
+}, P = (e, t, n, r, i) => {
+	let a = _(f.Provider, { value: i ? n : m }, _(e));
 	if (!t) return a;
 	for (let e = t.length - 1; e >= 0; e--) {
 		let n = t[e];
 		if (n.Layout) {
 			let t = n.Layout;
-			a = h(u.Provider, { value: n.loader === void 0 ? f : r(e) }, h(t, { children: a }));
+			a = _(f.Provider, { value: n.loader === void 0 ? m : r(e) }, _(t, { children: a }));
 		}
 	}
 	return a;
-}, N = (t) => {
-	let { descriptor: n, params: r, pathname: i, search: a, loaderData: o, segmentLoaderData: s, requestContext: c, outerWrap: u, locale: f, pageSlot: p } = t, _ = l(n.meta, r, o, f), v = {
+}, F = (t) => {
+	let { descriptor: n, params: r, pathname: i, search: a, loaderData: o, segmentLoaderData: s, requestContext: c, outerWrap: l, locale: u, pageSlot: f } = t, m = d(n.meta, r, o, u), h = {
 		pathname: i,
 		search: a ?? "",
 		params: r,
@@ -56,26 +56,26 @@ var D = async (e) => {
 		prefetch: () => {},
 		registerBlocker: () => () => {},
 		blocked: null
-	}, y = p ? d : n.Component;
+	}, y = f ? p : n.Component;
 	if (!y) throw Error(`SSR received a descriptor with no Component for "${i}". Lazy page routes are a client-only optimization and must not be used on the server.`);
-	let b = m(v, M(y, n.chain, p ? void 0 : o, (e) => s?.[e], !p && n.loader !== void 0));
-	return b = h(e, {
+	let b = g(h, P(y, n.chain, f ? void 0 : o, (e) => s?.[e], !f && n.loader !== void 0));
+	return b = _(e, {
 		chrome: null,
 		children: b
-	}), c && (b = h(g.Provider, { value: c }, b)), u && (b = u(b)), {
+	}), c && (b = _(v.Provider, { value: c }, b)), l && (b = l(b)), {
 		tree: b,
-		meta: _
+		meta: m
 	};
-}, P = (e) => {
-	let { tree: t, meta: n } = N(e);
+}, I = (e) => {
+	let { tree: t, meta: n } = F(e);
 	return {
-		html: w(t),
+		html: E(t),
 		meta: n
 	};
-}, F = (e) => {
-	let { tree: t, meta: n } = N(e);
+}, L = (e) => {
+	let { tree: t, meta: n } = F(e);
 	return {
-		stream: C(t, {
+		stream: T(t, {
 			...e.bootstrapModules ? { bootstrapModules: [...e.bootstrapModules] } : {},
 			...e.nonce === void 0 ? {} : { nonce: e.nonce },
 			...e.onShellReady ? { onShellReady: e.onShellReady } : {},
@@ -84,20 +84,20 @@ var D = async (e) => {
 		}),
 		meta: n
 	};
-}, I = (e) => {
+}, R = (e) => {
 	if (!e) return "";
 	let t = [];
-	if (typeof e.title == "string" && t.push(`<title>${L(e.title)}</title>`), e.description && t.push(`<meta name="description" content="${R(e.description)}" />`), e.noIndex && t.push("<meta name=\"robots\" content=\"noindex, nofollow\" />"), e.canonical && t.push(`<link rel="canonical" href="${R(e.canonical)}" />`), e.tags) for (let n of e.tags) {
-		let e = n.name ? `name="${R(n.name)}"` : n.property ? `property="${R(n.property)}"` : "";
-		e && t.push(`<meta ${e} content="${R(n.content)}" />`);
+	if (typeof e.title == "string" && t.push(`<title>${z(e.title)}</title>`), e.description && t.push(`<meta name="description" content="${B(e.description)}" />`), e.noIndex && t.push("<meta name=\"robots\" content=\"noindex, nofollow\" />"), e.canonical && t.push(`<link rel="canonical" href="${B(e.canonical)}" />`), e.tags) for (let n of e.tags) {
+		let e = n.name ? `name="${B(n.name)}"` : n.property ? `property="${B(n.property)}"` : "";
+		e && t.push(`<meta ${e} content="${B(n.content)}" />`);
 	}
 	if (e.links) for (let n of e.links) {
 		let e = [
-			`rel="${R(n.rel)}"`,
-			`href="${R(n.href)}"`,
-			n.hreflang ? `hreflang="${R(n.hreflang)}"` : "",
-			n.type ? `type="${R(n.type)}"` : "",
-			n.title ? `title="${R(n.title)}"` : ""
+			`rel="${B(n.rel)}"`,
+			`href="${B(n.href)}"`,
+			n.hreflang ? `hreflang="${B(n.hreflang)}"` : "",
+			n.type ? `type="${B(n.type)}"` : "",
+			n.title ? `title="${B(n.title)}"` : ""
 		].filter(Boolean).join(" ");
 		t.push(`<link ${e} />`);
 	}
@@ -106,6 +106,6 @@ var D = async (e) => {
 		t.push(`<script type="application/ld+json" data-voltro-page-jsonld>${e}<\/script>`);
 	}
 	return t.join("\n    ");
-}, L = (e) => e.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"), R = (e) => e.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+}, z = (e) => e.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"), B = (e) => e.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
 //#endregion
-export { c as ROUTER_STATE_SCRIPT_ID, s as assertDeferralSupported, O as beginStoreSeeds, A as currentPreloadSeeds, k as currentStoreSeeds, a as encodeRouterState, o as isDeferredLoaderResult, p as parseCookieHeader, i as prepareDeferredLoaderData, r as renderDeferredRegistryScript, I as renderMetaToHtml, P as renderPageToHtml, F as renderPageToStream, j as renderRouterStateScript, y as seedPreloadedSubscription, b as seedPreloadedSubscriptionFailure, t as serialiseStateForInlining, D as withStoreSeeds };
+export { c as ROUTER_STATE_SCRIPT_ID, s as assertDeferralSupported, A as beginStoreSeeds, M as currentPreloadSeeds, j as currentStoreSeeds, l as deferredId, r as deferredSettleScript, o as encodeRouterState, a as isDeferredLoaderResult, h as parseCookieHeader, i as prepareDeferredLoaderData, t as renderDeferredRegistryScript, R as renderMetaToHtml, I as renderPageToHtml, L as renderPageToStream, N as renderRouterStateScript, x as seedPreloadedSubscription, S as seedPreloadedSubscriptionFailure, u as serialiseStateForInlining, k as withStoreSeeds };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/web",
-  "version": "0.52.0",
+  "version": "0.54.0",
   "description": "The Voltro web framework — file-based routing, render modes (SSR / SSG / islands), the page-export contract, data hooks, and the browser mount.",
   "keywords": [
     "voltro",
@@ -63,8 +63,8 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/client": "0.52.0",
-    "@voltro/ui": "0.52.0"
+    "@voltro/client": "0.54.0",
+    "@voltro/ui": "0.54.0"
   },
   "peerDependencies": {
     "@effect/platform": "^0.97.0",