npm - @uniweb/build - Versions diffs - 0.8.25 → 0.8.26 - Mend

@uniweb/build 0.8.25 → 0.8.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/package.json +6 -6
package/src/i18n/index.js +2 -1
package/src/prerender.js +44 -1
package/src/site/content-collector.js +116 -47
package/src/site/plugin.js +7 -4

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.8.25",
+  "version": "0.8.26",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -51,12 +51,12 @@
     "esbuild": "^0.21.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.27.0",
     "js-yaml": "^4.1.0",
     "sharp": "^0.33.2",
-    "@uniweb/theming": "0.1.2"
+    "@uniweb/theming": "0.1.3"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "0.6.21",
-    "@uniweb/content-reader": "1.1.4",
-    "@uniweb/schemas": "0.2.1"
+    "@uniweb/runtime": "0.6.22",
+    "@uniweb/schemas": "0.2.1",
+    "@uniweb/content-reader": "1.1.4"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -65,7 +65,7 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "0.5.15"
+    "@uniweb/core": "0.5.16"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/i18n/index.js CHANGED Viewed

@@ -154,7 +154,8 @@ async function resolveLocales(configLocales, localesPath) {
     if (configLocales.includes('*')) {
       return getAvailableLocales(localesPath)
     }
-    return configLocales
+    // Normalize: support both string codes and objects ({code, label})
+    return configLocales.map(l => typeof l === 'string' ? l : l.code)
   }
   // String value '*' means all available

package/src/prerender.js CHANGED Viewed

@@ -270,7 +270,7 @@ async function discoverLocaleContents(distDir, defaultContent) {
       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
+      if (!/^[a-z]{2,3}(?:-[A-Za-z]{2,4})?$/.test(entry)) continue
       // Check if it has a site-content.json
       const localeContentPath = join(entryPath, 'site-content.json')
@@ -510,6 +510,23 @@ export async function prerenderSite(siteDir, options = {}) {
       const translatedPageRoute = isDefault ? page.route : website.translateRoute(page.route, locale)
       const outputRoute = routePrefix + translatedPageRoute
+      // Redirect pages: emit a redirect HTML instead of rendering content
+      if (page.redirect) {
+        onProgress(`  Redirect ${outputRoute} → ${page.redirect}`)
+        const redirectHtml = `<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="refresh" content="0;url=${page.redirect}"><link rel="canonical" href="${page.redirect}"><title>Redirecting...</title></head><body><p>Redirecting to <a href="${page.redirect}">${page.redirect}</a></p></body></html>`
+        const outputPath = getOutputPath(distDir, outputRoute)
+        await mkdir(dirname(outputPath), { recursive: true })
+        await writeFile(outputPath, redirectHtml)
+        renderedFiles.push(outputPath)
+        continue
+      }
+      // Rewrite pages: served by an external site, skip rendering entirely
+      if (page.rewrite) {
+        onProgress(`  Rewrite ${outputRoute} → ${page.rewrite}`)
+        continue
+      }
       onProgress(`Rendering ${outputRoute}...`)
       const result = renderPage(page, website)
@@ -562,6 +579,32 @@ export async function prerenderSite(siteDir, options = {}) {
     onProgress(`  → ${routePrefix || ''}404.html (${fallbackNote})`)
   }
+  // Generate _redirects file for Cloudflare Pages / Netlify
+  // Format: source destination status
+  //   302 = redirect (browser URL changes)
+  //   200 = rewrite/proxy (browser URL stays, host proxies transparently)
+  const routingEntries = []
+  for (const localeConfig of localeConfigs) {
+    const siteContent = JSON.parse(await readFile(localeConfig.contentPath, 'utf8'))
+    const prefix = localeConfig.routePrefix || ''
+    for (const page of siteContent.pages || []) {
+      if (page.redirect) {
+        routingEntries.push(`${prefix}${page.route} ${page.redirect} 302`)
+      }
+      if (page.rewrite) {
+        routingEntries.push(`${prefix}${page.route}/* ${page.rewrite}/:splat 200`)
+      }
+    }
+  }
+  if (routingEntries.length > 0) {
+    const redirectsPath = join(distDir, '_redirects')
+    // Append to existing _redirects if the developer maintains one
+    const existing = existsSync(redirectsPath) ? await readFile(redirectsPath, 'utf8') : ''
+    const generated = `# Auto-generated from page.yml redirect: and rewrite: declarations\n${routingEntries.join('\n')}\n`
+    await writeFile(redirectsPath, existing ? `${existing.trimEnd()}\n\n${generated}` : generated)
+    onProgress(`Generated _redirects (${routingEntries.length} entries)`)
+  }
   onProgress(`\nPre-rendered ${renderedFiles.length} pages across ${localeConfigs.length} locale(s)`)
   return {

package/src/site/content-collector.js CHANGED Viewed

@@ -387,6 +387,34 @@ function resolveMounts(pathsConfig, sitePath, pagesPath) {
  *   - Simple: "1", "2", "3"
  *   - Decimal ordering: "1.5" (between 1 and 2), "2.5" (between 2 and 3)
  */
+/**
+ * Extract the first H1 text from a ProseMirror document.
+ * Returns null if no H1 is found.
+ */
+function extractH1(proseMirrorDoc) {
+  const nodes = proseMirrorDoc?.content || proseMirrorDoc
+  if (!Array.isArray(nodes)) return null
+  for (const node of nodes) {
+    if (node.type === 'heading' && node.attrs?.level === 1 && node.content) {
+      return node.content.map(n => n.text || '').join('').trim() || null
+    }
+  }
+  return null
+}
+/**
+ * Prettify a slug into a human-readable title.
+ * Strips numeric prefixes, replaces hyphens with spaces, title-cases.
+ */
+function prettifySlug(slug) {
+  const stripped = slug.replace(/^\d+[-.]?\s*/, '')
+  return stripped
+    .split('-')
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ')
+}
 function parseNumericPrefix(filename) {
   const match = filename.match(/^(\d+(?:\.\d+)*)-?(.*)$/)
   if (match) {
@@ -587,7 +615,7 @@ async function processFileAsPage(filePath, fileName, siteRoot, parentRoute) {
       sourcePath: null,
       id: null,
       isIndex: false,
-      title: pageName,
+      title: extractH1(section.content) || prettifySlug(pageName),
       description: '',
       label: null,
       lastModified: fileStat.mtime?.toISOString() || null,
@@ -875,6 +903,65 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
   // they're just filtered from navigation. This allows direct linking to hidden pages.
   // if (pageConfig.hidden) return null
+  // Redirect pages have no content — resolve target and return early
+  if (pageConfig.redirect) {
+    const route = isIndex ? parentRoute
+      : parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`
+    const redirect = pageConfig.redirect
+    // Resolve relative redirects against the page's own route
+    const target = redirect.startsWith('/') || redirect.startsWith('http')
+      ? redirect
+      : (route === '/' ? `/${redirect}` : `${route}/${redirect}`)
+    return {
+      page: {
+        route,
+        sourcePath: parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`,
+        id: pageConfig.id || null,
+        isIndex,
+        title: pageConfig.title || prettifySlug(pageName),
+        description: pageConfig.description || '',
+        label: pageConfig.label || null,
+        hidden: pageConfig.hidden || false,
+        hideInHeader: pageConfig.hideInHeader || false,
+        hideInFooter: pageConfig.hideInFooter || false,
+        layout: {},
+        seo: { noindex: true },
+        redirect: target,
+        sections: []
+      },
+      assetCollection: { assets: {}, hasExplicitPoster: new Set(), hasExplicitPreview: new Set() },
+      iconCollection: { icons: new Set(), bySource: new Map() }
+    }
+  }
+  // Rewrite pages proxy to an external site — no content, no HTML output
+  if (pageConfig.rewrite) {
+    const route = isIndex ? parentRoute
+      : parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`
+    return {
+      page: {
+        route,
+        sourcePath: parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`,
+        id: pageConfig.id || null,
+        isIndex,
+        title: pageConfig.title || prettifySlug(pageName),
+        description: pageConfig.description || '',
+        label: pageConfig.label || null,
+        hidden: pageConfig.hidden || false,
+        hideInHeader: pageConfig.hideInHeader || false,
+        hideInFooter: pageConfig.hideInFooter || false,
+        layout: {},
+        seo: { noindex: true },
+        rewrite: pageConfig.rewrite,
+        sections: []
+      },
+      assetCollection: { assets: {}, hasExplicitPoster: new Set(), hasExplicitPreview: new Set() },
+      iconCollection: { icons: new Set(), bySource: new Map() }
+    }
+  }
   let hierarchicalSections = []
   let pageAssetCollection = {
     assets: {},
@@ -1103,7 +1190,7 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
       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
-      title: pageConfig.title || pageName,
+      title: pageConfig.title || extractH1(hierarchicalSections[0]?.content) || prettifySlug(pageName),
       description: pageConfig.description || '',
       label: pageConfig.label || null, // Short label for navigation (defaults to title)
       lastModified: lastModified?.toISOString(),
@@ -1657,8 +1744,14 @@ async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig
  * @param {string} foundationPath - Path to foundation directory
  * @returns {Promise<Object>} Foundation variables or empty object
  */
-async function loadFoundationVars(foundationPath) {
-  if (!foundationPath) return {}
+/**
+ * Load foundation schema data needed by the content collector.
+ *
+ * @param {string} foundationPath - Path to foundation directory
+ * @returns {Promise<{ vars: Object, layoutNames: Set<string> }>}
+ */
+async function loadFoundationInfo(foundationPath) {
+  if (!foundationPath) return { vars: {}, layoutNames: new Set() }
   // Try dist/meta/schema.json first (built foundation), then root schema.json
   const distSchemaPath = join(foundationPath, 'dist', 'meta', 'schema.json')
@@ -1667,17 +1760,20 @@ async function loadFoundationVars(foundationPath) {
   const schemaPath = existsSync(distSchemaPath) ? distSchemaPath : rootSchemaPath
   if (!existsSync(schemaPath)) {
-    return {}
+    return { vars: {}, layoutNames: new Set() }
   }
   try {
     const schemaContent = await readFile(schemaPath, 'utf8')
     const schema = JSON.parse(schemaContent)
     // Foundation config is in _self, support both 'vars' (new) and 'themeVars' (legacy)
-    return schema._self?.vars || schema._self?.themeVars || schema.themeVars || {}
+    const vars = schema._self?.vars || schema._self?.themeVars || schema.themeVars || {}
+    // Layout names from _layouts (keys are layout component names)
+    const layoutNames = new Set(schema._layouts ? Object.keys(schema._layouts) : [])
+    return { vars, layoutNames }
   } catch (err) {
     console.warn('[content-collector] Failed to load foundation schema:', err.message)
-    return {}
+    return { vars: {}, layoutNames: new Set() }
   }
 }
@@ -1744,63 +1840,36 @@ async function collectAreasFromDir(dir, siteRoot, routePrefix = '/layout') {
   return result
 }
-/**
- * Check if a directory looks like a named layout (contains area-like .md files or area subdirs)
- * vs an area in folder form (contains section content processed by processPage).
- *
- * Heuristic: if a directory contains .md files at the top level AND no page.yml,
- * it's a named layout (those .md files are its area definitions).
- * If it has page.yml or looks like a page directory, it's an area folder.
- *
- * @param {string} dirPath - Path to the directory
- * @returns {Promise<boolean>} True if this looks like a named layout directory
- */
-async function isNamedLayoutDir(dirPath) {
-  // If it has page.yml, it's an area folder (processPage will handle it)
-  if (existsSync(join(dirPath, 'page.yml'))) return false
-  const entries = await readdir(dirPath)
-  // If directory contains .md files but no page.yml, it's a named layout
-  return entries.some(e => e.endsWith('.md') && !e.startsWith('_') && !e.startsWith('.'))
-}
 /**
  * Collect layout areas from the layout/ directory, including named layout subdirectories.
  *
  * Root-level .md files and area directories form the "default" layout's areas.
- * Subdirectories that themselves contain .md files (without page.yml) are named layouts,
- * each with its own set of areas.
+ * Subdirectories that match a foundation-declared layout name are named layouts,
+ * each with its own set of areas. All other subdirectories are folder-form areas
+ * for the default layout (multi-section areas).
  *
  * @param {string} layoutDir - Path to layout directory
  * @param {string} siteRoot - Path to site root
+ * @param {Set<string>} layoutNames - Layout names declared in the foundation schema
  * @returns {Promise<Object>} { layouts }
  */
-async function collectLayouts(layoutDir, siteRoot) {
+async function collectLayouts(layoutDir, siteRoot, layoutNames = new Set()) {
   if (!existsSync(layoutDir)) {
     return { layouts: null }
   }
   const entries = await readdir(layoutDir, { withFileTypes: true })
-  // Separate root-level entries into:
-  // 1. Area .md files (for default layout)
-  // 2. Area directories (for default layout) vs named layout directories
-  const defaultAreaFiles = []
-  const defaultAreaDirs = []
+  // Identify named layout directories: only subdirectories whose name matches
+  // a layout component declared in the foundation. All others are folder-form
+  // areas for the default layout (e.g., layout/header/ with multiple sections).
   const namedLayoutDirs = []
   for (const entry of entries) {
     if (entry.name.startsWith('_') || entry.name.startsWith('.')) continue
-    if (entry.isFile() && entry.name.endsWith('.md')) {
-      defaultAreaFiles.push(entry)
-    } else if (entry.isDirectory()) {
-      const dirPath = join(layoutDir, entry.name)
-      if (await isNamedLayoutDir(dirPath)) {
-        namedLayoutDirs.push(entry)
-      } else {
-        defaultAreaDirs.push(entry)
-      }
+    if (entry.isDirectory() && layoutNames.has(entry.name)) {
+      namedLayoutDirs.push(entry)
     }
   }
@@ -1861,8 +1930,8 @@ export async function collectSiteContent(sitePath, options = {}) {
     : join(sitePath, 'layout')
   const rawThemeConfig = await readYamlFile(join(sitePath, 'theme.yml'))
-  // Load foundation vars and process theme
-  const foundationVars = await loadFoundationVars(foundationPath)
+  // Load foundation info (vars + layout names) and process theme
+  const { vars: foundationVars, layoutNames: layoutNames } = await loadFoundationInfo(foundationPath)
   const { config: processedTheme, css: themeCSS, warnings } = buildTheme(rawThemeConfig, { foundationVars })
   // Log theme warnings
@@ -1893,7 +1962,7 @@ export async function collectSiteContent(sitePath, options = {}) {
   const { mode: rootContentMode } = await readFolderConfig(pagesPath, 'sections')
   // Collect layout areas from layout/ directory (including named layout subdirectories)
-  const { layouts } = await collectLayouts(layoutPath, sitePath)
+  const { layouts } = await collectLayouts(layoutPath, sitePath, layoutNames)
   // Site-level layout name (from site.yml layout: field)
   const siteLayoutName = typeof siteConfig.layout === 'string' ? siteConfig.layout

package/src/site/plugin.js CHANGED Viewed

@@ -39,6 +39,9 @@ import { processAdvancedAssets } from './advanced-processors.js'
 import { processCollections, writeCollectionFiles } from './collection-processor.js'
 import { executeFetch, mergeDataIntoContent } from './data-fetcher.js'
+// BCP 47 locale code pattern: en, zh-CN, zh-Hant, pt-BR, fr-CA, sr-Latn, etc.
+const LOCALE_RE = '[a-z]{2,3}(?:-[A-Za-z]{2,4})?'
 /**
  * Execute all fetches for site content (used in dev mode)
  * Collects fetchedData for DataStore pre-population at runtime
@@ -772,7 +775,7 @@ export function siteContentPlugin(options = {}) {
         }
         // Handle locale-prefixed site-content request (e.g., /es/site-content.json)
-        const localeContentMatch = req.url.match(/^\/([a-z]{2})\/site-content\.json$/)
+        const localeContentMatch = req.url.match(new RegExp(`^\\/(${LOCALE_RE})\\/site-content\\.json$`))
         if (localeContentMatch) {
           const locale = localeContentMatch[1]
           const translatedContent = await getTranslatedContent(locale)
@@ -808,7 +811,7 @@ export function siteContentPlugin(options = {}) {
         }
         // Serve search-index.json in dev mode (supports locale prefixes)
-        const searchIndexMatch = req.url.match(/^(?:\/([a-z]{2}))?\/search-index\.json$/)
+        const searchIndexMatch = req.url.match(new RegExp(`^(?:\\/(${LOCALE_RE}))?\\/search-index\\.json$`))
         if (searchIndexMatch && siteContent) {
           const searchEnabled = searchPluginConfig.enabled !== false && isSearchEnabled(siteContent)
           if (searchEnabled) {
@@ -830,7 +833,7 @@ export function siteContentPlugin(options = {}) {
         }
         // Handle localized collection data (e.g., /fr/data/articles.json)
-        const localeDataMatch = req.url.match(/^\/([a-z]{2})\/data\/(.+\.json)$/)
+        const localeDataMatch = req.url.match(new RegExp(`^\\/(${LOCALE_RE})\\/data\\/(.+\\.json)$`))
         if (localeDataMatch) {
           const locale = localeDataMatch[1]
           const filename = localeDataMatch[2]
@@ -883,7 +886,7 @@ export function siteContentPlugin(options = {}) {
       let activeLocale = null
       if (ctx?.originalUrl) {
-        const localeMatch = ctx.originalUrl.match(/^\/([a-z]{2})(\/|$)/)
+        const localeMatch = ctx.originalUrl.match(new RegExp(`^\\/(${LOCALE_RE})(\\/|$)`))
         if (localeMatch) {
           activeLocale = localeMatch[1]
           const translatedContent = await getTranslatedContent(activeLocale)