@uniweb/kit 0.9.18 → 0.9.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/kit",
-  "version": "0.9.18",
+  "version": "0.9.20",
   "description": "Standard component library for Uniweb foundations",
   "type": "module",
   "exports": {
@@ -38,15 +38,15 @@
     "clsx": "^2.1.0",
     "fuse.js": "^7.0.0",
     "shiki": "^3.0.0",
-    "tailwind-merge": "^2.6.0",
-    "@uniweb/scene": "0.1.2",
-    "@uniweb/core": "0.7.14"
+    "tailwind-merge": "^3.6.0",
+    "@uniweb/core": "0.7.16",
+    "@uniweb/scene": "0.1.2"
   },
   "peerDependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "tailwindcss": "^3.4.0"
+    "tailwindcss": "^4.0.0"
   }
 }

package/src/components/SafeHtml/SafeHtml.jsx

@@ -1,8 +1,10 @@
 /**
  * SafeHtml Component
  *
- * Safely renders HTML content with topic link resolution.
- * Handles the `topic:` protocol for internal content references.
+ * Safely renders HTML content with internal-reference link resolution.
+ * Handles the `page:` (stable page reference) and `topic:` (legacy) protocols
+ * for internal content references — the same protocols kit's <Link> resolves,
+ * so inline link marks inside rich-text bodies resolve identically.
  *
  * @module @uniweb/kit/SafeHtml
  */
@@ -10,33 +12,27 @@
 import React, { Suspense, useMemo } from 'react'
 import { useWebsite } from '../../hooks/useWebsite.js'
 
+// Matches an <a> tag's href attribute when it carries a page:/topic: internal
+// reference. Regex-based (not DOMParser) so it runs identically in the browser
+// SPA and during SSR/prerender, where no DOM is available.
+const INTERNAL_HREF_RE = /(<a\b[^>]*?\shref=)(["'])((?:page|topic):[^"']*)\2/gi
+
 /**
- * Resolve topic: links in HTML content
- * @param {string} html - HTML string with potential topic: links
+ * Resolve page:/topic: internal-reference hrefs in an HTML string to real
+ * routes via website.makeHref(). Leaves everything else untouched; an
+ * unresolvable reference is returned by makeHref unchanged.
+ * @param {string} html - HTML string with potential page:/topic: links
  * @param {Object} website - Website instance
- * @returns {string} HTML with resolved links
+ * @returns {string} HTML with resolved link hrefs
  */
-function resolveTopicLinks(html, website) {
+function resolveInternalLinks(html, website) {
   if (!html || typeof html !== 'string') return html
-  if (!html.includes('topic:')) return html
-
-  try {
-    const parser = new DOMParser()
-    const doc = parser.parseFromString(html, 'text/html')
-    const links = doc.querySelectorAll('a[href^="topic:"]')
-
-    links.forEach((link) => {
-      const href = link.getAttribute('href')
-      if (href) {
-        link.setAttribute('href', website.makeHref(href))
-      }
-    })
+  if (!html.includes('page:') && !html.includes('topic:')) return html
 
-    return doc.body.innerHTML
-  } catch (error) {
-    console.warn('[SafeHtml] Error resolving topic links:', error)
-    return html
-  }
+  return html.replace(
+    INTERNAL_HREF_RE,
+    (_m, prefix, quote, href) => `${prefix}${quote}${website.makeHref(href)}${quote}`
+  )
 }
 
 /**
@@ -51,8 +47,8 @@ function resolveTopicLinks(html, website) {
  * <SafeHtml value="<p>Hello <strong>World</strong></p>" />
  *
  * @example
- * // With topic links
- * <SafeHtml value='<a href="topic:about">About</a>' />
+ * // With internal reference links (page: stable ref, or legacy topic:)
+ * <SafeHtml value='<a href="page:93dc5359">About</a>' />
  */
 export function SafeHtml({ value, className, as: Component = 'div', ...props }) {
   const { website, getRoutingComponents } = useWebsite()
@@ -67,8 +63,8 @@ export function SafeHtml({ value, className, as: Component = 'div', ...props })
     // Handle array of HTML strings
     const html = Array.isArray(value) ? value.join('') : value
 
-    // Resolve topic: links
-    return website ? resolveTopicLinks(html, website) : html
+    // Resolve page:/topic: internal-reference links
+    return website ? resolveInternalLinks(html, website) : html
   }, [value, website])
 
   // Use runtime SafeHtml if available (recommended for proper sanitization)