@webtypen/webframez-react 0.0.2 → 0.0.4

package/dist/http.js

@@ -198,6 +198,10 @@ function readSearchParams(urlSearchParams) {
 function escapeHtml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\"/g, "&quot;").replace(/'/g, "&#39;");
 }
+var MANAGED_HEAD_ATTR = "data-webframez-head";
+function createManagedAttributes() {
+  return `${MANAGED_HEAD_ATTR}="true"`;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -266,19 +270,21 @@ function renderHeadToString(head) {
   const tags = [];
   if (head.description) {
     tags.push(
-      `<meta name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
     );
   }
   if (head.favicon) {
-    tags.push(`<link rel="icon" href="${escapeHtml(head.favicon)}" />`);
+    tags.push(
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+    );
   }
   for (const meta of head.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<meta ${attrs} />`);
+    tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
   for (const link of head.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<link ${attrs} />`);
+    tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
   return tags.join("\n");
 }
@@ -292,6 +298,12 @@ async function resolveHead(candidate, context) {
   }
   return candidate.Head(context);
 }
+async function resolvePageData(candidate, context) {
+  if (!candidate.Data) {
+    return void 0;
+  }
+  return candidate.Data(context);
+}
 function findBestMatch(entries, pathname) {
   const matches = [];
   for (const entry of entries) {
@@ -371,10 +383,11 @@ function createFileRouter(options) {
       };
     }
     const errorModule = resolveModule(errorPath);
-    const errorNode = errorModule.default(errorProps);
+    const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
-    const model = layoutModule ? injectRouteChildren(layoutModule.default(context), errorNode) : errorNode;
+    const layoutNode = layoutModule ? await layoutModule.default(context) : null;
+    const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
     return {
       statusCode,
       model,
@@ -406,10 +419,17 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageNode = pageModule.default(context);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
-      const pageHead = await resolveHead(pageModule, context);
-      const model = layoutModule ? injectRouteChildren(layoutModule.default(context), pageNode) : pageNode;
+      const pageData = await resolvePageData(pageModule, context);
+      const pageContext = {
+        ...context,
+        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 model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       return {
         statusCode: 200,
         model,
@@ -454,14 +474,26 @@ function stripBasePath(pathname, basePath) {
 }
 function runNodeCommand(args) {
   return new Promise((resolve, reject) => {
-    execFile(process.execPath, args, { timeout: 1e4, maxBuffer: 1024 * 1024 * 5 }, (error, stdout, stderr) => {
-      if (error) {
-        const out = stderr && stderr.trim() !== "" ? stderr : stdout;
-        reject(new Error(out || error.message));
-        return;
+    const execArgs = [
+      "--conditions",
+      "react-server",
+      "-r",
+      "@webtypen/webframez-react/register",
+      ...args
+    ];
+    execFile(
+      process.execPath,
+      execArgs,
+      { timeout: 1e4, maxBuffer: 1024 * 1024 * 5 },
+      (error, stdout, stderr) => {
+        if (error) {
+          const out = stderr && stderr.trim() !== "" ? stderr : stdout;
+          reject(new Error(out || error.message));
+          return;
+        }
+        resolve({ stdout, stderr });
       }
-      resolve({ stdout, stderr });
-    });
+    );
   });
 }
 async function renderInitialHtmlInWorker(options) {
@@ -485,7 +517,7 @@ Module._resolveFilename = function(request, parent, isMain, options) {
   }
   return originalResolveFilename.call(this, request, parent, isMain, options);
 };
-const { createFileRouter } = require("webframez-react/router");
+const { createFileRouter } = require("@webtypen/webframez-react/router");
 const reactDomPkg = require.resolve("react-dom/package.json", {
   paths: [process.cwd(), input.pagesDir]
 });
@@ -624,7 +656,11 @@ function createNodeRequestHandler(options) {
           cookies: requestCookies
         })
       );
-      sendRSC(res, resolved2.model, {
+      const payload = {
+        model: resolved2.model,
+        head: resolved2.head
+      };
+      sendRSC(res, payload, {
         moduleMap,
         statusCode: resolved2.statusCode
       });

package/dist/index.cjs

@@ -257,6 +257,10 @@ function readSearchParams(urlSearchParams) {
 function escapeHtml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\"/g, "&quot;").replace(/'/g, "&#39;");
 }
+var MANAGED_HEAD_ATTR = "data-webframez-head";
+function createManagedAttributes() {
+  return `${MANAGED_HEAD_ATTR}="true"`;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -325,19 +329,21 @@ function renderHeadToString(head) {
   const tags = [];
   if (head.description) {
     tags.push(
-      `<meta name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
     );
   }
   if (head.favicon) {
-    tags.push(`<link rel="icon" href="${escapeHtml(head.favicon)}" />`);
+    tags.push(
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+    );
   }
   for (const meta of head.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<meta ${attrs} />`);
+    tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
   for (const link of head.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<link ${attrs} />`);
+    tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
   return tags.join("\n");
 }
@@ -351,6 +357,12 @@ async function resolveHead(candidate, context) {
   }
   return candidate.Head(context);
 }
+async function resolvePageData(candidate, context) {
+  if (!candidate.Data) {
+    return void 0;
+  }
+  return candidate.Data(context);
+}
 function findBestMatch(entries, pathname) {
   const matches = [];
   for (const entry of entries) {
@@ -430,10 +442,11 @@ function createFileRouter(options) {
       };
     }
     const errorModule = resolveModule(errorPath);
-    const errorNode = errorModule.default(errorProps);
+    const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
-    const model = layoutModule ? injectRouteChildren(layoutModule.default(context), errorNode) : errorNode;
+    const layoutNode = layoutModule ? await layoutModule.default(context) : null;
+    const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
     return {
       statusCode,
       model,
@@ -465,10 +478,17 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageNode = pageModule.default(context);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
-      const pageHead = await resolveHead(pageModule, context);
-      const model = layoutModule ? injectRouteChildren(layoutModule.default(context), pageNode) : pageNode;
+      const pageData = await resolvePageData(pageModule, context);
+      const pageContext = {
+        ...context,
+        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 model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       return {
         statusCode: 200,
         model,
@@ -516,14 +536,26 @@ function stripBasePath(pathname, basePath) {
 }
 function runNodeCommand(args) {
   return new Promise((resolve, reject) => {
-    (0, import_node_child_process.execFile)(process.execPath, args, { timeout: 1e4, maxBuffer: 1024 * 1024 * 5 }, (error, stdout, stderr) => {
-      if (error) {
-        const out = stderr && stderr.trim() !== "" ? stderr : stdout;
-        reject(new Error(out || error.message));
-        return;
+    const execArgs = [
+      "--conditions",
+      "react-server",
+      "-r",
+      "@webtypen/webframez-react/register",
+      ...args
+    ];
+    (0, import_node_child_process.execFile)(
+      process.execPath,
+      execArgs,
+      { timeout: 1e4, maxBuffer: 1024 * 1024 * 5 },
+      (error, stdout, stderr) => {
+        if (error) {
+          const out = stderr && stderr.trim() !== "" ? stderr : stdout;
+          reject(new Error(out || error.message));
+          return;
+        }
+        resolve({ stdout, stderr });
       }
-      resolve({ stdout, stderr });
-    });
+    );
   });
 }
 async function renderInitialHtmlInWorker(options) {
@@ -547,7 +579,7 @@ Module._resolveFilename = function(request, parent, isMain, options) {
   }
   return originalResolveFilename.call(this, request, parent, isMain, options);
 };
-const { createFileRouter } = require("webframez-react/router");
+const { createFileRouter } = require("@webtypen/webframez-react/router");
 const reactDomPkg = require.resolve("react-dom/package.json", {
   paths: [process.cwd(), input.pagesDir]
 });
@@ -686,7 +718,11 @@ function createNodeRequestHandler(options) {
           cookies: requestCookies
         })
       );
-      sendRSC(res, resolved2.model, {
+      const payload = {
+        model: resolved2.model,
+        head: resolved2.head
+      };
+      sendRSC(res, payload, {
         moduleMap,
         statusCode: resolved2.statusCode
       });

package/dist/index.d.ts

@@ -1,15 +1,12 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
 import type { CreateHtmlShellOptions, SendRSCOptions } from "./types";
 import type { CreateNodeHandlerOptions } from "./http";
+import "./webframez-core";
 
 export * from "./types";
 export { createFileRouter, parseSearchParams, renderHeadToString, RouteChildren } from "./router";
 export type { ResolvedRoute } from "./router";
-export { initWebframezReact, setupWebframezCoreReactRoute } from "./webframez-core";
-export type {
-  WebframezCoreRouteMethod,
-  WebframezCoreReactRenderRouteOptions,
-} from "./webframez-core";
+export * from "./webframez-core";
 
 export function createHTMLShell(options?: CreateHtmlShellOptions): string;
 export function sendRSC(

package/dist/index.js

@@ -221,6 +221,10 @@ function readSearchParams(urlSearchParams) {
 function escapeHtml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\"/g, "&quot;").replace(/'/g, "&#39;");
 }
+var MANAGED_HEAD_ATTR = "data-webframez-head";
+function createManagedAttributes() {
+  return `${MANAGED_HEAD_ATTR}="true"`;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -289,19 +293,21 @@ function renderHeadToString(head) {
   const tags = [];
   if (head.description) {
     tags.push(
-      `<meta name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
     );
   }
   if (head.favicon) {
-    tags.push(`<link rel="icon" href="${escapeHtml(head.favicon)}" />`);
+    tags.push(
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+    );
   }
   for (const meta of head.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<meta ${attrs} />`);
+    tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
   for (const link of head.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<link ${attrs} />`);
+    tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
   return tags.join("\n");
 }
@@ -315,6 +321,12 @@ async function resolveHead(candidate, context) {
   }
   return candidate.Head(context);
 }
+async function resolvePageData(candidate, context) {
+  if (!candidate.Data) {
+    return void 0;
+  }
+  return candidate.Data(context);
+}
 function findBestMatch(entries, pathname) {
   const matches = [];
   for (const entry of entries) {
@@ -394,10 +406,11 @@ function createFileRouter(options) {
       };
     }
     const errorModule = resolveModule(errorPath);
-    const errorNode = errorModule.default(errorProps);
+    const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
-    const model = layoutModule ? injectRouteChildren(layoutModule.default(context), errorNode) : errorNode;
+    const layoutNode = layoutModule ? await layoutModule.default(context) : null;
+    const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
     return {
       statusCode,
       model,
@@ -429,10 +442,17 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageNode = pageModule.default(context);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
-      const pageHead = await resolveHead(pageModule, context);
-      const model = layoutModule ? injectRouteChildren(layoutModule.default(context), pageNode) : pageNode;
+      const pageData = await resolvePageData(pageModule, context);
+      const pageContext = {
+        ...context,
+        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 model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       return {
         statusCode: 200,
         model,
@@ -480,14 +500,26 @@ function stripBasePath(pathname, basePath) {
 }
 function runNodeCommand(args) {
   return new Promise((resolve, reject) => {
-    execFile(process.execPath, args, { timeout: 1e4, maxBuffer: 1024 * 1024 * 5 }, (error, stdout, stderr) => {
-      if (error) {
-        const out = stderr && stderr.trim() !== "" ? stderr : stdout;
-        reject(new Error(out || error.message));
-        return;
+    const execArgs = [
+      "--conditions",
+      "react-server",
+      "-r",
+      "@webtypen/webframez-react/register",
+      ...args
+    ];
+    execFile(
+      process.execPath,
+      execArgs,
+      { timeout: 1e4, maxBuffer: 1024 * 1024 * 5 },
+      (error, stdout, stderr) => {
+        if (error) {
+          const out = stderr && stderr.trim() !== "" ? stderr : stdout;
+          reject(new Error(out || error.message));
+          return;
+        }
+        resolve({ stdout, stderr });
       }
-      resolve({ stdout, stderr });
-    });
+    );
   });
 }
 async function renderInitialHtmlInWorker(options) {
@@ -511,7 +543,7 @@ Module._resolveFilename = function(request, parent, isMain, options) {
   }
   return originalResolveFilename.call(this, request, parent, isMain, options);
 };
-const { createFileRouter } = require("webframez-react/router");
+const { createFileRouter } = require("@webtypen/webframez-react/router");
 const reactDomPkg = require.resolve("react-dom/package.json", {
   paths: [process.cwd(), input.pagesDir]
 });
@@ -650,7 +682,11 @@ function createNodeRequestHandler(options) {
           cookies: requestCookies
         })
       );
-      sendRSC(res, resolved2.model, {
+      const payload = {
+        model: resolved2.model,
+        head: resolved2.head
+      };
+      sendRSC(res, payload, {
         moduleMap,
         statusCode: resolved2.statusCode
       });

package/dist/router.cjs

@@ -144,6 +144,10 @@ function readSearchParams(urlSearchParams) {
 function escapeHtml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\"/g, "&quot;").replace(/'/g, "&#39;");
 }
+var MANAGED_HEAD_ATTR = "data-webframez-head";
+function createManagedAttributes() {
+  return `${MANAGED_HEAD_ATTR}="true"`;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -212,19 +216,21 @@ function renderHeadToString(head) {
   const tags = [];
   if (head.description) {
     tags.push(
-      `<meta name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
     );
   }
   if (head.favicon) {
-    tags.push(`<link rel="icon" href="${escapeHtml(head.favicon)}" />`);
+    tags.push(
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+    );
   }
   for (const meta of head.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<meta ${attrs} />`);
+    tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
   for (const link of head.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<link ${attrs} />`);
+    tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
   return tags.join("\n");
 }
@@ -238,6 +244,12 @@ async function resolveHead(candidate, context) {
   }
   return candidate.Head(context);
 }
+async function resolvePageData(candidate, context) {
+  if (!candidate.Data) {
+    return void 0;
+  }
+  return candidate.Data(context);
+}
 function findBestMatch(entries, pathname) {
   const matches = [];
   for (const entry of entries) {
@@ -317,10 +329,11 @@ function createFileRouter(options) {
       };
     }
     const errorModule = resolveModule(errorPath);
-    const errorNode = errorModule.default(errorProps);
+    const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
-    const model = layoutModule ? injectRouteChildren(layoutModule.default(context), errorNode) : errorNode;
+    const layoutNode = layoutModule ? await layoutModule.default(context) : null;
+    const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
     return {
       statusCode,
       model,
@@ -352,10 +365,17 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageNode = pageModule.default(context);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
-      const pageHead = await resolveHead(pageModule, context);
-      const model = layoutModule ? injectRouteChildren(layoutModule.default(context), pageNode) : pageNode;
+      const pageData = await resolvePageData(pageModule, context);
+      const pageContext = {
+        ...context,
+        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 model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       return {
         statusCode: 200,
         model,

package/dist/router.js

@@ -114,6 +114,10 @@ function readSearchParams(urlSearchParams) {
 function escapeHtml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\"/g, "&quot;").replace(/'/g, "&#39;");
 }
+var MANAGED_HEAD_ATTR = "data-webframez-head";
+function createManagedAttributes() {
+  return `${MANAGED_HEAD_ATTR}="true"`;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -182,19 +186,21 @@ function renderHeadToString(head) {
   const tags = [];
   if (head.description) {
     tags.push(
-      `<meta name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
     );
   }
   if (head.favicon) {
-    tags.push(`<link rel="icon" href="${escapeHtml(head.favicon)}" />`);
+    tags.push(
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+    );
   }
   for (const meta of head.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<meta ${attrs} />`);
+    tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
   for (const link of head.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
-    tags.push(`<link ${attrs} />`);
+    tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
   return tags.join("\n");
 }
@@ -208,6 +214,12 @@ async function resolveHead(candidate, context) {
   }
   return candidate.Head(context);
 }
+async function resolvePageData(candidate, context) {
+  if (!candidate.Data) {
+    return void 0;
+  }
+  return candidate.Data(context);
+}
 function findBestMatch(entries, pathname) {
   const matches = [];
   for (const entry of entries) {
@@ -287,10 +299,11 @@ function createFileRouter(options) {
       };
     }
     const errorModule = resolveModule(errorPath);
-    const errorNode = errorModule.default(errorProps);
+    const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
-    const model = layoutModule ? injectRouteChildren(layoutModule.default(context), errorNode) : errorNode;
+    const layoutNode = layoutModule ? await layoutModule.default(context) : null;
+    const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
     return {
       statusCode,
       model,
@@ -322,10 +335,17 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageNode = pageModule.default(context);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
-      const pageHead = await resolveHead(pageModule, context);
-      const model = layoutModule ? injectRouteChildren(layoutModule.default(context), pageNode) : pageNode;
+      const pageData = await resolvePageData(pageModule, context);
+      const pageContext = {
+        ...context,
+        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 model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       return {
         statusCode: 200,
         model,