@webtypen/webframez-react 0.0.24 → 0.0.27

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 normalizeAssetsBaseUrl(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, assetsBaseUrl) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedAssetsBaseUrl = normalizeAssetsBaseUrl(assetsBaseUrl);
+  if (!normalizedAssetUrl || !normalizedAssetsBaseUrl) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedAssetsBaseUrl !== "/" && (normalizedAssetUrl === normalizedAssetsBaseUrl || normalizedAssetUrl.startsWith(`${normalizedAssetsBaseUrl}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedAssetsBaseUrl === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedAssetsBaseUrl}${normalizedAssetUrl}`;
+  }
+  return `${normalizedAssetsBaseUrl}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedAssetsBaseUrl) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveAssetsBaseUrl = normalizeAssetsBaseUrl(head.assetsBaseUrl) ?? normalizeAssetsBaseUrl(inheritedAssetsBaseUrl);
+  const normalizedHead = {
+    ...head,
+    ...effectiveAssetsBaseUrl ? { assetsBaseUrl: effectiveAssetsBaseUrl } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveAssetsBaseUrl
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveAssetsBaseUrl)
+    }));
+  }
+  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.assetsBaseUrl);
     if (!config) {
       continue;
     }
@@ -378,6 +435,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.assetsBaseUrl) {
+      merged.assetsBaseUrl = config.assetsBaseUrl;
+    }
     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} />`);
   }
@@ -735,7 +796,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -1039,22 +1114,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return (0, import_node_url.fileURLToPath)(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

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 normalizeAssetsBaseUrl(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, assetsBaseUrl) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedAssetsBaseUrl = normalizeAssetsBaseUrl(assetsBaseUrl);
+  if (!normalizedAssetUrl || !normalizedAssetsBaseUrl) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedAssetsBaseUrl !== "/" && (normalizedAssetUrl === normalizedAssetsBaseUrl || normalizedAssetUrl.startsWith(`${normalizedAssetsBaseUrl}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedAssetsBaseUrl === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedAssetsBaseUrl}${normalizedAssetUrl}`;
+  }
+  return `${normalizedAssetsBaseUrl}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedAssetsBaseUrl) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveAssetsBaseUrl = normalizeAssetsBaseUrl(head.assetsBaseUrl) ?? normalizeAssetsBaseUrl(inheritedAssetsBaseUrl);
+  const normalizedHead = {
+    ...head,
+    ...effectiveAssetsBaseUrl ? { assetsBaseUrl: effectiveAssetsBaseUrl } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveAssetsBaseUrl
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveAssetsBaseUrl)
+    }));
+  }
+  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.assetsBaseUrl);
     if (!config) {
       continue;
     }
@@ -350,6 +407,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.assetsBaseUrl) {
+      merged.assetsBaseUrl = config.assetsBaseUrl;
+    }
     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} />`);
   }
@@ -707,7 +768,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -1011,22 +1086,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return fileURLToPath(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {
@@ -78,9 +78,9 @@
   },
   "peerDependencies": {
     "@webtypen/webframez-core": "^0.3.30",
-    "react": "0.0.0-experimental-95ffd6cd-20260205",
-    "react-dom": "0.0.0-experimental-95ffd6cd-20260205",
-    "react-server-dom-webpack": "0.0.0-experimental-95ffd6cd-20260205"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-server-dom-webpack": "^19.0.0"
   },
   "peerDependenciesMeta": {
     "@webtypen/webframez-core": {
@@ -89,8 +89,8 @@
   },
   "devDependencies": {
     "esbuild": "^0.20.2",
-    "react": "0.0.0-experimental-95ffd6cd-20260205",
-    "react-dom": "0.0.0-experimental-95ffd6cd-20260205",
-    "react-server-dom-webpack": "0.0.0-experimental-95ffd6cd-20260205"
+    "react": "19.1.1",
+    "react-dom": "19.1.1",
+    "react-server-dom-webpack": "19.1.1"
   }
 }