@webtypen/webframez-react 0.0.32 → 0.0.33

package/dist/client.cjs

@@ -1 +1 @@
-var M=Object.create;var m=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var F=Object.getOwnPropertyNames;var q=Object.getPrototypeOf,G=Object.prototype.hasOwnProperty;var Y=(e,t)=>{for(var n in t)m(e,n,{get:t[n],enumerable:!0})},S=(e,t,n,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of F(t))!G.call(e,r)&&r!==n&&m(e,r,{get:()=>t[r],enumerable:!(o=D(t,r))||o.enumerable});return e};var Z=(e,t,n)=>(n=e!=null?M(q(e)):{},S(t||!e||!e.__esModule?m(n,"default",{value:e,enumerable:!0}):n,e)),j=e=>S(m({},"__esModule",{value:!0}),e);var ce={};Y(ce,{mountWebframezClient:()=>ue,useCookie:()=>ne,useRouter:()=>oe});module.exports=j(ce);var a=Z(require("react"),1),b=require("react-dom/client"),l=require("react-server-dom-webpack/client");var X=/^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;function u(e){if(typeof e!="string")return;let t=e.trim();return!t||t==="/"?"":t.replace(/\/+$/,"")}function y(e,t){let n=e.trim(),o=u(t);return!n||!o||X.test(n)||n.startsWith("/")||o!=="/"&&(n===o||n.startsWith(`${o}/`))?n:o==="/"?n.startsWith("/")?n:`/${n}`:n.startsWith("/")?`${o}${n}`:`${o}/${n}`}function v(e,t){if(!e)return;let n=u(e.basename)??u(t),o=u(e.routeBasePath),r=u(e.transportBasePath),i={...e,...n!==void 0?{basename:n}:{},...o!==void 0?{routeBasePath:o}:{},...r!==void 0?{transportBasePath:r}:{}};return i.favicon&&(i.favicon=y(i.favicon,n)),i.links&&(i.links=i.links.map(c=>({...c,href:y(c.href,n)}))),i}var d=require("react/jsx-runtime"),K={push:()=>{},replace:()=>{},refresh:()=>{}},p=typeof a.default.createContext=="function"?a.default.createContext(null):null,N="__WEBFRAMEZ_ROUTER__",V="[data-webframez-head='true']";function w(e){return u(e)??""}function J(e,t){return t?e===t?"/":e.startsWith(`${t}/`)?e.slice(t.length)||"/":e||"/":e||"/"}function k(e,t){let n=!t||t==="/"?"/":t.startsWith("/")?t:`/${t}`;return e?n==="/"?e:`${e}${n}`:n}function Q(){return w(typeof window>"u"?globalThis.__RSC_ROUTE_BASE_PATH:window.__RSC_ROUTE_BASE_PATH)}function H(e){if(typeof window>"u")return e||"/";let t=w(window.__RSC_BASENAME),n=Q(),o=J(e||"/",t);return k(n,o)}function U(e){if(typeof window>"u")return e;let t=window.__RSC_ENDPOINT;return typeof t=="string"&&t.trim()!==""?t:e}function ee(){return typeof window>"u"?null:window[N]??null}function te(e){typeof window>"u"||(window[N]=e)}function T(){let e={},t=typeof document>"u"?"":document.cookie;if(!t||t.trim()==="")return e;for(let n of t.split(";")){let o=n.trim();if(!o)continue;let r=o.indexOf("="),i=r>=0?o.slice(0,r).trim():o,c=r>=0?o.slice(r+1):"";i&&(e[i]=decodeURIComponent(c))}return e}function B(e,t,n={}){let o=[`${e}=${encodeURIComponent(t)}`];return n.path&&o.push(`Path=${n.path}`),n.domain&&o.push(`Domain=${n.domain}`),typeof n.maxAge=="number"&&o.push(`Max-Age=${Math.floor(n.maxAge)}`),n.expires&&o.push(`Expires=${n.expires.toUTCString()}`),n.sameSite&&o.push(`SameSite=${n.sameSite}`),n.secure&&o.push("Secure"),o.join("; ")}function ne(){return a.default.useMemo(()=>({all:()=>T(),get:e=>T()[e],set:(e,t,n)=>{typeof document>"u"||(document.cookie=B(e,t,n))},remove:(e,t)=>{typeof document>"u"||(document.cookie=B(e,"",{...t??{},maxAge:0}))}}),[])}function oe(){let e=p?a.default.useContext(p):null;if(!e){let t=ee();if(t)return t;if(typeof window>"u")return K;throw new Error("useRouter must be used inside mountWebframezClient()")}return e}function re({active:e}){return(0,d.jsx)("div",{style:{position:"fixed",top:0,left:0,width:"100%",height:3,zIndex:9999,transformOrigin:"left",transform:e?"scaleX(1)":"scaleX(0)",transition:"transform 180ms ease",background:"linear-gradient(90deg, #0ea5e9, #22c55e)"}})}function x(e){let t=document.createElement("meta");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,r]of n)t.setAttribute(o,String(r));document.head.appendChild(t)}function O(e){let t=document.createElement("link");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,r]of n)t.setAttribute(o,String(r));document.head.appendChild(t)}function I(e){if(typeof document>"u")return;let t=v(e)??e,n=u(t.basename),o=u(t.routeBasePath),r=u(t.transportBasePath);window.__RSC_BASENAME=n??"",window.__RSC_ROUTE_BASE_PATH=o??"",r!==void 0&&(window.__RSC_ENDPOINT=k(r,"/rsc")),document.title=t.title||"Webframez React";for(let i of document.head.querySelectorAll(V))i.remove();t.description&&x({name:"description",content:t.description}),t.favicon&&O({rel:"icon",href:t.favicon});for(let i of t.meta??[])x(i);for(let i of t.links??[])O(i)}function ie(e){let t=new TextEncoder;return new ReadableStream({start(n){n.enqueue(t.encode(e)),n.close()}})}function ae(){if(typeof window>"u")return null;let e=window.__RSC_INITIAL_PAYLOAD;return typeof e!="string"||e===""?null:(delete window.__RSC_INITIAL_PAYLOAD,(0,l.createFromReadableStream)(ie(e)))}function se(e){let t=U(e),n=H(window.location.pathname);return ae()??(0,l.createFromFetch)(fetch(`${t}?path=${encodeURIComponent(n)}&search=${encodeURIComponent(window.location.search)}`,{headers:{Accept:"text/x-component"}}))}function de(e,t){return function(){let o=a.default.use(e),[r,i]=(0,a.useState)(o.model),[c,R]=(0,a.useState)(o.head),[$,h]=(0,a.useState)(!1),[L,z]=(0,a.useState)(!1);async function f(s,E="push"){h(!0);try{let g=U(t),W=H(s.pathname),_=await(0,l.createFromFetch)(fetch(`${g}?path=${encodeURIComponent(W)}&search=${encodeURIComponent(s.search)}`,{headers:{Accept:"text/x-component"}}));I(_.head),R(_.head),i(_.model);let P=`${s.pathname}${s.search}`;E==="replace"?history.replaceState(null,"",P):E==="push"&&history.pushState(null,"",P)}catch(g){console.error("[webframez-react] Failed to render route",g),i((0,d.jsx)("p",{children:"Failed to load route."}))}finally{h(!1)}}(0,a.useEffect)(()=>{I(c)},[c]),(0,a.useEffect)(()=>{z(!0);let s=()=>{f(new URL(window.location.href),"none")};return window.addEventListener("popstate",s),()=>{window.removeEventListener("popstate",s)}},[]);let C=a.default.useMemo(()=>({push:s=>{f(new URL(s,window.location.origin),"push")},replace:s=>{f(new URL(s,window.location.origin),"replace")},refresh:()=>{f(new URL(window.location.href),"none")}}),[]);te(C);let A=(0,d.jsxs)(d.Fragment,{children:[L?(0,d.jsx)(re,{active:$}):null,r??(0,d.jsx)("p",{style:{padding:24},children:"Loading..."})]});return p?(0,d.jsx)(p.Provider,{value:C,children:A}):A}}function ue(e={}){let t=e.rootId??"root",n=document.getElementById(t);if(!n)throw new Error(`Missing #${t} element`);let o=typeof window<"u"&&window.__RSC_ENDPOINT,r=e.rscEndpoint??o??"/rsc",i=se(r),c=de(i,r);return(0,b.hydrateRoot)(n,(0,d.jsx)(c,{}))}
+var ae=Object.create;var y=Object.defineProperty;var se=Object.getOwnPropertyDescriptor;var ce=Object.getOwnPropertyNames;var de=Object.getPrototypeOf,ue=Object.prototype.hasOwnProperty;var le=(e,t)=>{for(var n in t)y(e,n,{get:t[n],enumerable:!0})},L=(e,t,n,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of ce(t))!ue.call(e,r)&&r!==n&&y(e,r,{get:()=>t[r],enumerable:!(o=se(t,r))||o.enumerable});return e};var H=(e,t,n)=>(n=e!=null?ae(de(e)):{},L(t||!e||!e.__esModule?y(n,"default",{value:e,enumerable:!0}):n,e)),fe=e=>L(y({},"__esModule",{value:!0}),e);var ve={};le(ve,{mountWebframezClient:()=>xe,useCookie:()=>ye,useRouter:()=>Ee});module.exports=fe(ve);var s=H(require("react"),1),Y=require("react-dom/client"),g=require("react-server-dom-webpack/client"),Z=require("@webtypen/webframez-react/route-slot");var pe=/^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;function u(e){if(typeof e!="string")return;let t=e.trim();return!t||t==="/"?"":t.replace(/\/+$/,"")}function U(e,t){let n=e.trim(),o=u(t);return!n||!o||pe.test(n)||n.startsWith("/")||o!=="/"&&(n===o||n.startsWith(`${o}/`))?n:o==="/"?n.startsWith("/")?n:`/${n}`:n.startsWith("/")?`${o}${n}`:`${o}/${n}`}function S(e,t){if(!e)return;let n=u(e.basename)??u(t),o=u(e.routeBasePath),r=u(e.transportBasePath),a={...e,...n!==void 0?{basename:n}:{},...o!==void 0?{routeBasePath:o}:{},...r!==void 0?{transportBasePath:r}:{}};return a.favicon&&(a.favicon=U(a.favicon,n)),a.links&&(a.links=a.links.map(c=>({...c,href:U(c.href,n)}))),a}var R=H(require("react"),1),$="webframez-route-children",W="__webframezRouteChildren",D="WebframezRouteChildren",N=()=>R.default.createElement($);N.displayName=D;N[W]=!0;var me=N;function z(e){if(e===$||e===me)return!0;if(!e||typeof e!="function"&&typeof e!="object")return!1;try{let t=e;return t[W]===!0||t.displayName===D||t.name==="RouteChildren"}catch{return!1}}function M(e){if(!e||typeof e!="object")return!1;try{return"type"in e&&"props"in e}catch{return!1}}function E(e,t){if(e==null||typeof e=="boolean")return e;if(Array.isArray(e)){let m=!1,f=e.map(p=>{let h=E(p,t);return h!==p&&(m=!0),h});return m?f:e}if(M(e)&&z(e.type))return t;let n=R.default.isValidElement(e);if(!n&&!M(e))return e;if(n&&z(e.type))return t;let o=e.props??{};if(!("children"in o))return e;let r=E(o.children,t);if(r===o.children)return e;if(n)return Array.isArray(r)?R.default.cloneElement(e,void 0,...r):R.default.cloneElement(e,void 0,r);let a=e,c={...a.props??{},children:r,...a.key!==void 0&&a.key!==null?{key:a.key}:{}};return R.default.createElement(a.type,c)}var d=require("react/jsx-runtime"),Re={push:()=>{},replace:()=>{},refresh:()=>{},refreshContext:()=>{}},A=typeof s.default.createContext=="function"?s.default.createContext(null):null,K="__WEBFRAMEZ_ROUTER__",ge="[data-webframez-head='true']";function v(e){return u(e)??""}function he(e,t){return t?e===t?"/":e.startsWith(`${t}/`)?e.slice(t.length)||"/":e||"/":e||"/"}function V(e,t){let n=!t||t==="/"?"/":t.startsWith("/")?t:`/${t}`;return e?n==="/"?e:`${e}${n}`:n}function _e(){return v(typeof window>"u"?globalThis.__RSC_ROUTE_BASE_PATH:window.__RSC_ROUTE_BASE_PATH)}function X(e){if(typeof window>"u")return e||"/";let t=v(window.__RSC_BASENAME),n=_e(),o=he(e||"/",t);return V(n,o)}function J(e){if(typeof window>"u")return e;let t=window.__RSC_ENDPOINT;return typeof t=="string"&&t.trim()!==""?t:e}function we(){return typeof window>"u"?null:window[K]??null}function Ce(e){typeof window>"u"||(window[K]=e)}function F(){let e={},t=typeof document>"u"?"":document.cookie;if(!t||t.trim()==="")return e;for(let n of t.split(";")){let o=n.trim();if(!o)continue;let r=o.indexOf("="),a=r>=0?o.slice(0,r).trim():o,c=r>=0?o.slice(r+1):"";a&&(e[a]=decodeURIComponent(c))}return e}function j(e,t,n={}){let o=[`${e}=${encodeURIComponent(t)}`];return n.path&&o.push(`Path=${n.path}`),n.domain&&o.push(`Domain=${n.domain}`),typeof n.maxAge=="number"&&o.push(`Max-Age=${Math.floor(n.maxAge)}`),n.expires&&o.push(`Expires=${n.expires.toUTCString()}`),n.sameSite&&o.push(`SameSite=${n.sameSite}`),n.secure&&o.push("Secure"),o.join("; ")}function ye(){return s.default.useMemo(()=>({all:()=>F(),get:e=>F()[e],set:(e,t,n)=>{typeof document>"u"||(document.cookie=j(e,t,n))},remove:(e,t)=>{typeof document>"u"||(document.cookie=j(e,"",{...t??{},maxAge:0}))}}),[])}function Ee(){let e=A?s.default.useContext(A):null;if(!e){let t=we();if(t)return t;if(typeof window>"u")return Re;throw new Error("useRouter must be used inside mountWebframezClient()")}return e}function Ae({active:e}){return(0,d.jsx)("div",{style:{position:"fixed",top:0,left:0,width:"100%",height:3,zIndex:9999,transformOrigin:"left",transform:e?"scaleX(1)":"scaleX(0)",transition:"transform 180ms ease",background:"linear-gradient(90deg, #0ea5e9, #22c55e)"}})}function G(e){let t=document.createElement("meta");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,r]of n)t.setAttribute(o,String(r));document.head.appendChild(t)}function q(e){let t=document.createElement("link");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,r]of n)t.setAttribute(o,String(r));document.head.appendChild(t)}function x(e){if(typeof document>"u")return;let t=S(e)??e;Q(t),document.title=t.title||"Webframez React";for(let n of document.head.querySelectorAll(ge))n.remove();t.description&&G({name:"description",content:t.description}),t.favicon&&q({rel:"icon",href:t.favicon});for(let n of t.meta??[])G(n);for(let n of t.links??[])q(n)}function Q(e){if(typeof window>"u")return;let t=S(e)??e,n=u(t.basename),o=u(t.routeBasePath),r=u(t.transportBasePath);window.__RSC_BASENAME=n??"",window.__RSC_ROUTE_BASE_PATH=o??"",r!==void 0&&(window.__RSC_ENDPOINT=V(r,"/rsc"))}function Pe(e){let t=new TextEncoder;return new ReadableStream({start(n){n.enqueue(t.encode(e)),n.close()}})}function Te(){if(typeof window>"u")return null;let e=window.__RSC_INITIAL_PAYLOAD;return typeof e!="string"||e===""?null:(delete window.__RSC_INITIAL_PAYLOAD,(0,g.createFromReadableStream)(Pe(e)))}function Se(e){let t=J(e),n=X(window.location.pathname);return Te()??(0,g.createFromFetch)(fetch(`${t}?path=${encodeURIComponent(n)}&search=${encodeURIComponent(window.location.search)}`,{cache:"no-store",credentials:"same-origin",headers:{Accept:"text/x-component"}}))}function Ne(e,t){return function(){let o=s.default.use(e),r=typeof o.contextModel<"u"&&typeof o.pageModel<"u",[a,c]=(0,s.useState)(o.model),[m,f]=(0,s.useState)(o.contextModel),[p,h]=(0,s.useState)(o.pageModel),[I,b]=(0,s.useState)(o.head),[ee,_]=(0,s.useState)(!1),[te,ne]=(0,s.useState)(!1),[oe,P]=(0,s.useState)(r);async function O(i){let C=J(t),l=X(i.pathname);return await(0,g.createFromFetch)(fetch(`${C}?path=${encodeURIComponent(l)}&search=${encodeURIComponent(i.search)}`,{cache:"no-store",credentials:"same-origin",headers:{Accept:"text/x-component"}}))}async function w(i,C="push"){_(!0);try{let l=await O(i);x(l.head),b(l.head),c(l.model),f(l.contextModel),h(l.pageModel),P(!0);let T=`${i.pathname}${i.search}`;C==="replace"?history.replaceState(null,"",T):C==="push"&&history.pushState(null,"",T)}catch(l){console.error("[webframez-react] Failed to render route",l),c((0,d.jsx)("p",{children:"Failed to load route."}))}finally{_(!1)}}async function re(){_(!0);try{let i=await O(new URL(window.location.href));if(x(i.head),b(i.head),Object.prototype.hasOwnProperty.call(i,"contextModel")){f(i.contextModel),P(!0);return}c(i.model),P(!1)}catch(i){console.error("[webframez-react] Failed to refresh route context",i)}finally{_(!1)}}(0,s.useEffect)(()=>{x(I)},[I]),(0,s.useEffect)(()=>{ne(!0);let i=()=>{w(new URL(window.location.href),"none")};return window.addEventListener("popstate",i),()=>{window.removeEventListener("popstate",i)}},[]);let k=s.default.useMemo(()=>({push:i=>{w(new URL(i,window.location.origin),"push")},replace:i=>{w(new URL(i,window.location.origin),"replace")},refresh:()=>{w(new URL(window.location.href),"none")},refreshContext:()=>{re()}}),[]);Ce(k);let ie=oe&&typeof p<"u"?m?(0,d.jsx)(Z.RouteChildrenSlotProvider,{page:p,children:E(m,p)}):p:a,B=(0,d.jsxs)(d.Fragment,{children:[te?(0,d.jsx)(Ae,{active:ee}):null,ie??(0,d.jsx)("p",{style:{padding:24},children:"Loading..."})]});return A?(0,d.jsx)(A.Provider,{value:k,children:B}):B}}function xe(e={}){let t=e.rootId??"root",n=document.getElementById(t);if(!n)throw new Error(`Missing #${t} element`);let o=typeof window<"u"&&window.__RSC_ENDPOINT,r=e.rscEndpoint??o??"/rsc",a=Promise.resolve(Se(r)).then(f=>(f?.head&&Q(f.head),f)),c=Ne(a,r);return(0,Y.hydrateRoot)(n,(0,d.jsx)(c,{}))}

package/dist/client.d.ts

@@ -9,6 +9,7 @@ export type RouterClient = {
   push: (href: string) => void;
   replace: (href: string) => void;
   refresh: () => void;
+  refreshContext: () => void;
 };
 
 export type CookieOptions = {

package/dist/client.js

@@ -1 +1 @@
-import c,{useEffect as y,useState as f}from"react";import{hydrateRoot as M}from"react-dom/client";import{createFromFetch as I,createFromReadableStream as D}from"react-server-dom-webpack/client";var W=/^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;function s(e){if(typeof e!="string")return;let t=e.trim();return!t||t==="/"?"":t.replace(/\/+$/,"")}function P(e,t){let n=e.trim(),o=s(t);return!n||!o||W.test(n)||n.startsWith("/")||o!=="/"&&(n===o||n.startsWith(`${o}/`))?n:o==="/"?n.startsWith("/")?n:`/${n}`:n.startsWith("/")?`${o}${n}`:`${o}/${n}`}function S(e,t){if(!e)return;let n=s(e.basename)??s(t),o=s(e.routeBasePath),i=s(e.transportBasePath),r={...e,...n!==void 0?{basename:n}:{},...o!==void 0?{routeBasePath:o}:{},...i!==void 0?{transportBasePath:i}:{}};return r.favicon&&(r.favicon=P(r.favicon,n)),r.links&&(r.links=r.links.map(d=>({...d,href:P(d.href,n)}))),r}import{Fragment as ee,jsx as u,jsxs as te}from"react/jsx-runtime";var F={push:()=>{},replace:()=>{},refresh:()=>{}},m=typeof c.createContext=="function"?c.createContext(null):null,b="__WEBFRAMEZ_ROUTER__",q="[data-webframez-head='true']";function _(e){return s(e)??""}function G(e,t){return t?e===t?"/":e.startsWith(`${t}/`)?e.slice(t.length)||"/":e||"/":e||"/"}function N(e,t){let n=!t||t==="/"?"/":t.startsWith("/")?t:`/${t}`;return e?n==="/"?e:`${e}${n}`:n}function Y(){return _(typeof window>"u"?globalThis.__RSC_ROUTE_BASE_PATH:window.__RSC_ROUTE_BASE_PATH)}function k(e){if(typeof window>"u")return e||"/";let t=_(window.__RSC_BASENAME),n=Y(),o=G(e||"/",t);return N(n,o)}function H(e){if(typeof window>"u")return e;let t=window.__RSC_ENDPOINT;return typeof t=="string"&&t.trim()!==""?t:e}function Z(){return typeof window>"u"?null:window[b]??null}function j(e){typeof window>"u"||(window[b]=e)}function v(){let e={},t=typeof document>"u"?"":document.cookie;if(!t||t.trim()==="")return e;for(let n of t.split(";")){let o=n.trim();if(!o)continue;let i=o.indexOf("="),r=i>=0?o.slice(0,i).trim():o,d=i>=0?o.slice(i+1):"";r&&(e[r]=decodeURIComponent(d))}return e}function T(e,t,n={}){let o=[`${e}=${encodeURIComponent(t)}`];return n.path&&o.push(`Path=${n.path}`),n.domain&&o.push(`Domain=${n.domain}`),typeof n.maxAge=="number"&&o.push(`Max-Age=${Math.floor(n.maxAge)}`),n.expires&&o.push(`Expires=${n.expires.toUTCString()}`),n.sameSite&&o.push(`SameSite=${n.sameSite}`),n.secure&&o.push("Secure"),o.join("; ")}function de(){return c.useMemo(()=>({all:()=>v(),get:e=>v()[e],set:(e,t,n)=>{typeof document>"u"||(document.cookie=T(e,t,n))},remove:(e,t)=>{typeof document>"u"||(document.cookie=T(e,"",{...t??{},maxAge:0}))}}),[])}function ue(){let e=m?c.useContext(m):null;if(!e){let t=Z();if(t)return t;if(typeof window>"u")return F;throw new Error("useRouter must be used inside mountWebframezClient()")}return e}function X({active:e}){return u("div",{style:{position:"fixed",top:0,left:0,width:"100%",height:3,zIndex:9999,transformOrigin:"left",transform:e?"scaleX(1)":"scaleX(0)",transition:"transform 180ms ease",background:"linear-gradient(90deg, #0ea5e9, #22c55e)"}})}function B(e){let t=document.createElement("meta");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,i]of n)t.setAttribute(o,String(i));document.head.appendChild(t)}function x(e){let t=document.createElement("link");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,i]of n)t.setAttribute(o,String(i));document.head.appendChild(t)}function O(e){if(typeof document>"u")return;let t=S(e)??e,n=s(t.basename),o=s(t.routeBasePath),i=s(t.transportBasePath);window.__RSC_BASENAME=n??"",window.__RSC_ROUTE_BASE_PATH=o??"",i!==void 0&&(window.__RSC_ENDPOINT=N(i,"/rsc")),document.title=t.title||"Webframez React";for(let r of document.head.querySelectorAll(q))r.remove();t.description&&B({name:"description",content:t.description}),t.favicon&&x({rel:"icon",href:t.favicon});for(let r of t.meta??[])B(r);for(let r of t.links??[])x(r)}function K(e){let t=new TextEncoder;return new ReadableStream({start(n){n.enqueue(t.encode(e)),n.close()}})}function V(){if(typeof window>"u")return null;let e=window.__RSC_INITIAL_PAYLOAD;return typeof e!="string"||e===""?null:(delete window.__RSC_INITIAL_PAYLOAD,D(K(e)))}function J(e){let t=H(e),n=k(window.location.pathname);return V()??I(fetch(`${t}?path=${encodeURIComponent(n)}&search=${encodeURIComponent(window.location.search)}`,{headers:{Accept:"text/x-component"}}))}function Q(e,t){return function(){let o=c.use(e),[i,r]=f(o.model),[d,w]=f(o.head),[U,R]=f(!1),[$,L]=f(!1);async function l(a,A="push"){R(!0);try{let p=H(t),z=k(a.pathname),g=await I(fetch(`${p}?path=${encodeURIComponent(z)}&search=${encodeURIComponent(a.search)}`,{headers:{Accept:"text/x-component"}}));O(g.head),w(g.head),r(g.model);let E=`${a.pathname}${a.search}`;A==="replace"?history.replaceState(null,"",E):A==="push"&&history.pushState(null,"",E)}catch(p){console.error("[webframez-react] Failed to render route",p),r(u("p",{children:"Failed to load route."}))}finally{R(!1)}}y(()=>{O(d)},[d]),y(()=>{L(!0);let a=()=>{l(new URL(window.location.href),"none")};return window.addEventListener("popstate",a),()=>{window.removeEventListener("popstate",a)}},[]);let h=c.useMemo(()=>({push:a=>{l(new URL(a,window.location.origin),"push")},replace:a=>{l(new URL(a,window.location.origin),"replace")},refresh:()=>{l(new URL(window.location.href),"none")}}),[]);j(h);let C=te(ee,{children:[$?u(X,{active:U}):null,i??u("p",{style:{padding:24},children:"Loading..."})]});return m?u(m.Provider,{value:h,children:C}):C}}function ce(e={}){let t=e.rootId??"root",n=document.getElementById(t);if(!n)throw new Error(`Missing #${t} element`);let o=typeof window<"u"&&window.__RSC_ENDPOINT,i=e.rscEndpoint??o??"/rsc",r=J(i),d=Q(r,i);return M(n,u(d,{}))}export{ce as mountWebframezClient,de as useCookie,ue as useRouter};
+import R,{useEffect as $,useState as f}from"react";import{hydrateRoot as ie}from"react-dom/client";import{createFromFetch as G,createFromReadableStream as ae}from"react-server-dom-webpack/client";import{RouteChildrenSlotProvider as se}from"@webtypen/webframez-react/route-slot";var oe=/^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;function c(e){if(typeof e!="string")return;let t=e.trim();return!t||t==="/"?"":t.replace(/\/+$/,"")}function B(e,t){let n=e.trim(),o=c(t);return!n||!o||oe.test(n)||n.startsWith("/")||o!=="/"&&(n===o||n.startsWith(`${o}/`))?n:o==="/"?n.startsWith("/")?n:`/${n}`:n.startsWith("/")?`${o}${n}`:`${o}/${n}`}function T(e,t){if(!e)return;let n=c(e.basename)??c(t),o=c(e.routeBasePath),r=c(e.transportBasePath),a={...e,...n!==void 0?{basename:n}:{},...o!==void 0?{routeBasePath:o}:{},...r!==void 0?{transportBasePath:r}:{}};return a.favicon&&(a.favicon=B(a.favicon,n)),a.links&&(a.links=a.links.map(s=>({...s,href:B(s.href,n)}))),a}import g from"react";var U="webframez-route-children",z="__webframezRouteChildren",M="WebframezRouteChildren",S=()=>g.createElement(U);S.displayName=M;S[z]=!0;var re=S;function L(e){if(e===U||e===re)return!0;if(!e||typeof e!="function"&&typeof e!="object")return!1;try{let t=e;return t[z]===!0||t.displayName===M||t.name==="RouteChildren"}catch{return!1}}function H(e){if(!e||typeof e!="object")return!1;try{return"type"in e&&"props"in e}catch{return!1}}function y(e,t){if(e==null||typeof e=="boolean")return e;if(Array.isArray(e)){let m=!1,u=e.map(l=>{let h=y(l,t);return h!==l&&(m=!0),h});return m?u:e}if(H(e)&&L(e.type))return t;let n=g.isValidElement(e);if(!n&&!H(e))return e;if(n&&L(e.type))return t;let o=e.props??{};if(!("children"in o))return e;let r=y(o.children,t);if(r===o.children)return e;if(n)return Array.isArray(r)?g.cloneElement(e,void 0,...r):g.cloneElement(e,void 0,r);let a=e,s={...a.props??{},children:r,...a.key!==void 0&&a.key!==null?{key:a.key}:{}};return g.createElement(a.type,s)}import{Fragment as we,jsx as p,jsxs as Ce}from"react/jsx-runtime";var ce={push:()=>{},replace:()=>{},refresh:()=>{},refreshContext:()=>{}},E=typeof R.createContext=="function"?R.createContext(null):null,q="__WEBFRAMEZ_ROUTER__",de="[data-webframez-head='true']";function x(e){return c(e)??""}function ue(e,t){return t?e===t?"/":e.startsWith(`${t}/`)?e.slice(t.length)||"/":e||"/":e||"/"}function Y(e,t){let n=!t||t==="/"?"/":t.startsWith("/")?t:`/${t}`;return e?n==="/"?e:`${e}${n}`:n}function le(){return x(typeof window>"u"?globalThis.__RSC_ROUTE_BASE_PATH:window.__RSC_ROUTE_BASE_PATH)}function Z(e){if(typeof window>"u")return e||"/";let t=x(window.__RSC_BASENAME),n=le(),o=ue(e||"/",t);return Y(n,o)}function K(e){if(typeof window>"u")return e;let t=window.__RSC_ENDPOINT;return typeof t=="string"&&t.trim()!==""?t:e}function fe(){return typeof window>"u"?null:window[q]??null}function pe(e){typeof window>"u"||(window[q]=e)}function W(){let e={},t=typeof document>"u"?"":document.cookie;if(!t||t.trim()==="")return e;for(let n of t.split(";")){let o=n.trim();if(!o)continue;let r=o.indexOf("="),a=r>=0?o.slice(0,r).trim():o,s=r>=0?o.slice(r+1):"";a&&(e[a]=decodeURIComponent(s))}return e}function D(e,t,n={}){let o=[`${e}=${encodeURIComponent(t)}`];return n.path&&o.push(`Path=${n.path}`),n.domain&&o.push(`Domain=${n.domain}`),typeof n.maxAge=="number"&&o.push(`Max-Age=${Math.floor(n.maxAge)}`),n.expires&&o.push(`Expires=${n.expires.toUTCString()}`),n.sameSite&&o.push(`SameSite=${n.sameSite}`),n.secure&&o.push("Secure"),o.join("; ")}function Ie(){return R.useMemo(()=>({all:()=>W(),get:e=>W()[e],set:(e,t,n)=>{typeof document>"u"||(document.cookie=D(e,t,n))},remove:(e,t)=>{typeof document>"u"||(document.cookie=D(e,"",{...t??{},maxAge:0}))}}),[])}function be(){let e=E?R.useContext(E):null;if(!e){let t=fe();if(t)return t;if(typeof window>"u")return ce;throw new Error("useRouter must be used inside mountWebframezClient()")}return e}function me({active:e}){return p("div",{style:{position:"fixed",top:0,left:0,width:"100%",height:3,zIndex:9999,transformOrigin:"left",transform:e?"scaleX(1)":"scaleX(0)",transition:"transform 180ms ease",background:"linear-gradient(90deg, #0ea5e9, #22c55e)"}})}function F(e){let t=document.createElement("meta");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,r]of n)t.setAttribute(o,String(r));document.head.appendChild(t)}function j(e){let t=document.createElement("link");t.setAttribute("data-webframez-head","true");let n=Object.entries(e).filter(([,o])=>!!o);for(let[o,r]of n)t.setAttribute(o,String(r));document.head.appendChild(t)}function N(e){if(typeof document>"u")return;let t=T(e)??e;V(t),document.title=t.title||"Webframez React";for(let n of document.head.querySelectorAll(de))n.remove();t.description&&F({name:"description",content:t.description}),t.favicon&&j({rel:"icon",href:t.favicon});for(let n of t.meta??[])F(n);for(let n of t.links??[])j(n)}function V(e){if(typeof window>"u")return;let t=T(e)??e,n=c(t.basename),o=c(t.routeBasePath),r=c(t.transportBasePath);window.__RSC_BASENAME=n??"",window.__RSC_ROUTE_BASE_PATH=o??"",r!==void 0&&(window.__RSC_ENDPOINT=Y(r,"/rsc"))}function Re(e){let t=new TextEncoder;return new ReadableStream({start(n){n.enqueue(t.encode(e)),n.close()}})}function ge(){if(typeof window>"u")return null;let e=window.__RSC_INITIAL_PAYLOAD;return typeof e!="string"||e===""?null:(delete window.__RSC_INITIAL_PAYLOAD,ae(Re(e)))}function he(e){let t=K(e),n=Z(window.location.pathname);return ge()??G(fetch(`${t}?path=${encodeURIComponent(n)}&search=${encodeURIComponent(window.location.search)}`,{cache:"no-store",credentials:"same-origin",headers:{Accept:"text/x-component"}}))}function _e(e,t){return function(){let o=R.use(e),r=typeof o.contextModel<"u"&&typeof o.pageModel<"u",[a,s]=f(o.model),[m,u]=f(o.contextModel),[l,h]=f(o.pageModel),[v,I]=f(o.head),[X,_]=f(!1),[J,Q]=f(!1),[ee,A]=f(r);async function b(i){let C=K(t),d=Z(i.pathname);return await G(fetch(`${C}?path=${encodeURIComponent(d)}&search=${encodeURIComponent(i.search)}`,{cache:"no-store",credentials:"same-origin",headers:{Accept:"text/x-component"}}))}async function w(i,C="push"){_(!0);try{let d=await b(i);N(d.head),I(d.head),s(d.model),u(d.contextModel),h(d.pageModel),A(!0);let P=`${i.pathname}${i.search}`;C==="replace"?history.replaceState(null,"",P):C==="push"&&history.pushState(null,"",P)}catch(d){console.error("[webframez-react] Failed to render route",d),s(p("p",{children:"Failed to load route."}))}finally{_(!1)}}async function te(){_(!0);try{let i=await b(new URL(window.location.href));if(N(i.head),I(i.head),Object.prototype.hasOwnProperty.call(i,"contextModel")){u(i.contextModel),A(!0);return}s(i.model),A(!1)}catch(i){console.error("[webframez-react] Failed to refresh route context",i)}finally{_(!1)}}$(()=>{N(v)},[v]),$(()=>{Q(!0);let i=()=>{w(new URL(window.location.href),"none")};return window.addEventListener("popstate",i),()=>{window.removeEventListener("popstate",i)}},[]);let O=R.useMemo(()=>({push:i=>{w(new URL(i,window.location.origin),"push")},replace:i=>{w(new URL(i,window.location.origin),"replace")},refresh:()=>{w(new URL(window.location.href),"none")},refreshContext:()=>{te()}}),[]);pe(O);let ne=ee&&typeof l<"u"?m?p(se,{page:l,children:y(m,l)}):l:a,k=Ce(we,{children:[J?p(me,{active:X}):null,ne??p("p",{style:{padding:24},children:"Loading..."})]});return E?p(E.Provider,{value:O,children:k}):k}}function Oe(e={}){let t=e.rootId??"root",n=document.getElementById(t);if(!n)throw new Error(`Missing #${t} element`);let o=typeof window<"u"&&window.__RSC_ENDPOINT,r=e.rscEndpoint??o??"/rsc",a=Promise.resolve(he(r)).then(u=>(u?.head&&V(u.head),u)),s=_e(a,r);return ie(n,p(s,{}))}export{Oe as mountWebframezClient,Ie as useCookie,be as useRouter};

package/dist/http.cjs

@@ -142,6 +142,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = (0, import_server.renderToPipeableStream)(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -151,6 +152,7 @@ function sendRSC(res, model, options = {}) {
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_module2 = __toESM(require("node:module"), 1);
 var import_node_path2 = __toESM(require("node:path"), 1);
+var import_route_slot = require("@webtypen/webframez-react/route-slot");
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -240,6 +242,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -255,13 +267,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!import_react.default.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = import_react.default.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -269,10 +285,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return import_react.default.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return import_react.default.cloneElement(node, void 0, ...nextChildren);
+    }
+    return import_react.default.cloneElement(node, void 0, nextChildren);
   }
-  return import_react.default.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return import_react.default.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -613,9 +638,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -735,9 +763,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -917,7 +948,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1384,6 +1429,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1406,6 +1453,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = import_node_fs2.default.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1429,6 +1477,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/dist/http.js

@@ -117,6 +117,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = renderToPipeableStream(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -126,6 +127,7 @@ function sendRSC(res, model, options = {}) {
 import fs from "node:fs";
 import Module from "node:module";
 import path2 from "node:path";
+import { RouteChildrenSlot } from "@webtypen/webframez-react/route-slot";
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -215,6 +217,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -230,13 +242,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!React.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = React.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -244,10 +260,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return React.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return React.cloneElement(node, void 0, ...nextChildren);
+    }
+    return React.cloneElement(node, void 0, nextChildren);
   }
-  return React.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return React.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -588,9 +613,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -710,9 +738,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -892,7 +923,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1359,6 +1404,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1381,6 +1428,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = fs2.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1404,6 +1452,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/dist/index.cjs

@@ -147,6 +147,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = (0, import_server.renderToPipeableStream)(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -184,6 +185,7 @@ function createRSCHandler(options) {
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_module2 = __toESM(require("node:module"), 1);
 var import_node_path2 = __toESM(require("node:path"), 1);
+var import_route_slot = require("@webtypen/webframez-react/route-slot");
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -273,6 +275,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -288,13 +300,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!import_react.default.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = import_react.default.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -302,10 +318,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return import_react.default.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return import_react.default.cloneElement(node, void 0, ...nextChildren);
+    }
+    return import_react.default.cloneElement(node, void 0, nextChildren);
   }
-  return import_react.default.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return import_react.default.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -646,9 +671,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -768,9 +796,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -954,7 +985,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1421,6 +1466,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1443,6 +1490,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = import_node_fs2.default.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1466,6 +1514,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/dist/index.js

@@ -111,6 +111,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = renderToPipeableStream(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -148,6 +149,7 @@ function createRSCHandler(options) {
 import fs from "node:fs";
 import Module from "node:module";
 import path2 from "node:path";
+import { RouteChildrenSlot } from "@webtypen/webframez-react/route-slot";
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -237,6 +239,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -252,13 +264,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!React.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = React.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -266,10 +282,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return React.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return React.cloneElement(node, void 0, ...nextChildren);
+    }
+    return React.cloneElement(node, void 0, nextChildren);
   }
-  return React.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return React.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -610,9 +635,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -732,9 +760,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -918,7 +949,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1385,6 +1430,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1407,6 +1454,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = fs2.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1430,6 +1478,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/dist/route-slot.cjs

@@ -0,0 +1,53 @@
+"use client";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/route-slot.tsx
+var route_slot_exports = {};
+__export(route_slot_exports, {
+  RouteChildrenSlot: () => RouteChildrenSlot,
+  RouteChildrenSlotProvider: () => RouteChildrenSlotProvider
+});
+module.exports = __toCommonJS(route_slot_exports);
+var import_react = __toESM(require("react"), 1);
+var import_jsx_runtime = require("react/jsx-runtime");
+var RouteChildrenSlotContext = import_react.default.createContext(null);
+function RouteChildrenSlotProvider({
+  children,
+  page
+}) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RouteChildrenSlotContext.Provider, { value: page, children });
+}
+function RouteChildrenSlot() {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: import_react.default.useContext(RouteChildrenSlotContext) });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RouteChildrenSlot,
+  RouteChildrenSlotProvider
+});

package/dist/route-slot.d.ts

@@ -0,0 +1,7 @@
+import type { ReactNode } from "react";
+
+export function RouteChildrenSlotProvider(props: {
+  children: ReactNode;
+  page: ReactNode;
+}): ReactNode;
+export function RouteChildrenSlot(): ReactNode;

package/dist/route-slot.js

@@ -0,0 +1,19 @@
+"use client";
+
+// src/route-slot.tsx
+import React from "react";
+import { Fragment, jsx } from "react/jsx-runtime";
+var RouteChildrenSlotContext = React.createContext(null);
+function RouteChildrenSlotProvider({
+  children,
+  page
+}) {
+  return /* @__PURE__ */ jsx(RouteChildrenSlotContext.Provider, { value: page, children });
+}
+function RouteChildrenSlot() {
+  return /* @__PURE__ */ jsx(Fragment, { children: React.useContext(RouteChildrenSlotContext) });
+}
+export {
+  RouteChildrenSlot,
+  RouteChildrenSlotProvider
+};

package/dist/router.cjs

@@ -40,6 +40,7 @@ module.exports = __toCommonJS(router_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_module = __toESM(require("node:module"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
+var import_route_slot = require("@webtypen/webframez-react/route-slot");
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -129,6 +130,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -144,13 +155,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!import_react.default.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = import_react.default.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -158,10 +173,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return import_react.default.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return import_react.default.cloneElement(node, void 0, ...nextChildren);
+    }
+    return import_react.default.cloneElement(node, void 0, nextChildren);
   }
-  return import_react.default.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return import_react.default.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -502,9 +526,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -624,9 +651,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {

package/dist/router.d.ts

@@ -5,6 +5,8 @@ export type ResolvedRoute = {
   statusCode: number;
   model: ReactNode;
   head: HeadConfig;
+  contextModel?: ReactNode;
+  pageModel?: ReactNode;
 };
 
 export function createFileRouter(options: { pagesDir: string }): {

package/dist/router.js

@@ -10,6 +10,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 import fs from "node:fs";
 import Module from "node:module";
 import path from "node:path";
+import { RouteChildrenSlot } from "@webtypen/webframez-react/route-slot";
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -99,6 +100,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -114,13 +125,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!React.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = React.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -128,10 +143,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return React.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return React.cloneElement(node, void 0, ...nextChildren);
+    }
+    return React.cloneElement(node, void 0, nextChildren);
   }
-  return React.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return React.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -472,9 +496,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -594,9 +621,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {

package/dist/types.d.ts

@@ -71,6 +71,8 @@ export type HeadConfig = {
 export type ClientNavigationPayload = {
   model: ReactNode;
   head: HeadConfig;
+  contextModel?: ReactNode;
+  pageModel?: ReactNode;
 };
 
 export type HeadResolver<TContext = RouteContext> = (

package/dist/webframez-core.cjs

@@ -145,6 +145,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = (0, import_server.renderToPipeableStream)(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -154,6 +155,7 @@ function sendRSC(res, model, options = {}) {
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_module2 = __toESM(require("node:module"), 1);
 var import_node_path2 = __toESM(require("node:path"), 1);
+var import_route_slot = require("@webtypen/webframez-react/route-slot");
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -243,6 +245,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -258,13 +270,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!import_react.default.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = import_react.default.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -272,10 +288,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return import_react.default.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return import_react.default.cloneElement(node, void 0, ...nextChildren);
+    }
+    return import_react.default.cloneElement(node, void 0, nextChildren);
   }
-  return import_react.default.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return import_react.default.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -616,9 +641,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -738,9 +766,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -920,7 +951,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1387,6 +1432,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1409,6 +1456,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = import_node_fs2.default.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1432,6 +1480,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/dist/webframez-core.js

@@ -117,6 +117,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = renderToPipeableStream(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -126,6 +127,7 @@ function sendRSC(res, model, options = {}) {
 import fs from "node:fs";
 import Module from "node:module";
 import path2 from "node:path";
+import { RouteChildrenSlot } from "@webtypen/webframez-react/route-slot";
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -215,6 +217,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -230,13 +242,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!React.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = React.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -244,10 +260,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return React.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return React.cloneElement(node, void 0, ...nextChildren);
+    }
+    return React.cloneElement(node, void 0, nextChildren);
   }
-  return React.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return React.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -588,9 +613,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -710,9 +738,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -892,7 +923,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1359,6 +1404,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1381,6 +1428,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = fs2.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1404,6 +1452,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {
@@ -43,6 +43,11 @@
       "import": "./dist/navigation.js",
       "require": "./dist/navigation.cjs"
     },
+    "./route-slot": {
+      "types": "./dist/route-slot.d.ts",
+      "import": "./dist/route-slot.js",
+      "require": "./dist/route-slot.cjs"
+    },
     "./types": {
       "types": "./dist/types.d.ts",
       "import": "./dist/types.js",