@uniweb/build 0.4.4 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -50,8 +50,8 @@
     "sharp": "^0.33.2"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "0.5.7",
-    "@uniweb/content-reader": "1.1.2"
+    "@uniweb/content-reader": "1.1.2",
+    "@uniweb/runtime": "0.5.8"
   },
   "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.3.7"
+    "@uniweb/core": "0.3.9"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/i18n/collections.js

@@ -178,7 +178,8 @@ function addUnit(units, source, field, context) {
   const hash = computeHash(source)
 
   if (units[hash]) {
-    const existingContexts = units[hash].contexts
+    const existingContexts = units[hash].contexts || []
+    units[hash].contexts = existingContexts
     const contextKey = `${context.collection}:${context.item}`
     const exists = existingContexts.some(
       c => `${c.collection}:${c.item}` === contextKey

package/src/i18n/extract.js

@@ -27,6 +27,27 @@ export function extractTranslatableContent(siteContent) {
     }
   }
 
+  // Extract from 404 page (stored as top-level notFound)
+  if (siteContent.notFound) {
+    const notFoundPage = siteContent.notFound
+    const pageRoute = notFoundPage.route || '/404'
+    extractFromPageMeta(notFoundPage, pageRoute, units)
+    for (const section of notFoundPage.sections || []) {
+      extractFromSection(section, pageRoute, units)
+    }
+  }
+
+  // Extract from shared layout pages (header, footer, left, right panels)
+  for (const layoutKey of ['header', 'footer', 'left', 'right']) {
+    const layoutPage = siteContent[layoutKey]
+    if (layoutPage?.sections) {
+      const pageRoute = layoutPage.route || `/@${layoutKey}`
+      for (const section of layoutPage.sections) {
+        extractFromSection(section, pageRoute, units)
+      }
+    }
+  }
+
   return {
     version: '1.0',
     defaultLocale: siteContent.config?.defaultLanguage || 'en',
@@ -50,6 +71,11 @@ function extractFromPageMeta(page, pageRoute, units) {
     addUnit(units, page.title, 'page.title', context)
   }
 
+  // Page label (short navigation label, distinct from title)
+  if (page.label && typeof page.label === 'string') {
+    addUnit(units, page.label, 'page.label', context)
+  }
+
   // Page description
   if (page.description && typeof page.description === 'string') {
     addUnit(units, page.description, 'page.description', context)

package/src/i18n/merge.js

@@ -67,6 +67,26 @@ function mergeTranslationsSync(siteContent, translations, fallbackToSource) {
     }
   }
 
+  // Translate 404 page (stored as top-level notFound)
+  if (translated.notFound) {
+    const pageRoute = translated.notFound.route || '/404'
+    translatePageMeta(translated.notFound, pageRoute, translations, fallbackToSource)
+    for (const section of translated.notFound.sections || []) {
+      translateSectionSync(section, pageRoute, translations, fallbackToSource)
+    }
+  }
+
+  // Translate shared layout sections (header, footer, sidebars)
+  for (const layoutKey of ['header', 'footer', 'left', 'right']) {
+    const layoutPage = translated[layoutKey]
+    if (layoutPage?.sections) {
+      const pageRoute = layoutPage.route || `/@${layoutKey}`
+      for (const section of layoutPage.sections) {
+        translateSectionSync(section, pageRoute, translations, fallbackToSource)
+      }
+    }
+  }
+
   return translated
 }
 
@@ -95,6 +115,35 @@ async function mergeTranslationsAsync(siteContent, translations, options) {
     }
   }
 
+  // Translate 404 page (stored as top-level notFound)
+  if (translated.notFound) {
+    const pageRoute = translated.notFound.route || '/404'
+    translatePageMeta(translated.notFound, pageRoute, translations, fallbackToSource)
+    for (const section of translated.notFound.sections || []) {
+      await translateSectionAsync(section, translated.notFound, translations, {
+        fallbackToSource,
+        locale,
+        localesDir
+      })
+    }
+  }
+
+  // Translate shared layout sections (header, footer, sidebars)
+  for (const layoutKey of ['header', 'footer', 'left', 'right']) {
+    const layoutPage = translated[layoutKey]
+    if (layoutPage?.sections) {
+      // Ensure route is set for context matching (extract uses /@header, etc.)
+      if (!layoutPage.route) layoutPage.route = `/@${layoutKey}`
+      for (const section of layoutPage.sections) {
+        await translateSectionAsync(section, layoutPage, translations, {
+          fallbackToSource,
+          locale,
+          localesDir
+        })
+      }
+    }
+  }
+
   return translated
 }
 
@@ -109,6 +158,11 @@ function translatePageMeta(page, pageRoute, translations, fallbackToSource) {
     page.title = lookupTranslation(page.title, context, translations, fallbackToSource)
   }
 
+  // Translate label (short navigation label)
+  if (page.label && typeof page.label === 'string') {
+    page.label = lookupTranslation(page.label, context, translations, fallbackToSource)
+  }
+
   // Translate description
   if (page.description && typeof page.description === 'string') {
     page.description = lookupTranslation(page.description, context, translations, fallbackToSource)

package/src/i18n/sync.js

@@ -94,10 +94,12 @@ export function syncManifests(previous, current) {
  * Check if two context arrays are equal
  */
 function contextsEqual(contexts1, contexts2) {
-  if (contexts1.length !== contexts2.length) return false
+  const c1 = contexts1 || []
+  const c2 = contexts2 || []
+  if (c1.length !== c2.length) return false
 
-  const set1 = new Set(contexts1.map(c => `${c.page}:${c.section}`))
-  const set2 = new Set(contexts2.map(c => `${c.page}:${c.section}`))
+  const set1 = new Set(c1.map(c => `${c.page || c.collection}:${c.section || c.item}`))
+  const set2 = new Set(c2.map(c => `${c.page || c.collection}:${c.section || c.item}`))
 
   if (set1.size !== set2.size) return false
   for (const key of set1) {
@@ -115,8 +117,9 @@ function findMatchingContext(currentContexts, previousUnits) {
     const contextKey = `${context.page}:${context.section}`
 
     for (const [hash, unit] of Object.entries(previousUnits)) {
-      const hasContext = unit.contexts.some(
-        c => `${c.page}:${c.section}` === contextKey
+      const unitContexts = unit.contexts || []
+      const hasContext = unitContexts.some(
+        c => `${c.page || c.collection}:${c.section || c.item}` === contextKey
       )
       if (hasContext) {
         return { hash, source: unit.source, contexts: unit.contexts }

package/src/prerender.js

@@ -570,7 +570,9 @@ export async function prerenderSite(siteDir, options = {}) {
 
     for (const page of pages) {
       // Build the output route with locale prefix
-      const outputRoute = routePrefix + page.route
+      // For non-default locales, translate route slugs (e.g., /about → /acerca-de)
+      const translatedPageRoute = isDefault ? page.route : website.translateRoute(page.route, locale)
+      const outputRoute = routePrefix + translatedPageRoute
 
       onProgress(`Rendering ${outputRoute}...`)
 

package/src/site/config.js

@@ -25,6 +25,34 @@ import { resolve, dirname, join } from 'node:path'
 import yaml from 'js-yaml'
 import { generateEntryPoint } from '../generate-entry.js'
 
+/**
+ * Normalize a base path for Vite compatibility
+ *
+ * Handles common user mistakes:
+ * - Missing leading slash: "docs/" → "/docs/"
+ * - Missing trailing slash: "/docs" → "/docs/"
+ * - Extra slashes: "//docs///" → "/docs/"
+ * - Just a slash: "/" → undefined (root, no base needed)
+ *
+ * @param {string} raw - Raw base path from site.yml, env, or option
+ * @returns {string|undefined} Normalized path with leading+trailing slash, or undefined for root
+ */
+function normalizeBasePath(raw) {
+  // Collapse repeated slashes and trim whitespace
+  let path = raw.trim().replace(/\/{2,}/g, '/')
+
+  // Ensure leading slash
+  if (!path.startsWith('/')) path = '/' + path
+
+  // Ensure trailing slash (Vite requirement)
+  if (!path.endsWith('/')) path = path + '/'
+
+  // Root path means no base needed
+  if (path === '/') return undefined
+
+  return path
+}
+
 /**
  * Detect foundation type from the foundation config value
  *
@@ -143,9 +171,9 @@ export async function defineSiteConfig(options = {}) {
   const siteConfig = readSiteConfig(siteRoot)
 
   // Determine base path for deployment (priority: option > env > site.yml)
-  // Ensures trailing slash for Vite compatibility
+  // Normalize: ensure leading slash, collapse repeated slashes, add trailing slash for Vite
   const rawBase = baseOption || process.env.UNIWEB_BASE || siteConfig.base
-  const base = rawBase ? (rawBase.endsWith('/') ? rawBase : `${rawBase}/`) : undefined
+  const base = rawBase ? normalizeBasePath(String(rawBase)) : undefined
 
   // Detect foundation type
   const foundationInfo = detectFoundationType(siteConfig.foundation, siteRoot)

package/src/site/plugin.js

@@ -117,10 +117,28 @@ async function processDevSectionFetches(sections, cascadedData, fetchOptions) {
 import { generateSearchIndex, isSearchEnabled, getSearchIndexFilename } from '../search/index.js'
 import { mergeTranslations } from '../i18n/merge.js'
 
+/**
+ * Translate a canonical route for a given locale using route translations config
+ * Supports exact and prefix matching (e.g., /blog → /noticias also applies to /blog/post)
+ */
+function applyRouteTranslation(route, locale, routeTranslations) {
+  const localeMap = routeTranslations?.[locale]
+  if (!localeMap) return route
+  // Exact match
+  if (localeMap[route]) return localeMap[route]
+  // Prefix match
+  for (const [canonical, translated] of Object.entries(localeMap)) {
+    if (route.startsWith(canonical + '/')) {
+      return translated + route.slice(canonical.length)
+    }
+  }
+  return route
+}
+
 /**
  * Generate sitemap.xml content
  */
-function generateSitemap(pages, baseUrl, locales = []) {
+function generateSitemap(pages, baseUrl, locales = [], routeTranslations = {}) {
   const urls = []
 
   for (const page of pages) {
@@ -137,7 +155,13 @@ function generateSitemap(pages, baseUrl, locales = []) {
     // Add hreflang entries for multi-locale sites
     if (locales.length > 1) {
       for (const locale of locales) {
-        const localeLoc = locale.default ? loc : `${baseUrl}/${locale.code}${page.route === '/' ? '' : page.route}`
+        let localeLoc
+        if (locale.default) {
+          localeLoc = loc
+        } else {
+          const translatedRoute = page.route === '/' ? '' : applyRouteTranslation(page.route, locale.code, routeTranslations)
+          localeLoc = `${baseUrl}/${locale.code}${translatedRoute}`
+        }
         urlEntry += `\n    <xhtml:link rel="alternate" hreflang="${locale.code}" href="${escapeXml(localeLoc)}" />`
       }
       // Add x-default pointing to default locale
@@ -664,7 +688,7 @@ export function siteContentPlugin(options = {}) {
         // Serve sitemap.xml in dev mode
         if (req.url === '/sitemap.xml' && seoEnabled && siteContent?.pages) {
           res.setHeader('Content-Type', 'application/xml')
-          res.end(generateSitemap(siteContent.pages, seoOptions.baseUrl, seoOptions.locales))
+          res.end(generateSitemap(siteContent.pages, seoOptions.baseUrl, seoOptions.locales, siteContent.config?.i18n?.routeTranslations))
           return
         }
 
@@ -851,7 +875,7 @@ export function siteContentPlugin(options = {}) {
       // Generate SEO files if enabled
       if (seoEnabled && finalContent?.pages) {
         // Generate sitemap.xml
-        const sitemap = generateSitemap(finalContent.pages, seoOptions.baseUrl, seoOptions.locales)
+        const sitemap = generateSitemap(finalContent.pages, seoOptions.baseUrl, seoOptions.locales, finalContent.config?.i18n?.routeTranslations)
         this.emitFile({
           type: 'asset',
           fileName: 'sitemap.xml',