@webtypen/webframez-react 0.0.29 → 0.0.31

package/dist/index.js

@@ -8,10 +8,10 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/server.ts
 import path from "node:path";
-import { Writable } from "node:stream";
+import { Readable, Writable } from "node:stream";
 import { createRequire } from "node:module";
 import { renderToPipeableStream } from "react-server-dom-webpack/server";
-import { createFromReadableStream } from "react-server-dom-webpack/client.node";
+import * as reactServerDomClientNode from "react-server-dom-webpack/client.node";
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -24,6 +24,7 @@ function createHTMLShell(options = {}) {
     rootHtml = "",
     initialFlightData = "",
     basename = "",
+    routeBasePath = "",
     liveReloadPath,
     liveReloadServerId
   } = options;
@@ -72,6 +73,7 @@ function createHTMLShell(options = {}) {
     <div id="root">${rootHtml}</div>
     <script>window.__RSC_ENDPOINT = "${rscEndpoint}";</script>
     <script>window.__RSC_BASENAME = "${basename}";</script>
+    <script>window.__RSC_ROUTE_BASE_PATH = "${routeBasePath}";</script>
     <script>window.__RSC_INITIAL_PAYLOAD = ${escapedInitialFlightData};</script>
     <script type="module" src="${clientScriptUrl}"></script>
     ${liveReloadScript}
@@ -150,12 +152,12 @@ 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) {
+  if (typeof value !== "string") {
     return void 0;
   }
-  if (trimmed === "/") {
-    return "/";
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
   }
   return trimmed.replace(/\/+$/, "");
 }
@@ -168,6 +170,9 @@ function resolveHeadAssetUrl(assetUrl, basename) {
   if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
     return normalizedAssetUrl;
   }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return normalizedAssetUrl;
+  }
   if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
     return normalizedAssetUrl;
   }
@@ -184,9 +189,15 @@ function normalizeHeadConfig(head, inheritedBasename) {
     return void 0;
   }
   const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedRouteBasePath = normalizeHeadBasename(head.routeBasePath);
+  const normalizedTransportBasePath = normalizeHeadBasename(
+    head.transportBasePath
+  );
   const normalizedHead = {
     ...head,
-    ...effectiveBasename ? { basename: effectiveBasename } : {}
+    ...effectiveBasename !== void 0 ? { basename: effectiveBasename } : {},
+    ...normalizedRouteBasePath !== void 0 ? { routeBasePath: normalizedRouteBasePath } : {},
+    ...normalizedTransportBasePath !== void 0 ? { transportBasePath: normalizedTransportBasePath } : {}
   };
   if (normalizedHead.favicon) {
     normalizedHead.favicon = resolveHeadAssetUrl(
@@ -747,8 +758,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -866,14 +877,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload
@@ -980,6 +1011,23 @@ function stripBasePath(pathname, basePath) {
   }
   return pathname;
 }
+function normalizeRuntimeBasePath(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function joinRuntimeBasePath(basePath, pathname) {
+  const normalizedPath = !pathname || pathname === "/" ? "/" : pathname.startsWith("/") ? pathname : `/${pathname}`;
+  if (!basePath) {
+    return normalizedPath;
+  }
+  return normalizedPath === "/" ? basePath : `${basePath}${normalizedPath}`;
+}
 function sanitizeInitialHtmlWorkerNodeOptions(rawNodeOptions) {
   if (!rawNodeOptions || rawNodeOptions.trim() === "") {
     return "";
@@ -1380,6 +1428,14 @@ function createNodeRequestHandler(options) {
     const initialFlightData = await renderRSCToString(initialPayload, {
       moduleMap
     });
+    const transportBasePath = normalizeRuntimeBasePath(resolved.head.transportBasePath) ?? normalizeRuntimeBasePath(basePath) ?? "";
+    const shellClientScriptUrl = joinRuntimeBasePath(
+      transportBasePath,
+      "/assets/client.js"
+    );
+    const shellRscEndpoint = joinRuntimeBasePath(transportBasePath, "/rsc");
+    const shellBasename = normalizeRuntimeBasePath(resolved.head.basename) ?? normalizeRuntimeBasePath(basePath) ?? "";
+    const shellRouteBasePath = normalizeRuntimeBasePath(resolved.head.routeBasePath) ?? "";
     let rootHtml = "";
     try {
       rootHtml = await initialHtmlWorker.renderFromFlightData({
@@ -1410,11 +1466,12 @@ function createNodeRequestHandler(options) {
             createHTMLShell({
               title: "500 - Initial HTML render failed",
               headTags: "",
-              clientScriptUrl,
-              rscEndpoint: rscPath,
+              clientScriptUrl: shellClientScriptUrl,
+              rscEndpoint: shellRscEndpoint,
               rootHtml: createInitialHtmlErrorMarkup("Initial HTML render failed."),
               initialFlightData,
-              basename: resolved?.head?.basename ?? basePath,
+              basename: shellBasename,
+              routeBasePath: shellRouteBasePath,
               liveReloadPath: liveReloadPath || void 0,
               liveReloadServerId: liveReloadPath ? devServerId : void 0
             })
@@ -1429,11 +1486,12 @@ function createNodeRequestHandler(options) {
       createHTMLShell({
         title: resolved.head.title || "Webframez React",
         headTags: renderHeadToString(resolved.head),
-        clientScriptUrl,
-        rscEndpoint: rscPath,
+        clientScriptUrl: shellClientScriptUrl,
+        rscEndpoint: shellRscEndpoint,
         rootHtml,
         initialFlightData,
-        basename: resolved.head.basename ?? basePath,
+        basename: shellBasename,
+        routeBasePath: shellRouteBasePath,
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       })

package/dist/router.cjs

@@ -44,12 +44,12 @@ var import_node_path = __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) {
+  if (typeof value !== "string") {
     return void 0;
   }
-  if (trimmed === "/") {
-    return "/";
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
   }
   return trimmed.replace(/\/+$/, "");
 }
@@ -62,6 +62,9 @@ function resolveHeadAssetUrl(assetUrl, basename) {
   if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
     return normalizedAssetUrl;
   }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return normalizedAssetUrl;
+  }
   if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
     return normalizedAssetUrl;
   }
@@ -78,9 +81,15 @@ function normalizeHeadConfig(head, inheritedBasename) {
     return void 0;
   }
   const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedRouteBasePath = normalizeHeadBasename(head.routeBasePath);
+  const normalizedTransportBasePath = normalizeHeadBasename(
+    head.transportBasePath
+  );
   const normalizedHead = {
     ...head,
-    ...effectiveBasename ? { basename: effectiveBasename } : {}
+    ...effectiveBasename !== void 0 ? { basename: effectiveBasename } : {},
+    ...normalizedRouteBasePath !== void 0 ? { routeBasePath: normalizedRouteBasePath } : {},
+    ...normalizedTransportBasePath !== void 0 ? { transportBasePath: normalizedTransportBasePath } : {}
   };
   if (normalizedHead.favicon) {
     normalizedHead.favicon = resolveHeadAssetUrl(

package/dist/router.js

@@ -14,12 +14,12 @@ 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) {
+  if (typeof value !== "string") {
     return void 0;
   }
-  if (trimmed === "/") {
-    return "/";
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
   }
   return trimmed.replace(/\/+$/, "");
 }
@@ -32,6 +32,9 @@ function resolveHeadAssetUrl(assetUrl, basename) {
   if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
     return normalizedAssetUrl;
   }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return normalizedAssetUrl;
+  }
   if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
     return normalizedAssetUrl;
   }
@@ -48,9 +51,15 @@ function normalizeHeadConfig(head, inheritedBasename) {
     return void 0;
   }
   const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedRouteBasePath = normalizeHeadBasename(head.routeBasePath);
+  const normalizedTransportBasePath = normalizeHeadBasename(
+    head.transportBasePath
+  );
   const normalizedHead = {
     ...head,
-    ...effectiveBasename ? { basename: effectiveBasename } : {}
+    ...effectiveBasename !== void 0 ? { basename: effectiveBasename } : {},
+    ...normalizedRouteBasePath !== void 0 ? { routeBasePath: normalizedRouteBasePath } : {},
+    ...normalizedTransportBasePath !== void 0 ? { transportBasePath: normalizedTransportBasePath } : {}
   };
   if (normalizedHead.favicon) {
     normalizedHead.favicon = resolveHeadAssetUrl(

package/dist/webframez-core.cjs

@@ -45,7 +45,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_stream = require("node:stream");
 var import_node_module = require("node:module");
 var import_server = require("react-server-dom-webpack/server");
-var import_client = require("react-server-dom-webpack/client.node");
+var reactServerDomClientNode = __toESM(require("react-server-dom-webpack/client.node"), 1);
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -58,6 +58,7 @@ function createHTMLShell(options = {}) {
     rootHtml = "",
     initialFlightData = "",
     basename = "",
+    routeBasePath = "",
     liveReloadPath,
     liveReloadServerId
   } = options;
@@ -106,6 +107,7 @@ function createHTMLShell(options = {}) {
     <div id="root">${rootHtml}</div>
     <script>window.__RSC_ENDPOINT = "${rscEndpoint}";</script>
     <script>window.__RSC_BASENAME = "${basename}";</script>
+    <script>window.__RSC_ROUTE_BASE_PATH = "${routeBasePath}";</script>
     <script>window.__RSC_INITIAL_PAYLOAD = ${escapedInitialFlightData};</script>
     <script type="module" src="${clientScriptUrl}"></script>
     ${liveReloadScript}
@@ -156,12 +158,12 @@ 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) {
+  if (typeof value !== "string") {
     return void 0;
   }
-  if (trimmed === "/") {
-    return "/";
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
   }
   return trimmed.replace(/\/+$/, "");
 }
@@ -174,6 +176,9 @@ function resolveHeadAssetUrl(assetUrl, basename) {
   if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
     return normalizedAssetUrl;
   }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return normalizedAssetUrl;
+  }
   if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
     return normalizedAssetUrl;
   }
@@ -190,9 +195,15 @@ function normalizeHeadConfig(head, inheritedBasename) {
     return void 0;
   }
   const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedRouteBasePath = normalizeHeadBasename(head.routeBasePath);
+  const normalizedTransportBasePath = normalizeHeadBasename(
+    head.transportBasePath
+  );
   const normalizedHead = {
     ...head,
-    ...effectiveBasename ? { basename: effectiveBasename } : {}
+    ...effectiveBasename !== void 0 ? { basename: effectiveBasename } : {},
+    ...normalizedRouteBasePath !== void 0 ? { routeBasePath: normalizedRouteBasePath } : {},
+    ...normalizedTransportBasePath !== void 0 ? { transportBasePath: normalizedTransportBasePath } : {}
   };
   if (normalizedHead.favicon) {
     normalizedHead.favicon = resolveHeadAssetUrl(
@@ -749,8 +760,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -868,14 +879,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload
@@ -982,6 +1013,23 @@ function stripBasePath(pathname, basePath) {
   }
   return pathname;
 }
+function normalizeRuntimeBasePath(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function joinRuntimeBasePath(basePath, pathname) {
+  const normalizedPath = !pathname || pathname === "/" ? "/" : pathname.startsWith("/") ? pathname : `/${pathname}`;
+  if (!basePath) {
+    return normalizedPath;
+  }
+  return normalizedPath === "/" ? basePath : `${basePath}${normalizedPath}`;
+}
 function sanitizeInitialHtmlWorkerNodeOptions(rawNodeOptions) {
   if (!rawNodeOptions || rawNodeOptions.trim() === "") {
     return "";
@@ -1382,6 +1430,14 @@ function createNodeRequestHandler(options) {
     const initialFlightData = await renderRSCToString(initialPayload, {
       moduleMap
     });
+    const transportBasePath = normalizeRuntimeBasePath(resolved.head.transportBasePath) ?? normalizeRuntimeBasePath(basePath) ?? "";
+    const shellClientScriptUrl = joinRuntimeBasePath(
+      transportBasePath,
+      "/assets/client.js"
+    );
+    const shellRscEndpoint = joinRuntimeBasePath(transportBasePath, "/rsc");
+    const shellBasename = normalizeRuntimeBasePath(resolved.head.basename) ?? normalizeRuntimeBasePath(basePath) ?? "";
+    const shellRouteBasePath = normalizeRuntimeBasePath(resolved.head.routeBasePath) ?? "";
     let rootHtml = "";
     try {
       rootHtml = await initialHtmlWorker.renderFromFlightData({
@@ -1412,11 +1468,12 @@ function createNodeRequestHandler(options) {
             createHTMLShell({
               title: "500 - Initial HTML render failed",
               headTags: "",
-              clientScriptUrl,
-              rscEndpoint: rscPath,
+              clientScriptUrl: shellClientScriptUrl,
+              rscEndpoint: shellRscEndpoint,
               rootHtml: createInitialHtmlErrorMarkup("Initial HTML render failed."),
               initialFlightData,
-              basename: resolved?.head?.basename ?? basePath,
+              basename: shellBasename,
+              routeBasePath: shellRouteBasePath,
               liveReloadPath: liveReloadPath || void 0,
               liveReloadServerId: liveReloadPath ? devServerId : void 0
             })
@@ -1431,11 +1488,12 @@ function createNodeRequestHandler(options) {
       createHTMLShell({
         title: resolved.head.title || "Webframez React",
         headTags: renderHeadToString(resolved.head),
-        clientScriptUrl,
-        rscEndpoint: rscPath,
+        clientScriptUrl: shellClientScriptUrl,
+        rscEndpoint: shellRscEndpoint,
         rootHtml,
         initialFlightData,
-        basename: resolved.head.basename ?? basePath,
+        basename: shellBasename,
+        routeBasePath: shellRouteBasePath,
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       })

package/dist/webframez-core.js

@@ -14,10 +14,10 @@ import { spawn } from "node:child_process";
 
 // src/server.ts
 import path from "node:path";
-import { Writable } from "node:stream";
+import { Readable, Writable } from "node:stream";
 import { createRequire } from "node:module";
 import { renderToPipeableStream } from "react-server-dom-webpack/server";
-import { createFromReadableStream } from "react-server-dom-webpack/client.node";
+import * as reactServerDomClientNode from "react-server-dom-webpack/client.node";
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -30,6 +30,7 @@ function createHTMLShell(options = {}) {
     rootHtml = "",
     initialFlightData = "",
     basename = "",
+    routeBasePath = "",
     liveReloadPath,
     liveReloadServerId
   } = options;
@@ -78,6 +79,7 @@ function createHTMLShell(options = {}) {
     <div id="root">${rootHtml}</div>
     <script>window.__RSC_ENDPOINT = "${rscEndpoint}";</script>
     <script>window.__RSC_BASENAME = "${basename}";</script>
+    <script>window.__RSC_ROUTE_BASE_PATH = "${routeBasePath}";</script>
     <script>window.__RSC_INITIAL_PAYLOAD = ${escapedInitialFlightData};</script>
     <script type="module" src="${clientScriptUrl}"></script>
     ${liveReloadScript}
@@ -128,12 +130,12 @@ 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) {
+  if (typeof value !== "string") {
     return void 0;
   }
-  if (trimmed === "/") {
-    return "/";
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
   }
   return trimmed.replace(/\/+$/, "");
 }
@@ -146,6 +148,9 @@ function resolveHeadAssetUrl(assetUrl, basename) {
   if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
     return normalizedAssetUrl;
   }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return normalizedAssetUrl;
+  }
   if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
     return normalizedAssetUrl;
   }
@@ -162,9 +167,15 @@ function normalizeHeadConfig(head, inheritedBasename) {
     return void 0;
   }
   const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedRouteBasePath = normalizeHeadBasename(head.routeBasePath);
+  const normalizedTransportBasePath = normalizeHeadBasename(
+    head.transportBasePath
+  );
   const normalizedHead = {
     ...head,
-    ...effectiveBasename ? { basename: effectiveBasename } : {}
+    ...effectiveBasename !== void 0 ? { basename: effectiveBasename } : {},
+    ...normalizedRouteBasePath !== void 0 ? { routeBasePath: normalizedRouteBasePath } : {},
+    ...normalizedTransportBasePath !== void 0 ? { transportBasePath: normalizedTransportBasePath } : {}
   };
   if (normalizedHead.favicon) {
     normalizedHead.favicon = resolveHeadAssetUrl(
@@ -721,8 +732,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -840,14 +851,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload
@@ -954,6 +985,23 @@ function stripBasePath(pathname, basePath) {
   }
   return pathname;
 }
+function normalizeRuntimeBasePath(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") {
+    return "";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function joinRuntimeBasePath(basePath, pathname) {
+  const normalizedPath = !pathname || pathname === "/" ? "/" : pathname.startsWith("/") ? pathname : `/${pathname}`;
+  if (!basePath) {
+    return normalizedPath;
+  }
+  return normalizedPath === "/" ? basePath : `${basePath}${normalizedPath}`;
+}
 function sanitizeInitialHtmlWorkerNodeOptions(rawNodeOptions) {
   if (!rawNodeOptions || rawNodeOptions.trim() === "") {
     return "";
@@ -1354,6 +1402,14 @@ function createNodeRequestHandler(options) {
     const initialFlightData = await renderRSCToString(initialPayload, {
       moduleMap
     });
+    const transportBasePath = normalizeRuntimeBasePath(resolved.head.transportBasePath) ?? normalizeRuntimeBasePath(basePath) ?? "";
+    const shellClientScriptUrl = joinRuntimeBasePath(
+      transportBasePath,
+      "/assets/client.js"
+    );
+    const shellRscEndpoint = joinRuntimeBasePath(transportBasePath, "/rsc");
+    const shellBasename = normalizeRuntimeBasePath(resolved.head.basename) ?? normalizeRuntimeBasePath(basePath) ?? "";
+    const shellRouteBasePath = normalizeRuntimeBasePath(resolved.head.routeBasePath) ?? "";
     let rootHtml = "";
     try {
       rootHtml = await initialHtmlWorker.renderFromFlightData({
@@ -1384,11 +1440,12 @@ function createNodeRequestHandler(options) {
             createHTMLShell({
               title: "500 - Initial HTML render failed",
               headTags: "",
-              clientScriptUrl,
-              rscEndpoint: rscPath,
+              clientScriptUrl: shellClientScriptUrl,
+              rscEndpoint: shellRscEndpoint,
               rootHtml: createInitialHtmlErrorMarkup("Initial HTML render failed."),
               initialFlightData,
-              basename: resolved?.head?.basename ?? basePath,
+              basename: shellBasename,
+              routeBasePath: shellRouteBasePath,
               liveReloadPath: liveReloadPath || void 0,
               liveReloadServerId: liveReloadPath ? devServerId : void 0
             })
@@ -1403,11 +1460,12 @@ function createNodeRequestHandler(options) {
       createHTMLShell({
         title: resolved.head.title || "Webframez React",
         headTags: renderHeadToString(resolved.head),
-        clientScriptUrl,
-        rscEndpoint: rscPath,
+        clientScriptUrl: shellClientScriptUrl,
+        rscEndpoint: shellRscEndpoint,
         rootHtml,
         initialFlightData,
-        basename: resolved.head.basename ?? basePath,
+        basename: shellBasename,
+        routeBasePath: shellRouteBasePath,
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       })

package/package.json

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