@webtypen/webframez-react 0.0.47 → 0.0.49

package/dist/index.js

@@ -23,6 +23,8 @@ function createHTMLShell(options = {}) {
     buildId = "",
     headTags = "",
     bodyClassName = "",
+    bodyStartHtml = "",
+    bodyEndHtml = "",
     rootHtml = "",
     initialFlightData = "",
     basename = "",
@@ -72,7 +74,9 @@ function createHTMLShell(options = {}) {
     ${headTags}
   </head>
   <body${bodyClassName ? ` class="${bodyClassName.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;")}"` : ""}>
+    ${bodyStartHtml}
     <div id="root">${rootHtml}</div>
+    ${bodyEndHtml}
     <script>window.__RSC_ENDPOINT = "${rscEndpoint}";</script>
     <script>window.__RSC_BASENAME = "${basename}";</script>
     <script>window.__RSC_ROUTE_BASE_PATH = "${routeBasePath}";</script>
@@ -215,6 +219,12 @@ function normalizeHeadConfig(head, inheritedBasename) {
       href: resolveHeadAssetUrl(link.href, effectiveBasename)
     }));
   }
+  if (normalizedHead.scripts) {
+    normalizedHead.scripts = normalizedHead.scripts.map((script) => ({
+      ...script,
+      ...script.src ? { src: resolveHeadAssetUrl(script.src, effectiveBasename) } : {}
+    }));
+  }
   return normalizedHead;
 }
 
@@ -467,7 +477,9 @@ function matchRoute(entry, pathname) {
 function mergeHead(...configs) {
   const merged = {
     meta: [],
-    links: []
+    links: [],
+    scripts: [],
+    html: []
   };
   for (const candidate of configs) {
     const config = normalizeHeadConfig(candidate, merged.basename);
@@ -502,9 +514,28 @@ function mergeHead(...configs) {
     if (config.links) {
       merged.links?.push(...config.links);
     }
+    if (config.scripts) {
+      merged.scripts?.push(...config.scripts);
+    }
+    if (config.html) {
+      merged.html?.push(...Array.isArray(config.html) ? config.html : [config.html]);
+    }
+    if (config.bodyStartHtml) {
+      merged.bodyStartHtml = [merged.bodyStartHtml, config.bodyStartHtml].filter(Boolean).join("\n");
+    }
+    if (config.bodyEndHtml) {
+      merged.bodyEndHtml = [merged.bodyEndHtml, config.bodyEndHtml].filter(Boolean).join("\n");
+    }
   }
   return merged;
 }
+function renderGenericAttributes(entry, excluded = []) {
+  return Object.entries(entry).filter(
+    ([key, value]) => !excluded.includes(key) && value !== void 0 && value !== null && value !== false
+  ).map(
+    ([key, value]) => value === true ? key : `${key}="${escapeHtml(String(value))}"`
+  ).join(" ");
+}
 function renderHeadToString(head) {
   const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
@@ -526,6 +557,23 @@ function renderHeadToString(head) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
+  for (const script of normalizedHead.scripts ?? []) {
+    if (script.html) {
+      tags.push(script.html);
+      continue;
+    }
+    const attrs = renderGenericAttributes(script, [
+      "content",
+      "html"
+    ]);
+    const content = script.content ? String(script.content) : "";
+    tags.push(`<script ${createManagedAttributes()} ${attrs}>${content}</script>`);
+  }
+  for (const html of normalizedHead.html ?? []) {
+    if (typeof html === "string" && html.trim() !== "") {
+      tags.push(html);
+    }
+  }
   return tags.join("\n");
 }
 function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
@@ -611,6 +659,7 @@ function isRouteAbort(value) {
 function createFileRouter(options) {
   installForcedPackageResolution();
   const pagesDir = options.pagesDir;
+  const onData = options.onData;
   const layoutPath = path2.join(pagesDir, "layout.js");
   const errorPath = path2.join(pagesDir, "errors.js");
   const middlewaresPath = path2.join(pagesDir, "middlewares.js");
@@ -775,10 +824,16 @@ function createFileRouter(options) {
         data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
-      const pageNode = await pageModule.default(pageContext);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, pageContext) : void 0;
-      const pageHead = await resolveHead(pageModule, pageContext);
-      const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
+      const onDataResult = typeof onData === "function" ? await onData(pageContext) : void 0;
+      const eventContext = {
+        ...pageContext,
+        data: mergeRouteData(pageContext.data, onDataResult)
+      };
+      activeContext = eventContext;
+      const pageNode = await pageModule.default(eventContext);
+      const layoutHead = layoutModule ? await resolveHead(layoutModule, eventContext) : void 0;
+      const pageHead = await resolveHead(pageModule, eventContext);
+      const layoutNode = layoutModule ? await layoutModule.default(eventContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildren, {})) : void 0;
       return {
@@ -787,7 +842,7 @@ function createFileRouter(options) {
         contextModel,
         pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead),
-        context: pageContext
+        context: eventContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -1620,7 +1675,7 @@ function createNodeRequestHandler(options) {
   const liveReloadEnabled = options.liveReloadPath !== false && (nodeEnv === "development" || runningInWatchMode);
   const liveReloadPath = !liveReloadEnabled ? "" : options.liveReloadPath ?? `${basePath || ""}/__webframez_live_reload`;
   const liveReloadClients = /* @__PURE__ */ new Set();
-  const router = createFileRouter({ pagesDir });
+  const router = createFileRouter({ pagesDir, onData: options.onData });
   const getManifestState = createManifestLoader({
     distRootDir,
     manifestPath,
@@ -1844,6 +1899,8 @@ function createNodeRequestHandler(options) {
         initialFlightData,
         basename: shellBasename,
         routeBasePath: shellRouteBasePath,
+        bodyStartHtml: resolved.head.bodyStartHtml || "",
+        bodyEndHtml: resolved.head.bodyEndHtml || "",
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       }),
@@ -2088,7 +2145,8 @@ function resolveWebframezReactRouteOptions(routePathValue, options = {}) {
     clientEntryPath: options.clientEntryPath ? resolveFromProjectRoot(options.clientEntryPath) : void 0,
     styleSrcPath: options.styleSrcPath ? resolveFromProjectRoot(options.styleSrcPath) : defaults.styleSrcPath,
     basePath: options.basePath ?? defaults.basePath,
-    liveReloadPath: options.liveReloadPath
+    liveReloadPath: options.liveReloadPath,
+    onData: options.onData
   };
 }
 function getRegisteredReactBuildTargets() {

package/dist/router.cjs

@@ -103,6 +103,12 @@ function normalizeHeadConfig(head, inheritedBasename) {
       href: resolveHeadAssetUrl(link.href, effectiveBasename)
     }));
   }
+  if (normalizedHead.scripts) {
+    normalizedHead.scripts = normalizedHead.scripts.map((script) => ({
+      ...script,
+      ...script.src ? { src: resolveHeadAssetUrl(script.src, effectiveBasename) } : {}
+    }));
+  }
   return normalizedHead;
 }
 
@@ -355,7 +361,9 @@ function matchRoute(entry, pathname) {
 function mergeHead(...configs) {
   const merged = {
     meta: [],
-    links: []
+    links: [],
+    scripts: [],
+    html: []
   };
   for (const candidate of configs) {
     const config = normalizeHeadConfig(candidate, merged.basename);
@@ -390,9 +398,28 @@ function mergeHead(...configs) {
     if (config.links) {
       merged.links?.push(...config.links);
     }
+    if (config.scripts) {
+      merged.scripts?.push(...config.scripts);
+    }
+    if (config.html) {
+      merged.html?.push(...Array.isArray(config.html) ? config.html : [config.html]);
+    }
+    if (config.bodyStartHtml) {
+      merged.bodyStartHtml = [merged.bodyStartHtml, config.bodyStartHtml].filter(Boolean).join("\n");
+    }
+    if (config.bodyEndHtml) {
+      merged.bodyEndHtml = [merged.bodyEndHtml, config.bodyEndHtml].filter(Boolean).join("\n");
+    }
   }
   return merged;
 }
+function renderGenericAttributes(entry, excluded = []) {
+  return Object.entries(entry).filter(
+    ([key, value]) => !excluded.includes(key) && value !== void 0 && value !== null && value !== false
+  ).map(
+    ([key, value]) => value === true ? key : `${key}="${escapeHtml(String(value))}"`
+  ).join(" ");
+}
 function renderHeadToString(head) {
   const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
@@ -414,6 +441,23 @@ function renderHeadToString(head) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
+  for (const script of normalizedHead.scripts ?? []) {
+    if (script.html) {
+      tags.push(script.html);
+      continue;
+    }
+    const attrs = renderGenericAttributes(script, [
+      "content",
+      "html"
+    ]);
+    const content = script.content ? String(script.content) : "";
+    tags.push(`<script ${createManagedAttributes()} ${attrs}>${content}</script>`);
+  }
+  for (const html of normalizedHead.html ?? []) {
+    if (typeof html === "string" && html.trim() !== "") {
+      tags.push(html);
+    }
+  }
   return tags.join("\n");
 }
 function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
@@ -499,6 +543,7 @@ function isRouteAbort(value) {
 function createFileRouter(options) {
   installForcedPackageResolution();
   const pagesDir = options.pagesDir;
+  const onData = options.onData;
   const layoutPath = import_node_path.default.join(pagesDir, "layout.js");
   const errorPath = import_node_path.default.join(pagesDir, "errors.js");
   const middlewaresPath = import_node_path.default.join(pagesDir, "middlewares.js");
@@ -663,10 +708,16 @@ function createFileRouter(options) {
         data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
-      const pageNode = await pageModule.default(pageContext);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, pageContext) : void 0;
-      const pageHead = await resolveHead(pageModule, pageContext);
-      const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
+      const onDataResult = typeof onData === "function" ? await onData(pageContext) : void 0;
+      const eventContext = {
+        ...pageContext,
+        data: mergeRouteData(pageContext.data, onDataResult)
+      };
+      activeContext = eventContext;
+      const pageNode = await pageModule.default(eventContext);
+      const layoutHead = layoutModule ? await resolveHead(layoutModule, eventContext) : void 0;
+      const pageHead = await resolveHead(pageModule, eventContext);
+      const layoutNode = layoutModule ? await layoutModule.default(eventContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RouteChildren, {})) : void 0;
       return {
@@ -675,7 +726,7 @@ function createFileRouter(options) {
         contextModel,
         pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead),
-        context: pageContext
+        context: eventContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {

package/dist/router.d.ts

@@ -1,5 +1,11 @@
 import type { ReactNode } from "react";
-import type { HeadConfig, RouteContext, RouteRequestContext, RouteSearchParams } from "./types";
+import type {
+  HeadConfig,
+  RouteContext,
+  RouteDataHook,
+  RouteRequestContext,
+  RouteSearchParams,
+} from "./types";
 
 export type ResolvedRoute = {
   statusCode: number;
@@ -10,7 +16,7 @@ export type ResolvedRoute = {
   pageModel?: ReactNode;
 };
 
-export function createFileRouter(options: { pagesDir: string }): {
+export function createFileRouter(options: { pagesDir: string; onData?: RouteDataHook }): {
   resolve(input: {
     pathname: string;
     searchParams: RouteSearchParams;

package/dist/router.js

@@ -73,6 +73,12 @@ function normalizeHeadConfig(head, inheritedBasename) {
       href: resolveHeadAssetUrl(link.href, effectiveBasename)
     }));
   }
+  if (normalizedHead.scripts) {
+    normalizedHead.scripts = normalizedHead.scripts.map((script) => ({
+      ...script,
+      ...script.src ? { src: resolveHeadAssetUrl(script.src, effectiveBasename) } : {}
+    }));
+  }
   return normalizedHead;
 }
 
@@ -325,7 +331,9 @@ function matchRoute(entry, pathname) {
 function mergeHead(...configs) {
   const merged = {
     meta: [],
-    links: []
+    links: [],
+    scripts: [],
+    html: []
   };
   for (const candidate of configs) {
     const config = normalizeHeadConfig(candidate, merged.basename);
@@ -360,9 +368,28 @@ function mergeHead(...configs) {
     if (config.links) {
       merged.links?.push(...config.links);
     }
+    if (config.scripts) {
+      merged.scripts?.push(...config.scripts);
+    }
+    if (config.html) {
+      merged.html?.push(...Array.isArray(config.html) ? config.html : [config.html]);
+    }
+    if (config.bodyStartHtml) {
+      merged.bodyStartHtml = [merged.bodyStartHtml, config.bodyStartHtml].filter(Boolean).join("\n");
+    }
+    if (config.bodyEndHtml) {
+      merged.bodyEndHtml = [merged.bodyEndHtml, config.bodyEndHtml].filter(Boolean).join("\n");
+    }
   }
   return merged;
 }
+function renderGenericAttributes(entry, excluded = []) {
+  return Object.entries(entry).filter(
+    ([key, value]) => !excluded.includes(key) && value !== void 0 && value !== null && value !== false
+  ).map(
+    ([key, value]) => value === true ? key : `${key}="${escapeHtml(String(value))}"`
+  ).join(" ");
+}
 function renderHeadToString(head) {
   const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
@@ -384,6 +411,23 @@ function renderHeadToString(head) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
+  for (const script of normalizedHead.scripts ?? []) {
+    if (script.html) {
+      tags.push(script.html);
+      continue;
+    }
+    const attrs = renderGenericAttributes(script, [
+      "content",
+      "html"
+    ]);
+    const content = script.content ? String(script.content) : "";
+    tags.push(`<script ${createManagedAttributes()} ${attrs}>${content}</script>`);
+  }
+  for (const html of normalizedHead.html ?? []) {
+    if (typeof html === "string" && html.trim() !== "") {
+      tags.push(html);
+    }
+  }
   return tags.join("\n");
 }
 function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
@@ -469,6 +513,7 @@ function isRouteAbort(value) {
 function createFileRouter(options) {
   installForcedPackageResolution();
   const pagesDir = options.pagesDir;
+  const onData = options.onData;
   const layoutPath = path.join(pagesDir, "layout.js");
   const errorPath = path.join(pagesDir, "errors.js");
   const middlewaresPath = path.join(pagesDir, "middlewares.js");
@@ -633,10 +678,16 @@ function createFileRouter(options) {
         data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
-      const pageNode = await pageModule.default(pageContext);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, pageContext) : void 0;
-      const pageHead = await resolveHead(pageModule, pageContext);
-      const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
+      const onDataResult = typeof onData === "function" ? await onData(pageContext) : void 0;
+      const eventContext = {
+        ...pageContext,
+        data: mergeRouteData(pageContext.data, onDataResult)
+      };
+      activeContext = eventContext;
+      const pageNode = await pageModule.default(eventContext);
+      const layoutHead = layoutModule ? await resolveHead(layoutModule, eventContext) : void 0;
+      const pageHead = await resolveHead(pageModule, eventContext);
+      const layoutNode = layoutModule ? await layoutModule.default(eventContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildren, {})) : void 0;
       return {
@@ -645,7 +696,7 @@ function createFileRouter(options) {
         contextModel,
         pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead),
-        context: pageContext
+        context: eventContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {

package/dist/types.d.ts

@@ -57,6 +57,19 @@ export type HeadLinkTag = {
   media?: string;
 };
 
+export type HeadScriptTag = {
+  id?: string;
+  src?: string;
+  type?: string;
+  async?: boolean;
+  defer?: boolean;
+  content?: string;
+  html?: string;
+  integrity?: string;
+  crossOrigin?: string;
+  referrerPolicy?: string;
+};
+
 export type HeadConfig = {
   title?: string;
   description?: string;
@@ -67,6 +80,10 @@ export type HeadConfig = {
   favicon?: string;
   meta?: HeadMetaTag[];
   links?: HeadLinkTag[];
+  scripts?: HeadScriptTag[];
+  html?: string[];
+  bodyStartHtml?: string;
+  bodyEndHtml?: string;
 };
 
 export type ClientNavigationPayload = {
@@ -84,6 +101,11 @@ export type PageDataResolver<TData = any> = (
   context: RouteContext
 ) => TData | Promise<TData>;
 
+export type RouteDataHookResult = Record<string, unknown> | undefined | void;
+export type RouteDataHook<TData = any> = (
+  context: RouteContext<TData>
+) => RouteDataHookResult | Promise<RouteDataHookResult>;
+
 export type RouteMiddlewareResult = Record<string, unknown> | undefined | void;
 export type RouteMiddlewareResolver<TData = any> = (
   context: RouteContext<TData>
@@ -115,6 +137,8 @@ export type CreateHtmlShellOptions = {
   buildId?: string;
   headTags?: string;
   bodyClassName?: string;
+  bodyStartHtml?: string;
+  bodyEndHtml?: string;
   rootHtml?: string;
   initialFlightData?: string;
   basename?: string;

package/dist/webframez-core.cjs

@@ -62,6 +62,8 @@ function createHTMLShell(options = {}) {
     buildId = "",
     headTags = "",
     bodyClassName = "",
+    bodyStartHtml = "",
+    bodyEndHtml = "",
     rootHtml = "",
     initialFlightData = "",
     basename = "",
@@ -111,7 +113,9 @@ function createHTMLShell(options = {}) {
     ${headTags}
   </head>
   <body${bodyClassName ? ` class="${bodyClassName.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;")}"` : ""}>
+    ${bodyStartHtml}
     <div id="root">${rootHtml}</div>
+    ${bodyEndHtml}
     <script>window.__RSC_ENDPOINT = "${rscEndpoint}";</script>
     <script>window.__RSC_BASENAME = "${basename}";</script>
     <script>window.__RSC_ROUTE_BASE_PATH = "${routeBasePath}";</script>
@@ -226,6 +230,12 @@ function normalizeHeadConfig(head, inheritedBasename) {
       href: resolveHeadAssetUrl(link.href, effectiveBasename)
     }));
   }
+  if (normalizedHead.scripts) {
+    normalizedHead.scripts = normalizedHead.scripts.map((script) => ({
+      ...script,
+      ...script.src ? { src: resolveHeadAssetUrl(script.src, effectiveBasename) } : {}
+    }));
+  }
   return normalizedHead;
 }
 
@@ -478,7 +488,9 @@ function matchRoute(entry, pathname) {
 function mergeHead(...configs) {
   const merged = {
     meta: [],
-    links: []
+    links: [],
+    scripts: [],
+    html: []
   };
   for (const candidate of configs) {
     const config = normalizeHeadConfig(candidate, merged.basename);
@@ -513,9 +525,28 @@ function mergeHead(...configs) {
     if (config.links) {
       merged.links?.push(...config.links);
     }
+    if (config.scripts) {
+      merged.scripts?.push(...config.scripts);
+    }
+    if (config.html) {
+      merged.html?.push(...Array.isArray(config.html) ? config.html : [config.html]);
+    }
+    if (config.bodyStartHtml) {
+      merged.bodyStartHtml = [merged.bodyStartHtml, config.bodyStartHtml].filter(Boolean).join("\n");
+    }
+    if (config.bodyEndHtml) {
+      merged.bodyEndHtml = [merged.bodyEndHtml, config.bodyEndHtml].filter(Boolean).join("\n");
+    }
   }
   return merged;
 }
+function renderGenericAttributes(entry, excluded = []) {
+  return Object.entries(entry).filter(
+    ([key, value]) => !excluded.includes(key) && value !== void 0 && value !== null && value !== false
+  ).map(
+    ([key, value]) => value === true ? key : `${key}="${escapeHtml(String(value))}"`
+  ).join(" ");
+}
 function renderHeadToString(head) {
   const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
@@ -537,6 +568,23 @@ function renderHeadToString(head) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
+  for (const script of normalizedHead.scripts ?? []) {
+    if (script.html) {
+      tags.push(script.html);
+      continue;
+    }
+    const attrs = renderGenericAttributes(script, [
+      "content",
+      "html"
+    ]);
+    const content = script.content ? String(script.content) : "";
+    tags.push(`<script ${createManagedAttributes()} ${attrs}>${content}</script>`);
+  }
+  for (const html of normalizedHead.html ?? []) {
+    if (typeof html === "string" && html.trim() !== "") {
+      tags.push(html);
+    }
+  }
   return tags.join("\n");
 }
 function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
@@ -622,6 +670,7 @@ function isRouteAbort(value) {
 function createFileRouter(options) {
   installForcedPackageResolution();
   const pagesDir = options.pagesDir;
+  const onData = options.onData;
   const layoutPath = import_node_path2.default.join(pagesDir, "layout.js");
   const errorPath = import_node_path2.default.join(pagesDir, "errors.js");
   const middlewaresPath = import_node_path2.default.join(pagesDir, "middlewares.js");
@@ -786,10 +835,16 @@ function createFileRouter(options) {
         data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
-      const pageNode = await pageModule.default(pageContext);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, pageContext) : void 0;
-      const pageHead = await resolveHead(pageModule, pageContext);
-      const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
+      const onDataResult = typeof onData === "function" ? await onData(pageContext) : void 0;
+      const eventContext = {
+        ...pageContext,
+        data: mergeRouteData(pageContext.data, onDataResult)
+      };
+      activeContext = eventContext;
+      const pageNode = await pageModule.default(eventContext);
+      const layoutHead = layoutModule ? await resolveHead(layoutModule, eventContext) : void 0;
+      const pageHead = await resolveHead(pageModule, eventContext);
+      const layoutNode = layoutModule ? await layoutModule.default(eventContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RouteChildren, {})) : void 0;
       return {
@@ -798,7 +853,7 @@ function createFileRouter(options) {
         contextModel,
         pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead),
-        context: pageContext
+        context: eventContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -1621,7 +1676,7 @@ function createNodeRequestHandler(options) {
   const liveReloadEnabled = options.liveReloadPath !== false && (nodeEnv === "development" || runningInWatchMode);
   const liveReloadPath = !liveReloadEnabled ? "" : options.liveReloadPath ?? `${basePath || ""}/__webframez_live_reload`;
   const liveReloadClients = /* @__PURE__ */ new Set();
-  const router = createFileRouter({ pagesDir });
+  const router = createFileRouter({ pagesDir, onData: options.onData });
   const getManifestState = createManifestLoader({
     distRootDir,
     manifestPath,
@@ -1845,6 +1900,8 @@ function createNodeRequestHandler(options) {
         initialFlightData,
         basename: shellBasename,
         routeBasePath: shellRouteBasePath,
+        bodyStartHtml: resolved.head.bodyStartHtml || "",
+        bodyEndHtml: resolved.head.bodyEndHtml || "",
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       }),
@@ -2088,7 +2145,8 @@ function resolveWebframezReactRouteOptions(routePathValue, options = {}) {
     clientEntryPath: options.clientEntryPath ? resolveFromProjectRoot(options.clientEntryPath) : void 0,
     styleSrcPath: options.styleSrcPath ? resolveFromProjectRoot(options.styleSrcPath) : defaults.styleSrcPath,
     basePath: options.basePath ?? defaults.basePath,
-    liveReloadPath: options.liveReloadPath
+    liveReloadPath: options.liveReloadPath,
+    onData: options.onData
   };
 }
 function getRegisteredReactBuildTargets() {