@uniweb/build 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -50,8 +50,8 @@
     "sharp": "^0.33.2"
   },
   "optionalDependencies": {
-    "@uniweb/content-reader": "1.0.4",
-    "@uniweb/runtime": "0.2.20"
+    "@uniweb/content-reader": "1.0.5",
+    "@uniweb/runtime": "0.3.0"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -60,7 +60,7 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "0.2.0"
+    "@uniweb/core": "0.2.2"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/prerender.js

@@ -458,18 +458,9 @@ export async function prerenderSite(siteDir, options = {}) {
   const website = uniweb.activeWebsite
 
   for (const page of pages) {
-    // Determine which routes to render this page at
-    // Index pages are rendered at both their actual route and their nav route
-    const routesToRender = [page.route]
-    if (page.isIndex) {
-      const navRoute = page.getNavRoute()
-      if (navRoute !== page.route) {
-        routesToRender.push(navRoute)
-      }
-    }
-
-    // Render once, output to multiple paths
-    onProgress(`Rendering ${routesToRender[0]}...`)
+    // Each page has a single canonical route
+    // Index pages already have their parent route as their canonical route
+    onProgress(`Rendering ${page.route}...`)
 
     // Set this as the active page
     uniweb.activeWebsite.setActivePage(page.route)
@@ -493,15 +484,13 @@ export async function prerenderSite(siteDir, options = {}) {
     // Inject into shell
     const html = injectContent(htmlShell, renderedContent, page, siteContent)
 
-    // Output to all routes for this page
-    for (const route of routesToRender) {
-      const outputPath = getOutputPath(distDir, route)
-      await mkdir(dirname(outputPath), { recursive: true })
-      await writeFile(outputPath, html)
+    // Output to the canonical route
+    const outputPath = getOutputPath(distDir, page.route)
+    await mkdir(dirname(outputPath), { recursive: true })
+    await writeFile(outputPath, html)
 
-      renderedFiles.push(outputPath)
-      onProgress(`  → ${outputPath.replace(distDir, 'dist')}`)
-    }
+    renderedFiles.push(outputPath)
+    onProgress(`  → ${outputPath.replace(distDir, 'dist')}`)
   }
 
   onProgress(`Pre-rendered ${renderedFiles.length} pages`)

package/src/site/content-collector.js

@@ -479,24 +479,31 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
   }
 
   // Determine route
-  // All pages get their actual folder-based route (no special treatment for index)
-  // The isIndex flag marks which page should also be accessible at the parent route
-  let route
+  // Index pages get the parent route as their canonical route (no dual routes)
+  // sourcePath stores the original folder-based path for ancestor checking
   const isDynamic = isDynamicRoute(pageName)
   const paramName = isDynamic ? extractRouteParam(pageName) : null
 
+  // First, calculate the folder-based route (what the route would be without index handling)
+  let folderRoute
   if (pageName.startsWith('@')) {
     // Special pages (layout areas) keep their @ prefix
-    route = parentRoute === '/' ? `/@${pageName.slice(1)}` : `${parentRoute}/@${pageName.slice(1)}`
+    folderRoute = parentRoute === '/' ? `/@${pageName.slice(1)}` : `${parentRoute}/@${pageName.slice(1)}`
   } else if (isDynamic) {
     // Dynamic routes: /blog/[slug] → /blog/:slug (for route matching)
-    // The actual routes like /blog/my-post are generated at prerender time
-    route = parentRoute === '/' ? `/:${paramName}` : `${parentRoute}/:${paramName}`
+    folderRoute = parentRoute === '/' ? `/:${paramName}` : `${parentRoute}/:${paramName}`
   } else {
     // Normal pages get parent + their name
-    route = parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`
+    folderRoute = parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`
   }
 
+  // For index pages, the canonical route is the parent route
+  // For non-index pages, the canonical route is the folder-based route
+  const route = isIndex ? parentRoute : folderRoute
+  // sourcePath is the original folder-based path (used for ancestor checking)
+  // Only set for index pages where it differs from route
+  const sourcePath = isIndex ? folderRoute : null
+
   // Extract configuration
   const { seo = {}, layout = {}, ...restConfig } = pageConfig
 
@@ -510,8 +517,9 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
   return {
     page: {
       route,
+      sourcePath, // Original folder-based path (for ancestor checking in navigation)
       id: pageConfig.id || null, // Stable page ID for page: links (survives reorganization)
-      isIndex, // Marks this page as the index for its parent route (accessible at parentRoute)
+      isIndex, // Marks this page as the index for its parent route
       title: pageConfig.title || pageName,
       description: pageConfig.description || '',
       label: pageConfig.label || null, // Short label for navigation (defaults to title)
@@ -668,7 +676,12 @@ async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig
 
         // For latest version, use parent route directly
         // For other versions, add version prefix to route
-        const versionRoute = isLatest ? parentRoute : `${parentRoute}/${entry}`
+        // Handle root scope specially to avoid double slash (//v1 → /v1)
+        const versionRoute = isLatest
+          ? parentRoute
+          : parentRoute === '/'
+            ? `/${entry}`
+            : `${parentRoute}/${entry}`
 
         // Recurse into version folder with version context
         const subResult = await collectPagesRecursive(