@webtypen/webframez-react 0.0.25 → 0.0.28

package/dist/router.js

@@ -11,6 +11,62 @@ import fs from "node:fs";
 import Module from "node:module";
 import path from "node:path";
 
+// src/head.ts
+var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
+function normalizeHeadBasename(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, basename) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedBasename = normalizeHeadBasename(basename);
+  if (!normalizedAssetUrl || !normalizedBasename) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedBasename}${normalizedAssetUrl}`;
+  }
+  return `${normalizedBasename}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedBasename) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedHead = {
+    ...head,
+    ...effectiveBasename ? { basename: effectiveBasename } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveBasename
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveBasename)
+    }));
+  }
+  return normalizedHead;
+}
+
 // src/router-runtime.tsx
 import React from "react";
 var ROUTE_CHILDREN_TAG = "webframez-route-children";
@@ -226,7 +282,8 @@ function mergeHead(...configs) {
     meta: [],
     links: []
   };
-  for (const config of configs) {
+  for (const candidate of configs) {
+    const config = normalizeHeadConfig(candidate, merged.basename);
     if (!config) {
       continue;
     }
@@ -236,6 +293,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.basename) {
+      merged.basename = config.basename;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -249,22 +309,23 @@ function mergeHead(...configs) {
   return merged;
 }
 function renderHeadToString(head) {
+  const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
-  if (head.description) {
+  if (normalizedHead.description) {
     tags.push(
-      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(normalizedHead.description)}" />`
     );
   }
-  if (head.favicon) {
+  if (normalizedHead.favicon) {
     tags.push(
-      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(normalizedHead.favicon)}" />`
     );
   }
-  for (const meta of head.meta ?? []) {
+  for (const meta of normalizedHead.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
-  for (const link of head.links ?? []) {
+  for (const link of normalizedHead.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
@@ -480,6 +541,12 @@ function createFileRouter(options) {
       params: {},
       searchParams: input.searchParams,
       cookies: input.cookies ?? {},
+      request: input.request ?? {
+        host: null,
+        pathname,
+        originalPathname: pathname,
+        headers: {}
+      },
       abort: (options2) => {
         throw createAbort(options2);
       }

package/dist/types.d.ts

@@ -2,6 +2,14 @@ import type { ReactNode } from "react";
 
 export type RouteParams = Record<string, string | string[]>;
 export type RouteSearchParams = Record<string, string | string[]>;
+export type RouteRequestHeaders = Record<string, string | string[] | undefined>;
+
+export type RouteRequestContext = {
+  host: string | null;
+  pathname: string;
+  originalPathname: string;
+  headers: RouteRequestHeaders;
+};
 
 export type AbortRouteOptions = {
   status?: number;
@@ -9,11 +17,12 @@ export type AbortRouteOptions = {
   payload?: unknown;
 };
 
-export type RouteContext<TData = unknown> = {
+export type RouteContext<TData = any> = {
   pathname: string;
   params: RouteParams;
   searchParams: RouteSearchParams;
   cookies: Record<string, string>;
+  request: RouteRequestContext;
   data?: TData;
   abort: (options?: AbortRouteOptions) => never;
 };
@@ -22,11 +31,11 @@ export type InferPageData<TDataResolver> =
   TDataResolver extends (...args: any[]) => any
     ? Awaited<ReturnType<TDataResolver>>
     : TDataResolver;
-export type PageProps<TData = unknown> = RouteContext<InferPageData<TData>>;
+export type PageProps<TData = any> = RouteContext<InferPageData<TData>>;
 export type PagePropsFromData<TDataResolver extends (...args: any[]) => any> =
   PageProps<InferPageData<TDataResolver>>;
 
-export type ErrorPageProps<TData = unknown> = RouteContext<TData> & {
+export type ErrorPageProps<TData = any> = RouteContext<TData> & {
   statusCode: number;
   message: string;
   payload?: unknown;
@@ -51,6 +60,7 @@ export type HeadLinkTag = {
 export type HeadConfig = {
   title?: string;
   description?: string;
+  basename?: string;
   favicon?: string;
   meta?: HeadMetaTag[];
   links?: HeadLinkTag[];
@@ -65,18 +75,18 @@ export type HeadResolver<TContext = RouteContext> = (
   context: TContext
 ) => HeadConfig | Promise<HeadConfig>;
 
-export type PageDataResolver<TData = unknown> = (
+export type PageDataResolver<TData = any> = (
   context: RouteContext
 ) => TData | Promise<TData>;
 
 export type RouteMiddlewareResult = Record<string, unknown> | undefined | void;
-export type RouteMiddlewareResolver<TData = unknown> = (
+export type RouteMiddlewareResolver<TData = any> = (
   context: RouteContext<TData>
 ) => RouteMiddlewareResult | Promise<RouteMiddlewareResult>;
 export type RouteMiddlewareRegistry = Record<string, RouteMiddlewareResolver<any>>;
 export type RouteMiddlewareConfig = string | string[];
 
-export type PageModule<TData = unknown> = {
+export type PageModule<TData = any> = {
   default: (props: PageProps<TData>) => ReactNode | Promise<ReactNode>;
   Head?: HeadResolver<PageProps<TData>>;
   Data?: PageDataResolver<TData>;

package/dist/webframez-core.cjs

@@ -153,6 +153,62 @@ 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);
 
+// src/head.ts
+var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
+function normalizeHeadBasename(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, basename) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedBasename = normalizeHeadBasename(basename);
+  if (!normalizedAssetUrl || !normalizedBasename) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedBasename}${normalizedAssetUrl}`;
+  }
+  return `${normalizedBasename}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedBasename) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedHead = {
+    ...head,
+    ...effectiveBasename ? { basename: effectiveBasename } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveBasename
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveBasename)
+    }));
+  }
+  return normalizedHead;
+}
+
 // src/router-runtime.tsx
 var import_react = __toESM(require("react"), 1);
 var ROUTE_CHILDREN_TAG = "webframez-route-children";
@@ -368,7 +424,8 @@ function mergeHead(...configs) {
     meta: [],
     links: []
   };
-  for (const config of configs) {
+  for (const candidate of configs) {
+    const config = normalizeHeadConfig(candidate, merged.basename);
     if (!config) {
       continue;
     }
@@ -378,6 +435,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.basename) {
+      merged.basename = config.basename;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -391,22 +451,23 @@ function mergeHead(...configs) {
   return merged;
 }
 function renderHeadToString(head) {
+  const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
-  if (head.description) {
+  if (normalizedHead.description) {
     tags.push(
-      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(normalizedHead.description)}" />`
     );
   }
-  if (head.favicon) {
+  if (normalizedHead.favicon) {
     tags.push(
-      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(normalizedHead.favicon)}" />`
     );
   }
-  for (const meta of head.meta ?? []) {
+  for (const meta of normalizedHead.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
-  for (const link of head.links ?? []) {
+  for (const link of normalizedHead.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
@@ -622,6 +683,12 @@ function createFileRouter(options) {
       params: {},
       searchParams: input.searchParams,
       cookies: input.cookies ?? {},
+      request: input.request ?? {
+        host: null,
+        pathname,
+        originalPathname: pathname,
+        headers: {}
+      },
       abort: (options2) => {
         throw createAbort(options2);
       }
@@ -849,6 +916,60 @@ function normalizeBasePath(basePath) {
   const withLeadingSlash = basePath.startsWith("/") ? basePath : `/${basePath}`;
   return withLeadingSlash.endsWith("/") ? withLeadingSlash.slice(0, -1) : withLeadingSlash;
 }
+function normalizeRequestHostValue(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const firstValue = trimmed.split(",")[0]?.trim() || "";
+  if (!firstValue) {
+    return null;
+  }
+  if (firstValue.startsWith("[")) {
+    const closingIndex = firstValue.indexOf("]");
+    if (closingIndex > 0) {
+      return firstValue.slice(1, closingIndex).toLowerCase();
+    }
+  }
+  return firstValue.replace(/:\d+$/, "").toLowerCase();
+}
+function getRequestHost(req) {
+  const candidates = [
+    req.headers["x-forwarded-host"],
+    req.headers["x-original-host"],
+    req.headers.host
+  ];
+  for (const candidate of candidates) {
+    if (Array.isArray(candidate)) {
+      for (const singleValue of candidate) {
+        if (typeof singleValue !== "string") {
+          continue;
+        }
+        const normalized2 = normalizeRequestHostValue(singleValue);
+        if (normalized2) {
+          return normalized2;
+        }
+      }
+      continue;
+    }
+    if (typeof candidate !== "string") {
+      continue;
+    }
+    const normalized = normalizeRequestHostValue(candidate);
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return null;
+}
+function createRouteRequestContext(req, pathname, originalPathname) {
+  return {
+    host: getRequestHost(req),
+    pathname,
+    originalPathname,
+    headers: req.headers
+  };
+}
 function stripBasePath(pathname, basePath) {
   if (!basePath) {
     return pathname;
@@ -1194,13 +1315,19 @@ function createNodeRequestHandler(options) {
     }
     if (url.pathname === rscPath) {
       const pathname = stripBasePath(url.searchParams.get("path") || "/", basePath);
+      const requestContext = createRouteRequestContext(
+        req,
+        pathname,
+        url.searchParams.get("path") || "/"
+      );
       const search = new URLSearchParams(url.searchParams.get("search") || "");
       const resolved2 = await withRequestBasename(
         basePath,
         () => router.resolve({
           pathname,
           searchParams: parseSearchParams(search),
-          cookies: requestCookies
+          cookies: requestCookies,
+          request: requestContext
         })
       );
       const payload = {
@@ -1240,7 +1367,12 @@ function createNodeRequestHandler(options) {
       () => router.resolve({
         pathname: stripBasePath(url.pathname, basePath),
         searchParams: parseSearchParams(url.searchParams),
-        cookies: requestCookies
+        cookies: requestCookies,
+        request: createRouteRequestContext(
+          req,
+          stripBasePath(url.pathname, basePath),
+          url.pathname
+        )
       })
     );
     const initialPayload = {
@@ -1284,7 +1416,7 @@ function createNodeRequestHandler(options) {
               rscEndpoint: rscPath,
               rootHtml: createInitialHtmlErrorMarkup("Initial HTML render failed."),
               initialFlightData,
-              basename: basePath,
+              basename: resolved?.head?.basename ?? basePath,
               liveReloadPath: liveReloadPath || void 0,
               liveReloadServerId: liveReloadPath ? devServerId : void 0
             })
@@ -1303,7 +1435,7 @@ function createNodeRequestHandler(options) {
         rscEndpoint: rscPath,
         rootHtml,
         initialFlightData,
-        basename: basePath,
+        basename: resolved.head.basename ?? basePath,
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       })

package/dist/webframez-core.js

@@ -125,6 +125,62 @@ import fs from "node:fs";
 import Module from "node:module";
 import path2 from "node:path";
 
+// src/head.ts
+var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
+function normalizeHeadBasename(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, basename) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedBasename = normalizeHeadBasename(basename);
+  if (!normalizedAssetUrl || !normalizedBasename) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedBasename}${normalizedAssetUrl}`;
+  }
+  return `${normalizedBasename}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedBasename) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedHead = {
+    ...head,
+    ...effectiveBasename ? { basename: effectiveBasename } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveBasename
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveBasename)
+    }));
+  }
+  return normalizedHead;
+}
+
 // src/router-runtime.tsx
 import React from "react";
 var ROUTE_CHILDREN_TAG = "webframez-route-children";
@@ -340,7 +396,8 @@ function mergeHead(...configs) {
     meta: [],
     links: []
   };
-  for (const config of configs) {
+  for (const candidate of configs) {
+    const config = normalizeHeadConfig(candidate, merged.basename);
     if (!config) {
       continue;
     }
@@ -350,6 +407,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.basename) {
+      merged.basename = config.basename;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -363,22 +423,23 @@ function mergeHead(...configs) {
   return merged;
 }
 function renderHeadToString(head) {
+  const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
-  if (head.description) {
+  if (normalizedHead.description) {
     tags.push(
-      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(normalizedHead.description)}" />`
     );
   }
-  if (head.favicon) {
+  if (normalizedHead.favicon) {
     tags.push(
-      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(normalizedHead.favicon)}" />`
     );
   }
-  for (const meta of head.meta ?? []) {
+  for (const meta of normalizedHead.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
-  for (const link of head.links ?? []) {
+  for (const link of normalizedHead.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
@@ -594,6 +655,12 @@ function createFileRouter(options) {
       params: {},
       searchParams: input.searchParams,
       cookies: input.cookies ?? {},
+      request: input.request ?? {
+        host: null,
+        pathname,
+        originalPathname: pathname,
+        headers: {}
+      },
       abort: (options2) => {
         throw createAbort(options2);
       }
@@ -821,6 +888,60 @@ function normalizeBasePath(basePath) {
   const withLeadingSlash = basePath.startsWith("/") ? basePath : `/${basePath}`;
   return withLeadingSlash.endsWith("/") ? withLeadingSlash.slice(0, -1) : withLeadingSlash;
 }
+function normalizeRequestHostValue(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const firstValue = trimmed.split(",")[0]?.trim() || "";
+  if (!firstValue) {
+    return null;
+  }
+  if (firstValue.startsWith("[")) {
+    const closingIndex = firstValue.indexOf("]");
+    if (closingIndex > 0) {
+      return firstValue.slice(1, closingIndex).toLowerCase();
+    }
+  }
+  return firstValue.replace(/:\d+$/, "").toLowerCase();
+}
+function getRequestHost(req) {
+  const candidates = [
+    req.headers["x-forwarded-host"],
+    req.headers["x-original-host"],
+    req.headers.host
+  ];
+  for (const candidate of candidates) {
+    if (Array.isArray(candidate)) {
+      for (const singleValue of candidate) {
+        if (typeof singleValue !== "string") {
+          continue;
+        }
+        const normalized2 = normalizeRequestHostValue(singleValue);
+        if (normalized2) {
+          return normalized2;
+        }
+      }
+      continue;
+    }
+    if (typeof candidate !== "string") {
+      continue;
+    }
+    const normalized = normalizeRequestHostValue(candidate);
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return null;
+}
+function createRouteRequestContext(req, pathname, originalPathname) {
+  return {
+    host: getRequestHost(req),
+    pathname,
+    originalPathname,
+    headers: req.headers
+  };
+}
 function stripBasePath(pathname, basePath) {
   if (!basePath) {
     return pathname;
@@ -1166,13 +1287,19 @@ function createNodeRequestHandler(options) {
     }
     if (url.pathname === rscPath) {
       const pathname = stripBasePath(url.searchParams.get("path") || "/", basePath);
+      const requestContext = createRouteRequestContext(
+        req,
+        pathname,
+        url.searchParams.get("path") || "/"
+      );
       const search = new URLSearchParams(url.searchParams.get("search") || "");
       const resolved2 = await withRequestBasename(
         basePath,
         () => router.resolve({
           pathname,
           searchParams: parseSearchParams(search),
-          cookies: requestCookies
+          cookies: requestCookies,
+          request: requestContext
         })
       );
       const payload = {
@@ -1212,7 +1339,12 @@ function createNodeRequestHandler(options) {
       () => router.resolve({
         pathname: stripBasePath(url.pathname, basePath),
         searchParams: parseSearchParams(url.searchParams),
-        cookies: requestCookies
+        cookies: requestCookies,
+        request: createRouteRequestContext(
+          req,
+          stripBasePath(url.pathname, basePath),
+          url.pathname
+        )
       })
     );
     const initialPayload = {
@@ -1256,7 +1388,7 @@ function createNodeRequestHandler(options) {
               rscEndpoint: rscPath,
               rootHtml: createInitialHtmlErrorMarkup("Initial HTML render failed."),
               initialFlightData,
-              basename: basePath,
+              basename: resolved?.head?.basename ?? basePath,
               liveReloadPath: liveReloadPath || void 0,
               liveReloadServerId: liveReloadPath ? devServerId : void 0
             })
@@ -1275,7 +1407,7 @@ function createNodeRequestHandler(options) {
         rscEndpoint: rscPath,
         rootHtml,
         initialFlightData,
-        basename: basePath,
+        basename: resolved.head.basename ?? basePath,
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       })