@uniweb/build 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.3.0",
+  "version": "0.3.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.7",
-    "@uniweb/runtime": "0.3.1"
+    "@uniweb/content-reader": "1.0.8",
+    "@uniweb/runtime": "0.4.3"
   },
   "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.3"
+    "@uniweb/core": "0.2.5"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/prerender.js

@@ -9,7 +9,7 @@
  */
 
 import { readFile, writeFile, mkdir } from 'node:fs/promises'
-import { existsSync } from 'node:fs'
+import { existsSync, readdirSync, statSync } from 'node:fs'
 import { join, dirname, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { createRequire } from 'node:module'
@@ -301,8 +301,7 @@ function renderBlock(block) {
   const componentProps = {
     content,
     params,
-    block,
-    input: block.input
+    block
   }
 
   // Wrapper props
@@ -381,6 +380,62 @@ function createPageElement(page, website) {
   )
 }
 
+/**
+ * Discover all locale content files in the dist directory
+ * Returns an array of { locale, contentPath, htmlPath, isDefault }
+ *
+ * @param {string} distDir - Path to dist directory
+ * @param {Object} defaultContent - Default site content (to get default locale)
+ * @returns {Array} Locale configurations
+ */
+async function discoverLocaleContents(distDir, defaultContent) {
+  const locales = []
+  const defaultLocale = defaultContent.config?.defaultLanguage || 'en'
+
+  // Add the default locale (root level)
+  locales.push({
+    locale: defaultLocale,
+    contentPath: join(distDir, 'site-content.json'),
+    htmlPath: join(distDir, 'index.html'),
+    isDefault: true,
+    routePrefix: ''
+  })
+
+  // Check for locale subdirectories with site-content.json
+  try {
+    const entries = readdirSync(distDir)
+    for (const entry of entries) {
+      const entryPath = join(distDir, entry)
+      // Skip if not a directory
+      if (!statSync(entryPath).isDirectory()) continue
+
+      // Check if this looks like a locale code (2-3 letter code)
+      if (!/^[a-z]{2,3}(-[A-Z]{2})?$/.test(entry)) continue
+
+      // Check if it has a site-content.json
+      const localeContentPath = join(entryPath, 'site-content.json')
+      const localeHtmlPath = join(entryPath, 'index.html')
+
+      if (existsSync(localeContentPath)) {
+        locales.push({
+          locale: entry,
+          contentPath: localeContentPath,
+          htmlPath: localeHtmlPath,
+          isDefault: false,
+          routePrefix: `/${entry}`
+        })
+      }
+    }
+  } catch (err) {
+    // Ignore errors reading directory
+    if (process.env.DEBUG) {
+      console.error('Error discovering locale contents:', err.message)
+    }
+  }
+
+  return locales
+}
+
 /**
  * Pre-render all pages in a built site to static HTML
  *
@@ -407,33 +462,21 @@ export async function prerenderSite(siteDir, options = {}) {
   onProgress('Loading dependencies...')
   await loadDependencies(siteDir)
 
-  // Load site content
+  // Load default site content
   onProgress('Loading site content...')
   const contentPath = join(distDir, 'site-content.json')
   if (!existsSync(contentPath)) {
     throw new Error(`site-content.json not found at: ${contentPath}`)
   }
-  const siteContent = JSON.parse(await readFile(contentPath, 'utf8'))
-
-  // Execute data fetches (site, page, section levels)
-  onProgress('Executing data fetches...')
-  const { siteCascadedData, pageFetchedData } = await executeAllFetches(siteContent, siteDir, onProgress)
-
-  // Expand dynamic pages (e.g., /blog/:slug → /blog/post-1, /blog/post-2)
-  if (siteContent.pages?.some(p => p.isDynamic)) {
-    onProgress('Expanding dynamic routes...')
-    siteContent.pages = expandDynamicPages(siteContent.pages, pageFetchedData, onProgress)
-  }
+  const defaultSiteContent = JSON.parse(await readFile(contentPath, 'utf8'))
 
-  // Load the HTML shell
-  onProgress('Loading HTML shell...')
-  const shellPath = join(distDir, 'index.html')
-  if (!existsSync(shellPath)) {
-    throw new Error(`index.html not found at: ${shellPath}`)
+  // Discover all locale content files
+  const localeConfigs = await discoverLocaleContents(distDir, defaultSiteContent)
+  if (localeConfigs.length > 1) {
+    onProgress(`Found ${localeConfigs.length} locales: ${localeConfigs.map(l => l.locale).join(', ')}`)
   }
-  const htmlShell = await readFile(shellPath, 'utf8')
 
-  // Load the foundation module
+  // Load the foundation module (shared across all locales)
   onProgress('Loading foundation...')
   const foundationPath = join(foundationDir, 'dist', 'foundation.js')
   if (!existsSync(foundationPath)) {
@@ -442,58 +485,87 @@ export async function prerenderSite(siteDir, options = {}) {
   const foundationUrl = pathToFileURL(foundationPath).href
   const foundation = await import(foundationUrl)
 
-  // Initialize the Uniweb runtime (this sets globalThis.uniweb)
-  onProgress('Initializing runtime...')
-  const uniweb = createUniweb(siteContent)
-  uniweb.setFoundation(foundation)
+  // Pre-render each locale
+  const renderedFiles = []
 
-  // Set foundation capabilities (Layout, props, etc.)
-  if (foundation.capabilities) {
-    uniweb.setFoundationConfig(foundation.capabilities)
-  }
+  for (const localeConfig of localeConfigs) {
+    const { locale, contentPath: localeContentPath, htmlPath, isDefault, routePrefix } = localeConfig
 
-  // Pre-render each page
-  const renderedFiles = []
-  const pages = uniweb.activeWebsite.pages
-  const website = uniweb.activeWebsite
+    onProgress(`\nRendering ${isDefault ? 'default' : locale} locale...`)
 
-  for (const page of pages) {
-    // 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)
-
-    // Create the page element using inline SSR rendering
-    // (uses React from prerender's scope to avoid module resolution issues)
-    const element = createPageElement(page, website)
-
-    // Render to HTML string
-    let renderedContent
-    try {
-      renderedContent = renderToString(element)
-    } catch (err) {
-      console.warn(`Warning: Failed to render ${page.route}: ${err.message}`)
-      if (process.env.DEBUG) {
-        console.error(err.stack)
-      }
-      continue
+    // Load locale-specific content
+    const siteContent = JSON.parse(await readFile(localeContentPath, 'utf8'))
+
+    // Set the active locale in the content
+    siteContent.config = siteContent.config || {}
+    siteContent.config.activeLocale = locale
+
+    // Execute data fetches (site, page, section levels)
+    onProgress('Executing data fetches...')
+    const { siteCascadedData, pageFetchedData } = await executeAllFetches(siteContent, siteDir, onProgress)
+
+    // Expand dynamic pages (e.g., /blog/:slug → /blog/post-1, /blog/post-2)
+    if (siteContent.pages?.some(p => p.isDynamic)) {
+      onProgress('Expanding dynamic routes...')
+      siteContent.pages = expandDynamicPages(siteContent.pages, pageFetchedData, onProgress)
+    }
+
+    // Load the HTML shell for this locale
+    const shellPath = existsSync(htmlPath) ? htmlPath : join(distDir, 'index.html')
+    const htmlShell = await readFile(shellPath, 'utf8')
+
+    // Initialize the Uniweb runtime for this locale
+    onProgress('Initializing runtime...')
+    const uniweb = createUniweb(siteContent)
+    uniweb.setFoundation(foundation)
+
+    // Set foundation capabilities (Layout, props, etc.)
+    if (foundation.capabilities) {
+      uniweb.setFoundationConfig(foundation.capabilities)
     }
 
-    // Inject into shell
-    const html = injectContent(htmlShell, renderedContent, page, siteContent)
+    // Pre-render each page
+    const pages = uniweb.activeWebsite.pages
+    const website = uniweb.activeWebsite
 
-    // Output to the canonical route
-    const outputPath = getOutputPath(distDir, page.route)
-    await mkdir(dirname(outputPath), { recursive: true })
-    await writeFile(outputPath, html)
+    for (const page of pages) {
+      // Build the output route with locale prefix
+      const outputRoute = routePrefix + page.route
 
-    renderedFiles.push(outputPath)
-    onProgress(`  → ${outputPath.replace(distDir, 'dist')}`)
+      onProgress(`Rendering ${outputRoute}...`)
+
+      // Set this as the active page
+      uniweb.activeWebsite.setActivePage(page.route)
+
+      // Create the page element using inline SSR rendering
+      const element = createPageElement(page, website)
+
+      // Render to HTML string
+      let renderedContent
+      try {
+        renderedContent = renderToString(element)
+      } catch (err) {
+        console.warn(`Warning: Failed to render ${outputRoute}: ${err.message}`)
+        if (process.env.DEBUG) {
+          console.error(err.stack)
+        }
+        continue
+      }
+
+      // Inject into shell
+      const html = injectContent(htmlShell, renderedContent, page, siteContent)
+
+      // Output to the locale-prefixed route
+      const outputPath = getOutputPath(distDir, outputRoute)
+      await mkdir(dirname(outputPath), { recursive: true })
+      await writeFile(outputPath, html)
+
+      renderedFiles.push(outputPath)
+      onProgress(`  → ${outputPath.replace(distDir, 'dist')}`)
+    }
   }
 
-  onProgress(`Pre-rendered ${renderedFiles.length} pages`)
+  onProgress(`\nPre-rendered ${renderedFiles.length} pages across ${localeConfigs.length} locale(s)`)
 
   return {
     pages: renderedFiles.length,

package/src/site/content-collector.js

@@ -523,7 +523,6 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
       title: pageConfig.title || pageName,
       description: pageConfig.description || '',
       label: pageConfig.label || null, // Short label for navigation (defaults to title)
-      order: pageConfig.order,
       lastModified: lastModified?.toISOString(),
 
       // Dynamic route metadata
@@ -599,8 +598,9 @@ function determineIndexPage(orderConfig, availableFolders) {
 
   const sorted = [...staticFolders].sort((a, b) => {
     // Sort by order (lower first), then alphabetically
-    const orderA = a.order ?? 999
-    const orderB = b.order ?? 999
+    // Pages without explicit order come after ordered pages
+    const orderA = a.order ?? Infinity
+    const orderB = b.order ?? Infinity
     if (orderA !== orderB) return orderA - orderB
     return a.name.localeCompare(b.name)
   })
@@ -655,6 +655,15 @@ async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig
     })
   }
 
+  // Sort page folders by order (ascending), then alphabetically
+  // Pages without explicit order come after ordered pages (order ?? Infinity)
+  pageFolders.sort((a, b) => {
+    const orderA = a.order ?? Infinity
+    const orderB = b.order ?? Infinity
+    if (orderA !== orderB) return orderA - orderB
+    return a.name.localeCompare(b.name)
+  })
+
   // Check if this directory contains version folders (versioned section)
   const folderNames = pageFolders.map(f => f.name)
   const detectedVersions = detectVersions(folderNames)

package/src/site/plugin.js

@@ -93,16 +93,20 @@ async function processDevSectionFetches(sections, cascadedData, fetchOptions) {
     if (sectionFetch) {
       const result = await executeFetch(sectionFetch, fetchOptions)
       if (result.data && !result.error) {
-        // Merge fetched data into cascadedData for this section
-        cascadedData = {
-          ...cascadedData,
-          [sectionFetch.schema]: result.data
-        }
+        // Merge fetched data into section's parsedContent (not cascadedData)
+        // This matches prerender behavior - section's own fetch goes to content.data
+        section.parsedContent = mergeDataIntoContent(
+          section.parsedContent || {},
+          result.data,
+          sectionFetch.schema,
+          sectionFetch.merge
+        )
       }
     }
 
-    // Attach cascaded data to section
-    section.cascadedData = { ...cascadedData }
+    // Attach cascaded data for components with inheritData
+    // Note: cascadedData is from page/site level only, not section's own fetch
+    section.cascadedData = cascadedData
 
     // Process subsections recursively
     if (section.subsections && section.subsections.length > 0) {