@uniweb/runtime 0.5.7 → 0.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/runtime",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "Minimal runtime for loading Uniweb foundations",
   "type": "module",
   "exports": {
@@ -31,7 +31,7 @@
     "node": ">=20.19"
   },
   "dependencies": {
-    "@uniweb/core": "0.3.7"
+    "@uniweb/core": "0.3.9"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^4.5.2",

package/src/components/PageRenderer.jsx

@@ -60,10 +60,10 @@ export default function PageRenderer() {
   // This ensures correct page renders immediately on client-side navigation
   let page = website?.getPage(location.pathname)
 
-  // If no page found, try the 404 page
+  // If no page found, try the 404 page (do NOT fall back to activePage/homepage)
   const isNotFound = !page
   if (isNotFound) {
-    page = website?.getNotFoundPage?.() || website?.activePage
+    page = website?.getNotFoundPage?.() || null
   }
 
   // Get head metadata from page (uses Page.getHeadMeta() if available)
@@ -76,12 +76,23 @@ export default function PageRenderer() {
   useHeadMeta(headMeta, { siteName })
 
   if (!page) {
-    // No page and no 404 page defined - show minimal fallback
+    // No page and no 404 page defined - show minimal fallback with debug info
+    const requestedPath = location.pathname
+    const isDev = import.meta.env?.DEV
     return (
       <div className="page-not-found" style={{ padding: '4rem 2rem', textAlign: 'center' }}>
         <h1 style={{ fontSize: '3rem', fontWeight: 'bold', color: '#1f2937', marginBottom: '1rem' }}>404</h1>
         <p style={{ color: '#64748b', marginBottom: '2rem' }}>Page not found</p>
         <a href="/" style={{ color: '#3b82f6', textDecoration: 'underline' }}>Go to homepage</a>
+        {isDev && (
+          <div style={{ marginTop: '2rem', padding: '1rem', background: '#f1f5f9', borderRadius: '0.5rem', textAlign: 'left', maxWidth: '32rem', margin: '2rem auto 0' }}>
+            <p style={{ fontWeight: '600', color: '#475569', marginBottom: '0.5rem' }}>Debug info</p>
+            <p style={{ fontSize: '0.875rem', color: '#64748b' }}>Path: {requestedPath}</p>
+            <p style={{ fontSize: '0.875rem', color: '#64748b' }}>Locale: {website?.getActiveLocale?.() || 'unknown'}</p>
+            <p style={{ fontSize: '0.875rem', color: '#64748b' }}>Known routes: {website?.pageRoutes?.join(', ') || 'none'}</p>
+            <p style={{ fontSize: '0.75rem', color: '#94a3b8', marginTop: '0.5rem' }}>Tip: Create a pages/404/ folder with a page.yml and content to customize this page.</p>
+          </div>
+        )}
       </div>
     )
   }

package/src/hooks/useLinkInterceptor.js

@@ -147,12 +147,41 @@ export function useLinkInterceptor(options = {}) {
       const target = anchor.getAttribute('target')
       if (target && target !== '_self') return
 
+      // Strip basePath from href for internal processing
+      // Links from <Link reload> include the basePath, but React Router
+      // and locale detection work with router-relative paths
+      const website = globalThis.uniweb?.activeWebsite
+      const basePath = website?.basePath || ''
+
+      let routeHref = href
+      if (basePath && href.startsWith(basePath)) {
+        routeHref = href.slice(basePath.length) || '/'
+      }
+
+      // Check if this link switches locale (requires full page reload)
+      if (website?.hasMultipleLocales()) {
+        const activeLocale = website.getActiveLocale()
+        const defaultLocale = website.getDefaultLocale()
+        const localeCodes = website.getLocales().map(l => l.code)
+        const hrefMatch = routeHref.match(/^\/([a-z]{2,3}(?:-[A-Z]{2})?)(?:\/|$)/)
+        const hrefLocale = hrefMatch?.[1]
+
+        let isLocaleSwitch = false
+        if (hrefLocale && localeCodes.includes(hrefLocale)) {
+          isLocaleSwitch = hrefLocale !== activeLocale
+        } else {
+          // No locale prefix = targets default locale
+          isLocaleSwitch = activeLocale !== defaultLocale
+        }
+        if (isLocaleSwitch) return  // Allow full page reload
+      }
+
       // Prevent the default browser navigation
       event.preventDefault()
 
       // Handle hash-only links (same page scroll)
-      if (href.startsWith('#')) {
-        const elementId = href.slice(1)
+      if (routeHref.startsWith('#')) {
+        const elementId = routeHref.slice(1)
         if (elementId) {
           scrollToElement(elementId)
           // Update URL hash without navigation
@@ -161,10 +190,10 @@ export function useLinkInterceptor(options = {}) {
         return
       }
 
-      // Use React Router navigation
+      // Use React Router navigation (with router-relative path)
       // React Router will handle the path, and our useEffect above
       // will handle scrolling to hash after navigation completes
-      navigate(href)
+      navigate(routeHref)
     }
 
     // Add click listener to document

package/src/index.jsx

@@ -291,6 +291,22 @@ function render({ development = false, basename } = {}) {
   // Use provided basename, or derive from Vite's BASE_URL
   const routerBasename = basename ?? getBasename()
 
+  // Set initial active page from browser URL so getLocaleUrl() works on first render
+  const website = globalThis.uniweb?.activeWebsite
+  if (website && typeof window !== 'undefined') {
+    const rawPath = window.location.pathname
+    const basePath = routerBasename || ''
+    const routePath = basePath && rawPath.startsWith(basePath)
+      ? rawPath.slice(basePath.length) || '/'
+      : rawPath
+    website.setActivePage(routePath)
+
+    // Store base path on Website for components that need it (e.g., Link reload)
+    if (website.setBasePath) {
+      website.setBasePath(routerBasename || '')
+    }
+  }
+
   const root = createRoot(container)
 
   const app = (