@uniweb/build 0.8.12 → 0.8.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.8.12",
+  "version": "0.8.14",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -11,6 +11,7 @@
     "./vite-plugin": "./src/vite-foundation-plugin.js",
     "./foundation": "./src/foundation/index.js",
     "./foundation/config": "./src/foundation/config.js",
+    "./content": "./src/content/index.js",
     "./site": "./src/site/index.js",
     "./site/config": "./src/site/config.js",
     "./dev": "./src/dev/index.js",
@@ -47,11 +48,12 @@
   },
   "dependencies": {
     "js-yaml": "^4.1.0",
-    "sharp": "^0.33.2"
+    "sharp": "^0.33.2",
+    "@uniweb/theming": "0.1.1"
   },
   "optionalDependencies": {
     "@uniweb/content-reader": "1.1.4",
-    "@uniweb/runtime": "0.6.8",
+    "@uniweb/runtime": "0.6.10",
     "@uniweb/schemas": "0.2.1"
   },
   "peerDependencies": {
@@ -61,7 +63,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.9"
+    "@uniweb/core": "0.5.10"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/content/index.js

@@ -0,0 +1,13 @@
+/**
+ * Clean Content Entry Point
+ *
+ * Exposes only collectSiteContent and its clean dependency chain
+ * (Node builtins, js-yaml, @uniweb/theming). No Vite, sharp, or React.
+ *
+ * Used by Studio's sidecar (Bun-compiled binary) where those heavy
+ * peer/native dependencies aren't available.
+ *
+ * @module @uniweb/build/content
+ */
+
+export { collectSiteContent } from '../site/content-collector.js'

package/src/i18n/extract.js

@@ -37,13 +37,18 @@ export function extractTranslatableContent(siteContent) {
     }
   }
 
-  // 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 || `/layout/${layoutKey}`
-      for (const section of layoutPage.sections) {
-        extractFromSection(section, pageRoute, units)
+  // Extract from layout areas (header, footer, left, right panels)
+  // Layouts are nested under siteContent.layouts: { default: { header, footer, ... }, marketing: { ... } }
+  if (siteContent.layouts) {
+    for (const [layoutName, areas] of Object.entries(siteContent.layouts)) {
+      if (!areas || typeof areas !== 'object') continue
+      for (const [areaKey, layoutPage] of Object.entries(areas)) {
+        if (layoutPage?.sections) {
+          const pageRoute = layoutPage.route || `/layout/${layoutName === 'default' ? '' : layoutName + '/'}${areaKey}`
+          for (const section of layoutPage.sections) {
+            extractFromSection(section, pageRoute, units)
+          }
+        }
       }
     }
   }

package/src/i18n/merge.js

@@ -76,13 +76,18 @@ function mergeTranslationsSync(siteContent, 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 || `/layout/${layoutKey}`
-      for (const section of layoutPage.sections) {
-        translateSectionSync(section, pageRoute, translations, fallbackToSource)
+  // Translate layout sections (header, footer, sidebars)
+  // Layouts are nested under translated.layouts: { default: { header, footer, ... }, marketing: { ... } }
+  if (translated.layouts) {
+    for (const [layoutName, areas] of Object.entries(translated.layouts)) {
+      if (!areas || typeof areas !== 'object') continue
+      for (const [areaKey, layoutPage] of Object.entries(areas)) {
+        if (layoutPage?.sections) {
+          const pageRoute = layoutPage.route || `/layout/${layoutName === 'default' ? '' : layoutName + '/'}${areaKey}`
+          for (const section of layoutPage.sections) {
+            translateSectionSync(section, pageRoute, translations, fallbackToSource)
+          }
+        }
       }
     }
   }
@@ -128,18 +133,22 @@ async function mergeTranslationsAsync(siteContent, translations, options) {
     }
   }
 
-  // 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
-      if (!layoutPage.route) layoutPage.route = `/layout/${layoutKey}`
-      for (const section of layoutPage.sections) {
-        await translateSectionAsync(section, layoutPage, translations, {
-          fallbackToSource,
-          locale,
-          localesDir
-        })
+  // Translate layout sections (header, footer, sidebars)
+  // Layouts are nested under translated.layouts: { default: { header, footer, ... }, marketing: { ... } }
+  if (translated.layouts) {
+    for (const [layoutName, areas] of Object.entries(translated.layouts)) {
+      if (!areas || typeof areas !== 'object') continue
+      for (const [areaKey, layoutPage] of Object.entries(areas)) {
+        if (layoutPage?.sections) {
+          if (!layoutPage.route) layoutPage.route = `/layout/${layoutName === 'default' ? '' : layoutName + '/'}${areaKey}`
+          for (const section of layoutPage.sections) {
+            await translateSectionAsync(section, layoutPage, translations, {
+              fallbackToSource,
+              locale,
+              localesDir
+            })
+          }
+        }
       }
     }
   }

package/src/site/assets.js

@@ -56,7 +56,7 @@ function isPdfPath(src) {
  * @param {string} value - String to check
  * @returns {boolean} True if it looks like a local asset path
  */
-function isLocalAssetPath(value) {
+export function isLocalAssetPath(value) {
   if (typeof value !== 'string' || !value) return false
 
   // Skip external URLs

package/src/site/collection-processor.js

@@ -30,7 +30,7 @@ import { join, basename, extname, dirname, relative, resolve } from 'node:path'
 import { existsSync } from 'node:fs'
 import yaml from 'js-yaml'
 import { applyFilter, applySort } from './data-fetcher.js'
-import { resolveAssetPath, walkContentAssets } from './assets.js'
+import { resolveAssetPath, walkContentAssets, isLocalAssetPath } from './assets.js'
 
 // Try to import content-reader for markdown parsing
 let markdownToProseMirror
@@ -222,7 +222,7 @@ function isExternalUrl(src) {
  * @param {string} collectionName - Name of the collection (e.g., 'articles')
  * @returns {Promise<Object>} Asset manifest for this item
  */
-async function processCollectionAssets(content, itemPath, siteRoot, collectionName) {
+async function processCollectionAssets(content, itemPath, siteRoot, collectionName, basePath) {
   const assets = {}
   const itemDir = dirname(itemPath)
   const publicDir = join(siteRoot, 'public')
@@ -259,7 +259,7 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
         await copyFile(result.resolved, targetPath)
 
         // Update path to site-root-relative
-        finalPath = `/collections/${collectionName}/${assetFilename}`
+        finalPath = `${basePath}collections/${collectionName}/${assetFilename}`
 
         assets[src] = {
           original: src,
@@ -294,7 +294,7 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
         const posterTarget = join(targetDir, posterFilename)
         await mkdir(targetDir, { recursive: true })
         await copyFile(posterResult.resolved, posterTarget)
-        node.attrs.poster = `/collections/${collectionName}/${posterFilename}`
+        node.attrs.poster = `${basePath}collections/${collectionName}/${posterFilename}`
       }
     }
 
@@ -305,7 +305,7 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
         const previewTarget = join(targetDir, previewFilename)
         await mkdir(targetDir, { recursive: true })
         await copyFile(previewResult.resolved, previewTarget)
-        node.attrs.preview = `/collections/${collectionName}/${previewFilename}`
+        node.attrs.preview = `${basePath}collections/${collectionName}/${previewFilename}`
       }
     }
   }
@@ -313,6 +313,53 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
   return assets
 }
 
+/**
+ * Process assets in a data item (YAML/JSON)
+ * - Recursively walks the data object looking for local asset paths
+ * - Copies co-located assets to public/collections/<collection>/
+ * - Rewrites paths to absolute URLs (with base path)
+ *
+ * @param {Object} data - Parsed data object (mutated in place)
+ * @param {string} itemPath - Path to the data file
+ * @param {string} siteRoot - Site root directory
+ * @param {string} collectionName - Name of the collection
+ * @param {string} basePath - Site base path (e.g., '/' or '/docs/')
+ */
+async function processDataItemAssets(data, itemPath, siteRoot, collectionName, basePath) {
+  const targetDir = join(siteRoot, 'public', 'collections', collectionName)
+
+  async function walk(parent, key) {
+    const val = parent[key]
+    if (typeof val === 'string' && isLocalAssetPath(val)) {
+      if (val.startsWith('./') || val.startsWith('../')) {
+        const resolved = resolve(dirname(itemPath), val)
+        if (existsSync(resolved)) {
+          const filename = basename(resolved)
+          await mkdir(targetDir, { recursive: true })
+          await copyFile(resolved, join(targetDir, filename))
+          parent[key] = `${basePath}collections/${collectionName}/${filename}`
+        }
+      } else if (val.startsWith('/')) {
+        // Absolute site path — just prepend base
+        parent[key] = `${basePath}${val.slice(1)}`
+      }
+      return
+    }
+    if (Array.isArray(val)) {
+      for (let i = 0; i < val.length; i++) await walk(val, i)
+      return
+    }
+    if (val && typeof val === 'object') {
+      for (const k of Object.keys(val)) await walk(val, k)
+    }
+  }
+
+  for (const key of Object.keys(data)) {
+    if (key === 'slug') continue
+    await walk(data, key)
+  }
+}
+
 // Filter and sort utilities are imported from data-fetcher.js
 
 /**
@@ -325,7 +372,7 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
  * @param {string} filename - YAML filename (.yml or .yaml)
  * @returns {Promise<Object|null>} Processed item or null if unpublished
  */
-async function processDataItem(dir, filename) {
+async function processDataItem(dir, filename, siteRoot, collectionName, basePath) {
   const filepath = join(dir, filename)
   const raw = await readFile(filepath, 'utf-8')
   const slug = basename(filename, extname(filename))
@@ -334,7 +381,9 @@ async function processDataItem(dir, filename) {
   // Skip unpublished items
   if (data.published === false) return null
 
-  return { slug, ...data }
+  const item = { slug, ...data }
+  await processDataItemAssets(item, filepath, siteRoot, collectionName, basePath)
+  return item
 }
 
 /**
@@ -348,18 +397,27 @@ async function processDataItem(dir, filename) {
  * @param {string} filename - JSON filename
  * @returns {Promise<Object|Array|null>} Processed item(s) or null if unpublished
  */
-async function processJsonItem(dir, filename) {
+async function processJsonItem(dir, filename, siteRoot, collectionName, basePath) {
   const filepath = join(dir, filename)
   const raw = await readFile(filepath, 'utf-8')
   const slug = basename(filename, '.json')
   const data = JSON.parse(raw)
 
   // Array → multiple items (single-file collection)
-  if (Array.isArray(data)) return data
+  if (Array.isArray(data)) {
+    for (const item of data) {
+      if (item && typeof item === 'object') {
+        await processDataItemAssets(item, filepath, siteRoot, collectionName, basePath)
+      }
+    }
+    return data
+  }
 
   // Object → single item
   if (data.published === false) return null
-  return { slug, ...data }
+  const item = { slug, ...data }
+  await processDataItemAssets(item, filepath, siteRoot, collectionName, basePath)
+  return item
 }
 
 /**
@@ -371,7 +429,7 @@ async function processJsonItem(dir, filename) {
  * @param {string} siteRoot - Site root directory for asset resolution
  * @returns {Promise<Object|null>} Processed item or null if unpublished
  */
-async function processContentItem(dir, filename, config, siteRoot) {
+async function processContentItem(dir, filename, config, siteRoot, basePath) {
   const filepath = join(dir, filename)
   const raw = await readFile(filepath, 'utf-8')
   const slug = basename(filename, extname(filename))
@@ -389,7 +447,7 @@ async function processContentItem(dir, filename, config, siteRoot) {
 
   // Process assets (resolve paths, copy co-located files)
   // This modifies content in place, updating paths to site-root-relative
-  await processCollectionAssets(content, filepath, siteRoot, config.name)
+  await processCollectionAssets(content, filepath, siteRoot, config.name, basePath)
 
   // Extract excerpt
   const excerpt = extractExcerpt(frontmatter, content, config.excerpt)
@@ -398,19 +456,12 @@ async function processContentItem(dir, filename, config, siteRoot) {
   // Note: paths in content have already been updated by processCollectionAssets
   const image = frontmatter.image || extractFirstImage(content)
 
-  // Get file stats for lastModified
-  const fileStat = await stat(filepath)
-
   return {
     slug,
     ...frontmatter,
     excerpt,
     image,
-    // Include both raw markdown body (for simple rendering)
-    // and ProseMirror content (for rich rendering)
-    body: body.trim(),
-    content,
-    lastModified: fileStat.mtime.toISOString()
+    content
   }
 }
 
@@ -421,7 +472,7 @@ async function processContentItem(dir, filename, config, siteRoot) {
  * @param {Object} config - Parsed collection config
  * @returns {Promise<Array>} Array of processed items
  */
-async function collectItems(siteDir, config, collectionsBase) {
+async function collectItems(siteDir, config, collectionsBase, basePath) {
   const base = collectionsBase || siteDir
   const collectionDir = resolve(base, config.path)
 
@@ -441,12 +492,12 @@ async function collectItems(siteDir, config, collectionsBase) {
   let items = await Promise.all(
     itemFiles.map(file => {
       if (file.endsWith('.json')) {
-        return processJsonItem(collectionDir, file)
+        return processJsonItem(collectionDir, file, siteDir, config.name, basePath)
       }
       if (file.endsWith('.yml') || file.endsWith('.yaml')) {
-        return processDataItem(collectionDir, file)
+        return processDataItem(collectionDir, file, siteDir, config.name, basePath)
       }
-      return processContentItem(collectionDir, file, config, siteDir)
+      return processContentItem(collectionDir, file, config, siteDir, basePath)
     })
   )
 
@@ -497,7 +548,7 @@ async function collectItems(siteDir, config, collectionsBase) {
  * })
  * // { articles: [...], products: [...] }
  */
-export async function processCollections(siteDir, collectionsConfig, collectionsBase) {
+export async function processCollections(siteDir, collectionsConfig, collectionsBase, basePath = '/') {
   if (!collectionsConfig || typeof collectionsConfig !== 'object') {
     return {}
   }
@@ -506,7 +557,7 @@ export async function processCollections(siteDir, collectionsConfig, collections
 
   for (const [name, config] of Object.entries(collectionsConfig)) {
     const parsed = parseCollectionConfig(name, config)
-    const items = await collectItems(siteDir, parsed, collectionsBase)
+    const items = await collectItems(siteDir, parsed, collectionsBase, basePath)
     results[name] = items
     console.log(`[collection-processor] Processed ${name}: ${items.length} items`)
   }

package/src/site/plugin.js

@@ -381,6 +381,7 @@ export function siteContentPlugin(options = {}) {
   let resolvedLayoutPath = null // Resolved from site.yml layoutDir or default
   let resolvedCollectionsBase = null // Resolved from site.yml collectionsDir
   let headHtml = '' // Contents of site/head.html for injection
+  let basePath = '/' // Vite's config.base, always has trailing slash
 
   /**
    * Load translations for a specific locale
@@ -494,6 +495,7 @@ export function siteContentPlugin(options = {}) {
       resolvedSitePath = resolve(config.root, sitePath)
       resolvedOutDir = resolve(config.root, config.build.outDir)
       isProduction = config.command === 'build'
+      basePath = config.base || '/'
 
       // In dev mode, process collections early so JSON files exist before server starts
       // This runs before configureServer, ensuring data is available immediately
@@ -517,7 +519,7 @@ export function siteContentPlugin(options = {}) {
 
           if (collectionsConfig) {
             console.log('[site-content] Processing content collections...')
-            const collections = await processCollections(resolvedSitePath, collectionsConfig, resolvedCollectionsBase)
+            const collections = await processCollections(resolvedSitePath, collectionsConfig, resolvedCollectionsBase, basePath)
             await writeCollectionFiles(resolvedSitePath, collections)
           }
         } catch (err) {
@@ -554,7 +556,7 @@ export function siteContentPlugin(options = {}) {
         // In production, do it here
         if (isProduction && siteContent.config?.collections) {
           console.log('[site-content] Processing content collections...')
-          const collections = await processCollections(resolvedSitePath, siteContent.config.collections, resolvedCollectionsBase)
+          const collections = await processCollections(resolvedSitePath, siteContent.config.collections, resolvedCollectionsBase, basePath)
           await writeCollectionFiles(resolvedSitePath, collections)
         }
 
@@ -617,7 +619,7 @@ export function siteContentPlugin(options = {}) {
               // Use collectionsConfig (cached from configResolved) or siteContent
               const collections = collectionsConfig || siteContent?.config?.collections
               if (collections) {
-                const processed = await processCollections(resolvedSitePath, collections, resolvedCollectionsBase)
+                const processed = await processCollections(resolvedSitePath, collections, resolvedCollectionsBase, basePath)
                 await writeCollectionFiles(resolvedSitePath, processed)
               }
               // Send full reload to client

package/src/theme/index.js

@@ -1,65 +1,10 @@
 /**
- * Theme Module
+ * Theme Module — re-export shim
  *
- * Exports all theme-related utilities for the build process.
+ * All theming logic has moved to @uniweb/theming.
+ * This shim preserves backward compatibility for internal imports.
  *
  * @module @uniweb/build/theme
  */
 
-// Shade generation
-export {
-  parseColor,
-  formatOklch,
-  formatHex,
-  generateShades,
-  generatePalettes,
-  isValidColor,
-  getShadeLevels,
-} from './shade-generator.js'
-
-// CSS generation
-export {
-  generateThemeCSS,
-  generateContextCSS,
-  generatePaletteVars,
-  getDefaultContextTokens,
-  getDefaultColors,
-} from './css-generator.js'
-
-// Theme processing
-export {
-  validateThemeConfig,
-  processTheme,
-  extractFoundationVars,
-  foundationHasVars,
-} from './processor.js'
-
-// Default export for convenience
-import { processTheme } from './processor.js'
-import { generateThemeCSS } from './css-generator.js'
-
-/**
- * Process theme configuration and generate CSS in one step
- *
- * @param {Object} themeYml - Raw theme.yml content
- * @param {Object} options - Processing options
- * @param {Object} options.foundationVars - Foundation variables
- * @returns {{ css: string, config: Object, errors: string[], warnings: string[] }}
- */
-export function buildTheme(themeYml = {}, options = {}) {
-  const { config, errors, warnings } = processTheme(themeYml, options)
-  const css = generateThemeCSS(config)
-
-  return {
-    css,
-    config,
-    errors,
-    warnings,
-  }
-}
-
-export default {
-  buildTheme,
-  processTheme,
-  generateThemeCSS,
-}
+export * from '@uniweb/theming'