@uniweb/runtime 0.6.24 → 0.6.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/runtime",
-  "version": "0.6.24",
+  "version": "0.6.25",
   "description": "Minimal runtime for loading Uniweb foundations",
   "type": "module",
   "exports": {
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@vitejs/plugin-react": "^4.5.2",
     "vite": "^7.3.1",
-    "@uniweb/build": "0.8.27"
+    "@uniweb/build": "0.8.28"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",

package/src/components/PageRenderer.jsx

@@ -122,18 +122,10 @@ export default function PageRenderer() {
   let page = website?.getPage(location.pathname)
   if (page && website) website.setActivePage(location.pathname)
 
-  // Handle redirect pages — navigate to target immediately
-  const redirectTarget = page?.redirect
-  useEffect(() => {
-    if (!redirectTarget) return
-    if (redirectTarget.startsWith('http')) {
-      window.location.replace(redirectTarget)
-    } else {
-      navigate(redirectTarget, { replace: true })
-    }
-  }, [redirectTarget, navigate])
+  // ─── Compute navigation targets (before hooks, no early returns) ───
 
-  if (redirectTarget) return null
+  // Explicit redirect: in page.yml
+  const redirectTarget = page?.redirect || null
 
   // Auto-redirect for content-less pages (structural containers).
   // Folders with page.yml but no markdown keep their route in the hierarchy;
@@ -141,36 +133,36 @@ export default function PageRenderer() {
   const autoRedirectRoute = page && !page.redirect && !page.hasContent()
     ? page.getNavigableRoute()
     : null
-  const shouldAutoRedirect = autoRedirectRoute && autoRedirectRoute !== page?.route
-
-  useEffect(() => {
-    if (!shouldAutoRedirect) return
-    navigate(autoRedirectRoute, { replace: true })
-  }, [shouldAutoRedirect, autoRedirectRoute, navigate])
-
-  if (shouldAutoRedirect) return null
-
-  // Rewrite pages are served by an external site — the host handles routing.
-  // In SPA mode this shouldn't be reached (host proxies before JS loads),
-  // but if it is (e.g., dev mode), do a full page reload to let the host handle it.
-  if (page?.rewrite) {
-    window.location.reload()
-    return null
-  }
+  const shouldAutoRedirect = !!(autoRedirectRoute && autoRedirectRoute !== page?.route)
 
   // If no page found, try the 404 page (do NOT fall back to activePage/homepage)
-  const isNotFound = !page
+  const isNotFound = !page && !redirectTarget
   if (isNotFound) {
     page = website?.getNotFoundPage?.() || null
   }
 
-  // Get head metadata from page (uses Page.getHeadMeta() if available)
+  // Head metadata — compute for all cases (redirect pages get a fallback)
   const headMeta = page?.getHeadMeta?.() || {
     title: isNotFound ? 'Page Not Found' : (page?.title || 'Website'),
     description: page?.description || ''
   }
 
-  // Manage head meta tags
+  // ─── All hooks called unconditionally (React rules of hooks) ───
+
+  useEffect(() => {
+    if (!redirectTarget) return
+    if (redirectTarget.startsWith('http')) {
+      window.location.replace(redirectTarget)
+    } else {
+      navigate(redirectTarget, { replace: true })
+    }
+  }, [redirectTarget, navigate])
+
+  useEffect(() => {
+    if (!shouldAutoRedirect) return
+    navigate(autoRedirectRoute, { replace: true })
+  }, [shouldAutoRedirect, autoRedirectRoute, navigate])
+
   useHeadMeta(headMeta, { siteName })
 
   // For dynamic pages created before collection data was available (hard reload),
@@ -183,6 +175,19 @@ export default function PageRenderer() {
     return website.dataStore.onUpdate(forceUpdate)
   }, [isDynamicPending, website])
 
+  // ─── Early returns (after all hooks) ───
+
+  if (redirectTarget) return null
+  if (shouldAutoRedirect) return null
+
+  // Rewrite pages are served by an external site — the host handles routing.
+  // In SPA mode this shouldn't be reached (host proxies before JS loads),
+  // but if it is (e.g., dev mode), do a full page reload to let the host handle it.
+  if (page?.rewrite) {
+    window.location.reload()
+    return null
+  }
+
   if (!page) {
     // No page and no 404 page defined - show shared fallback + dev debug info
     const requestedPath = location.pathname