@webtypen/webframez-react 0.0.39 → 0.0.41

package/dist/http.cjs

@@ -636,7 +636,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -651,7 +652,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -776,7 +778,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -796,6 +799,38 @@ function parseSearchParams(query) {
 }
 
 // src/http.ts
+function attachResolvedContextToCoreRequest(req, context) {
+  if (!context) {
+    return;
+  }
+  const coreRequest = req.__webframezCoreRequest;
+  if (!coreRequest) {
+    return;
+  }
+  const data = context.data && typeof context.data === "object" ? context.data : void 0;
+  const env = data?.env;
+  const website = data?.website;
+  coreRequest.__webframezReactContext = {
+    pathname: context.pathname,
+    params: context.params,
+    request: context.request,
+    data: data ? {
+      env,
+      website,
+      is_env_website_request: data.is_env_website_request,
+      is_website_domain_request: data.is_website_domain_request,
+      website_base_path: data.website_base_path,
+      website_route_base_path: data.website_route_base_path,
+      website_transport_base_path: data.website_transport_base_path
+    } : void 0
+  };
+  if (!coreRequest.env && env) {
+    coreRequest.env = env;
+  }
+  if (!coreRequest.website && website) {
+    coreRequest.website = website;
+  }
+}
 function createInitialHtmlErrorMarkup(message) {
   return `<main style="font-family:system-ui,sans-serif;padding:24px"><h1 style="margin:0 0 12px">500</h1><p style="margin:0">${message}</p></main>`;
 }
@@ -930,13 +965,31 @@ globalThis.__webpack_chunk_load__ = function __webframezNoopChunkLoad() {
 };
 function normalizeWebframezRequireCandidate(candidate) {
   const stagingMarker = path.join(".webframez-build", "");
-  const appMarker = path.join("app", "");
+  const runtimeMarkers = [path.join("app", ""), path.join("modules", "")];
   const stagingIndex = candidate.indexOf(stagingMarker);
-  const appIndex = candidate.indexOf(appMarker, stagingIndex >= 0 ? stagingIndex : 0);
-  if (stagingIndex >= 0 && appIndex >= 0) {
-    const runtimeCandidate = path.resolve(process.cwd(), candidate.slice(appIndex));
-    if (fs.existsSync(runtimeCandidate)) {
-      return runtimeCandidate;
+  if (stagingIndex >= 0) {
+    for (const runtimeMarker of runtimeMarkers) {
+      const markerIndex = candidate.indexOf(runtimeMarker, stagingIndex);
+      if (markerIndex < 0) {
+        continue;
+      }
+
+      const relativeRuntimePath = candidate.slice(markerIndex);
+      const runtimeCandidates = [
+        path.resolve(process.cwd(), relativeRuntimePath),
+        path.resolve(process.cwd(), "build", relativeRuntimePath)
+      ];
+      const cwdParts = process.cwd().split(path.sep);
+      const buildsIndex = cwdParts.lastIndexOf("builds");
+      if (buildsIndex > 0) {
+        const projectRoot = cwdParts.slice(0, buildsIndex).join(path.sep) || path.sep;
+        runtimeCandidates.push(path.resolve(projectRoot, "build", relativeRuntimePath));
+      }
+
+      const runtimeCandidate = runtimeCandidates.find((candidatePath) => fs.existsSync(candidatePath));
+      if (runtimeCandidate) {
+        return runtimeCandidate;
+      }
     }
   }
 
@@ -1626,6 +1679,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
         contextModel: resolved2.contextModel,
@@ -1700,6 +1754,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
       head: resolved.head

package/dist/http.js

@@ -616,7 +616,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -631,7 +632,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -756,7 +758,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -776,6 +779,38 @@ function parseSearchParams(query) {
 }
 
 // src/http.ts
+function attachResolvedContextToCoreRequest(req, context) {
+  if (!context) {
+    return;
+  }
+  const coreRequest = req.__webframezCoreRequest;
+  if (!coreRequest) {
+    return;
+  }
+  const data = context.data && typeof context.data === "object" ? context.data : void 0;
+  const env = data?.env;
+  const website = data?.website;
+  coreRequest.__webframezReactContext = {
+    pathname: context.pathname,
+    params: context.params,
+    request: context.request,
+    data: data ? {
+      env,
+      website,
+      is_env_website_request: data.is_env_website_request,
+      is_website_domain_request: data.is_website_domain_request,
+      website_base_path: data.website_base_path,
+      website_route_base_path: data.website_route_base_path,
+      website_transport_base_path: data.website_transport_base_path
+    } : void 0
+  };
+  if (!coreRequest.env && env) {
+    coreRequest.env = env;
+  }
+  if (!coreRequest.website && website) {
+    coreRequest.website = website;
+  }
+}
 function createInitialHtmlErrorMarkup(message) {
   return `<main style="font-family:system-ui,sans-serif;padding:24px"><h1 style="margin:0 0 12px">500</h1><p style="margin:0">${message}</p></main>`;
 }
@@ -910,13 +945,31 @@ globalThis.__webpack_chunk_load__ = function __webframezNoopChunkLoad() {
 };
 function normalizeWebframezRequireCandidate(candidate) {
   const stagingMarker = path.join(".webframez-build", "");
-  const appMarker = path.join("app", "");
+  const runtimeMarkers = [path.join("app", ""), path.join("modules", "")];
   const stagingIndex = candidate.indexOf(stagingMarker);
-  const appIndex = candidate.indexOf(appMarker, stagingIndex >= 0 ? stagingIndex : 0);
-  if (stagingIndex >= 0 && appIndex >= 0) {
-    const runtimeCandidate = path.resolve(process.cwd(), candidate.slice(appIndex));
-    if (fs.existsSync(runtimeCandidate)) {
-      return runtimeCandidate;
+  if (stagingIndex >= 0) {
+    for (const runtimeMarker of runtimeMarkers) {
+      const markerIndex = candidate.indexOf(runtimeMarker, stagingIndex);
+      if (markerIndex < 0) {
+        continue;
+      }
+
+      const relativeRuntimePath = candidate.slice(markerIndex);
+      const runtimeCandidates = [
+        path.resolve(process.cwd(), relativeRuntimePath),
+        path.resolve(process.cwd(), "build", relativeRuntimePath)
+      ];
+      const cwdParts = process.cwd().split(path.sep);
+      const buildsIndex = cwdParts.lastIndexOf("builds");
+      if (buildsIndex > 0) {
+        const projectRoot = cwdParts.slice(0, buildsIndex).join(path.sep) || path.sep;
+        runtimeCandidates.push(path.resolve(projectRoot, "build", relativeRuntimePath));
+      }
+
+      const runtimeCandidate = runtimeCandidates.find((candidatePath) => fs.existsSync(candidatePath));
+      if (runtimeCandidate) {
+        return runtimeCandidate;
+      }
     }
   }
 
@@ -1606,6 +1659,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
         contextModel: resolved2.contextModel,
@@ -1680,6 +1734,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
       head: resolved.head

package/dist/index.cjs

@@ -671,7 +671,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -686,7 +687,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -811,7 +813,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -836,6 +839,38 @@ var import_node_path3 = __toESM(require("node:path"), 1);
 var import_node_url = require("node:url");
 var import_node_child_process = require("node:child_process");
 var import_node_zlib = require("node:zlib");
+function attachResolvedContextToCoreRequest(req, context) {
+  if (!context) {
+    return;
+  }
+  const coreRequest = req.__webframezCoreRequest;
+  if (!coreRequest) {
+    return;
+  }
+  const data = context.data && typeof context.data === "object" ? context.data : void 0;
+  const env = data?.env;
+  const website = data?.website;
+  coreRequest.__webframezReactContext = {
+    pathname: context.pathname,
+    params: context.params,
+    request: context.request,
+    data: data ? {
+      env,
+      website,
+      is_env_website_request: data.is_env_website_request,
+      is_website_domain_request: data.is_website_domain_request,
+      website_base_path: data.website_base_path,
+      website_route_base_path: data.website_route_base_path,
+      website_transport_base_path: data.website_transport_base_path
+    } : void 0
+  };
+  if (!coreRequest.env && env) {
+    coreRequest.env = env;
+  }
+  if (!coreRequest.website && website) {
+    coreRequest.website = website;
+  }
+}
 function createInitialHtmlErrorMarkup(message) {
   return `<main style="font-family:system-ui,sans-serif;padding:24px"><h1 style="margin:0 0 12px">500</h1><p style="margin:0">${message}</p></main>`;
 }
@@ -970,13 +1005,31 @@ globalThis.__webpack_chunk_load__ = function __webframezNoopChunkLoad() {
 };
 function normalizeWebframezRequireCandidate(candidate) {
   const stagingMarker = path.join(".webframez-build", "");
-  const appMarker = path.join("app", "");
+  const runtimeMarkers = [path.join("app", ""), path.join("modules", "")];
   const stagingIndex = candidate.indexOf(stagingMarker);
-  const appIndex = candidate.indexOf(appMarker, stagingIndex >= 0 ? stagingIndex : 0);
-  if (stagingIndex >= 0 && appIndex >= 0) {
-    const runtimeCandidate = path.resolve(process.cwd(), candidate.slice(appIndex));
-    if (fs.existsSync(runtimeCandidate)) {
-      return runtimeCandidate;
+  if (stagingIndex >= 0) {
+    for (const runtimeMarker of runtimeMarkers) {
+      const markerIndex = candidate.indexOf(runtimeMarker, stagingIndex);
+      if (markerIndex < 0) {
+        continue;
+      }
+
+      const relativeRuntimePath = candidate.slice(markerIndex);
+      const runtimeCandidates = [
+        path.resolve(process.cwd(), relativeRuntimePath),
+        path.resolve(process.cwd(), "build", relativeRuntimePath)
+      ];
+      const cwdParts = process.cwd().split(path.sep);
+      const buildsIndex = cwdParts.lastIndexOf("builds");
+      if (buildsIndex > 0) {
+        const projectRoot = cwdParts.slice(0, buildsIndex).join(path.sep) || path.sep;
+        runtimeCandidates.push(path.resolve(projectRoot, "build", relativeRuntimePath));
+      }
+
+      const runtimeCandidate = runtimeCandidates.find((candidatePath) => fs.existsSync(candidatePath));
+      if (runtimeCandidate) {
+        return runtimeCandidate;
+      }
     }
   }
 
@@ -1666,6 +1719,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
         contextModel: resolved2.contextModel,
@@ -1740,6 +1794,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
       head: resolved.head
@@ -2021,7 +2076,13 @@ function registerRouteRenderer(route, methodName) {
                 `Route.${methodName} only supports node/http requests`
               );
             }
-            await handleNodeRequest(req.message, res.res);
+            const message = req.message;
+            message.__webframezCoreRequest = req;
+            try {
+              await handleNodeRequest(message, res.res);
+            } finally {
+              delete message.__webframezCoreRequest;
+            }
             await waitForResponseFinish(res.res);
           },
           routeOptions

package/dist/index.js

@@ -632,7 +632,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -647,7 +648,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -772,7 +774,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -802,6 +805,38 @@ import {
   createGzip,
   gzipSync
 } from "node:zlib";
+function attachResolvedContextToCoreRequest(req, context) {
+  if (!context) {
+    return;
+  }
+  const coreRequest = req.__webframezCoreRequest;
+  if (!coreRequest) {
+    return;
+  }
+  const data = context.data && typeof context.data === "object" ? context.data : void 0;
+  const env = data?.env;
+  const website = data?.website;
+  coreRequest.__webframezReactContext = {
+    pathname: context.pathname,
+    params: context.params,
+    request: context.request,
+    data: data ? {
+      env,
+      website,
+      is_env_website_request: data.is_env_website_request,
+      is_website_domain_request: data.is_website_domain_request,
+      website_base_path: data.website_base_path,
+      website_route_base_path: data.website_route_base_path,
+      website_transport_base_path: data.website_transport_base_path
+    } : void 0
+  };
+  if (!coreRequest.env && env) {
+    coreRequest.env = env;
+  }
+  if (!coreRequest.website && website) {
+    coreRequest.website = website;
+  }
+}
 function createInitialHtmlErrorMarkup(message) {
   return `<main style="font-family:system-ui,sans-serif;padding:24px"><h1 style="margin:0 0 12px">500</h1><p style="margin:0">${message}</p></main>`;
 }
@@ -936,13 +971,31 @@ globalThis.__webpack_chunk_load__ = function __webframezNoopChunkLoad() {
 };
 function normalizeWebframezRequireCandidate(candidate) {
   const stagingMarker = path.join(".webframez-build", "");
-  const appMarker = path.join("app", "");
+  const runtimeMarkers = [path.join("app", ""), path.join("modules", "")];
   const stagingIndex = candidate.indexOf(stagingMarker);
-  const appIndex = candidate.indexOf(appMarker, stagingIndex >= 0 ? stagingIndex : 0);
-  if (stagingIndex >= 0 && appIndex >= 0) {
-    const runtimeCandidate = path.resolve(process.cwd(), candidate.slice(appIndex));
-    if (fs.existsSync(runtimeCandidate)) {
-      return runtimeCandidate;
+  if (stagingIndex >= 0) {
+    for (const runtimeMarker of runtimeMarkers) {
+      const markerIndex = candidate.indexOf(runtimeMarker, stagingIndex);
+      if (markerIndex < 0) {
+        continue;
+      }
+
+      const relativeRuntimePath = candidate.slice(markerIndex);
+      const runtimeCandidates = [
+        path.resolve(process.cwd(), relativeRuntimePath),
+        path.resolve(process.cwd(), "build", relativeRuntimePath)
+      ];
+      const cwdParts = process.cwd().split(path.sep);
+      const buildsIndex = cwdParts.lastIndexOf("builds");
+      if (buildsIndex > 0) {
+        const projectRoot = cwdParts.slice(0, buildsIndex).join(path.sep) || path.sep;
+        runtimeCandidates.push(path.resolve(projectRoot, "build", relativeRuntimePath));
+      }
+
+      const runtimeCandidate = runtimeCandidates.find((candidatePath) => fs.existsSync(candidatePath));
+      if (runtimeCandidate) {
+        return runtimeCandidate;
+      }
     }
   }
 
@@ -1632,6 +1685,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
         contextModel: resolved2.contextModel,
@@ -1706,6 +1760,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
       head: resolved.head
@@ -1987,7 +2042,13 @@ function registerRouteRenderer(route, methodName) {
                 `Route.${methodName} only supports node/http requests`
               );
             }
-            await handleNodeRequest(req.message, res.res);
+            const message = req.message;
+            message.__webframezCoreRequest = req;
+            try {
+              await handleNodeRequest(message, res.res);
+            } finally {
+              delete message.__webframezCoreRequest;
+            }
             await waitForResponseFinish(res.res);
           },
           routeOptions

package/dist/router.cjs

@@ -520,7 +520,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -535,7 +536,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -660,7 +662,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {

package/dist/router.d.ts

@@ -1,10 +1,11 @@
 import type { ReactNode } from "react";
-import type { HeadConfig, RouteSearchParams } from "./types";
+import type { HeadConfig, RouteContext, RouteRequestContext, RouteSearchParams } from "./types";
 
 export type ResolvedRoute = {
   statusCode: number;
   model: ReactNode;
   head: HeadConfig;
+  context: RouteContext;
   contextModel?: ReactNode;
   pageModel?: ReactNode;
 };
@@ -14,6 +15,7 @@ export function createFileRouter(options: { pagesDir: string }): {
     pathname: string;
     searchParams: RouteSearchParams;
     cookies?: Record<string, string>;
+    request?: RouteRequestContext;
   }): Promise<ResolvedRoute>;
   readSearchParams(urlSearchParams: URLSearchParams): RouteSearchParams;
 };

package/dist/router.js

@@ -490,7 +490,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -505,7 +506,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -630,7 +632,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {

package/dist/webframez-core.cjs

@@ -643,7 +643,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -658,7 +659,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -783,7 +785,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -803,6 +806,38 @@ function parseSearchParams(query) {
 }
 
 // src/http.ts
+function attachResolvedContextToCoreRequest(req, context) {
+  if (!context) {
+    return;
+  }
+  const coreRequest = req.__webframezCoreRequest;
+  if (!coreRequest) {
+    return;
+  }
+  const data = context.data && typeof context.data === "object" ? context.data : void 0;
+  const env = data?.env;
+  const website = data?.website;
+  coreRequest.__webframezReactContext = {
+    pathname: context.pathname,
+    params: context.params,
+    request: context.request,
+    data: data ? {
+      env,
+      website,
+      is_env_website_request: data.is_env_website_request,
+      is_website_domain_request: data.is_website_domain_request,
+      website_base_path: data.website_base_path,
+      website_route_base_path: data.website_route_base_path,
+      website_transport_base_path: data.website_transport_base_path
+    } : void 0
+  };
+  if (!coreRequest.env && env) {
+    coreRequest.env = env;
+  }
+  if (!coreRequest.website && website) {
+    coreRequest.website = website;
+  }
+}
 function createInitialHtmlErrorMarkup(message) {
   return `<main style="font-family:system-ui,sans-serif;padding:24px"><h1 style="margin:0 0 12px">500</h1><p style="margin:0">${message}</p></main>`;
 }
@@ -937,13 +972,31 @@ globalThis.__webpack_chunk_load__ = function __webframezNoopChunkLoad() {
 };
 function normalizeWebframezRequireCandidate(candidate) {
   const stagingMarker = path.join(".webframez-build", "");
-  const appMarker = path.join("app", "");
+  const runtimeMarkers = [path.join("app", ""), path.join("modules", "")];
   const stagingIndex = candidate.indexOf(stagingMarker);
-  const appIndex = candidate.indexOf(appMarker, stagingIndex >= 0 ? stagingIndex : 0);
-  if (stagingIndex >= 0 && appIndex >= 0) {
-    const runtimeCandidate = path.resolve(process.cwd(), candidate.slice(appIndex));
-    if (fs.existsSync(runtimeCandidate)) {
-      return runtimeCandidate;
+  if (stagingIndex >= 0) {
+    for (const runtimeMarker of runtimeMarkers) {
+      const markerIndex = candidate.indexOf(runtimeMarker, stagingIndex);
+      if (markerIndex < 0) {
+        continue;
+      }
+
+      const relativeRuntimePath = candidate.slice(markerIndex);
+      const runtimeCandidates = [
+        path.resolve(process.cwd(), relativeRuntimePath),
+        path.resolve(process.cwd(), "build", relativeRuntimePath)
+      ];
+      const cwdParts = process.cwd().split(path.sep);
+      const buildsIndex = cwdParts.lastIndexOf("builds");
+      if (buildsIndex > 0) {
+        const projectRoot = cwdParts.slice(0, buildsIndex).join(path.sep) || path.sep;
+        runtimeCandidates.push(path.resolve(projectRoot, "build", relativeRuntimePath));
+      }
+
+      const runtimeCandidate = runtimeCandidates.find((candidatePath) => fs.existsSync(candidatePath));
+      if (runtimeCandidate) {
+        return runtimeCandidate;
+      }
     }
   }
 
@@ -1633,6 +1686,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
         contextModel: resolved2.contextModel,
@@ -1707,6 +1761,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
       head: resolved.head
@@ -1987,7 +2042,13 @@ function registerRouteRenderer(route, methodName) {
                 `Route.${methodName} only supports node/http requests`
               );
             }
-            await handleNodeRequest(req.message, res.res);
+            const message = req.message;
+            message.__webframezCoreRequest = req;
+            try {
+              await handleNodeRequest(message, res.res);
+            } finally {
+              delete message.__webframezCoreRequest;
+            }
             await waitForResponseFinish(res.res);
           },
           routeOptions

package/dist/webframez-core.js

@@ -619,7 +619,8 @@ function createFileRouter(options) {
         model: fallback,
         head: {
           title: `${statusCode} - ${message}`
-        }
+        },
+        context: errorProps
       };
     }
     const errorModule = resolveModule(errorPath, pagesDir);
@@ -634,7 +635,8 @@ function createFileRouter(options) {
       model,
       contextModel,
       pageModel: errorNode,
-      head: mergeHead(layoutHead, errorHead)
+      head: mergeHead(layoutHead, errorHead),
+      context: errorProps
     };
   }
   function normalizeMiddlewareNames(config) {
@@ -759,7 +761,8 @@ function createFileRouter(options) {
         model,
         contextModel,
         pageModel: pageNode,
-        head: mergeHead(layoutHead, pageHead)
+        head: mergeHead(layoutHead, pageHead),
+        context: pageContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -779,6 +782,38 @@ function parseSearchParams(query) {
 }
 
 // src/http.ts
+function attachResolvedContextToCoreRequest(req, context) {
+  if (!context) {
+    return;
+  }
+  const coreRequest = req.__webframezCoreRequest;
+  if (!coreRequest) {
+    return;
+  }
+  const data = context.data && typeof context.data === "object" ? context.data : void 0;
+  const env = data?.env;
+  const website = data?.website;
+  coreRequest.__webframezReactContext = {
+    pathname: context.pathname,
+    params: context.params,
+    request: context.request,
+    data: data ? {
+      env,
+      website,
+      is_env_website_request: data.is_env_website_request,
+      is_website_domain_request: data.is_website_domain_request,
+      website_base_path: data.website_base_path,
+      website_route_base_path: data.website_route_base_path,
+      website_transport_base_path: data.website_transport_base_path
+    } : void 0
+  };
+  if (!coreRequest.env && env) {
+    coreRequest.env = env;
+  }
+  if (!coreRequest.website && website) {
+    coreRequest.website = website;
+  }
+}
 function createInitialHtmlErrorMarkup(message) {
   return `<main style="font-family:system-ui,sans-serif;padding:24px"><h1 style="margin:0 0 12px">500</h1><p style="margin:0">${message}</p></main>`;
 }
@@ -913,13 +948,31 @@ globalThis.__webpack_chunk_load__ = function __webframezNoopChunkLoad() {
 };
 function normalizeWebframezRequireCandidate(candidate) {
   const stagingMarker = path.join(".webframez-build", "");
-  const appMarker = path.join("app", "");
+  const runtimeMarkers = [path.join("app", ""), path.join("modules", "")];
   const stagingIndex = candidate.indexOf(stagingMarker);
-  const appIndex = candidate.indexOf(appMarker, stagingIndex >= 0 ? stagingIndex : 0);
-  if (stagingIndex >= 0 && appIndex >= 0) {
-    const runtimeCandidate = path.resolve(process.cwd(), candidate.slice(appIndex));
-    if (fs.existsSync(runtimeCandidate)) {
-      return runtimeCandidate;
+  if (stagingIndex >= 0) {
+    for (const runtimeMarker of runtimeMarkers) {
+      const markerIndex = candidate.indexOf(runtimeMarker, stagingIndex);
+      if (markerIndex < 0) {
+        continue;
+      }
+
+      const relativeRuntimePath = candidate.slice(markerIndex);
+      const runtimeCandidates = [
+        path.resolve(process.cwd(), relativeRuntimePath),
+        path.resolve(process.cwd(), "build", relativeRuntimePath)
+      ];
+      const cwdParts = process.cwd().split(path.sep);
+      const buildsIndex = cwdParts.lastIndexOf("builds");
+      if (buildsIndex > 0) {
+        const projectRoot = cwdParts.slice(0, buildsIndex).join(path.sep) || path.sep;
+        runtimeCandidates.push(path.resolve(projectRoot, "build", relativeRuntimePath));
+      }
+
+      const runtimeCandidate = runtimeCandidates.find((candidatePath) => fs.existsSync(candidatePath));
+      if (runtimeCandidate) {
+        return runtimeCandidate;
+      }
     }
   }
 
@@ -1609,6 +1662,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
         contextModel: resolved2.contextModel,
@@ -1683,6 +1737,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
       head: resolved.head
@@ -1963,7 +2018,13 @@ function registerRouteRenderer(route, methodName) {
                 `Route.${methodName} only supports node/http requests`
               );
             }
-            await handleNodeRequest(req.message, res.res);
+            const message = req.message;
+            message.__webframezCoreRequest = req;
+            try {
+              await handleNodeRequest(message, res.res);
+            } finally {
+              delete message.__webframezCoreRequest;
+            }
             await waitForResponseFinish(res.res);
           },
           routeOptions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {