@uniweb/build 0.6.3 → 0.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -50,9 +50,9 @@
     "sharp": "^0.33.2"
   },
   "optionalDependencies": {
-    "@uniweb/content-reader": "1.1.2",
+    "@uniweb/schemas": "0.2.1",
     "@uniweb/runtime": "0.5.13",
-    "@uniweb/schemas": "0.2.1"
+    "@uniweb/content-reader": "1.1.2"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -61,7 +61,7 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "0.4.1"
+    "@uniweb/core": "0.4.2"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/prerender.js

@@ -26,19 +26,41 @@ let preparePropsSSR, getComponentMetaSSR
  * @param {Object} siteContent - The site content from site-content.json
  * @param {string} siteDir - Path to the site directory
  * @param {function} onProgress - Progress callback
+ * @param {Object} [localeInfo] - Locale info for collection data localization
+ * @param {string} [localeInfo.locale] - Active locale code
+ * @param {string} [localeInfo.defaultLocale] - Default locale code
+ * @param {string} [localeInfo.distDir] - Path to dist directory (where locale-specific data lives)
  * @returns {Object} { pageFetchedData, fetchedData } - Fetched data for dynamic route expansion and DataStore pre-population
  */
-async function executeAllFetches(siteContent, siteDir, onProgress) {
+async function executeAllFetches(siteContent, siteDir, onProgress, localeInfo) {
   const fetchOptions = { siteRoot: siteDir, publicDir: 'public' }
   const fetchedData = [] // Collected for DataStore pre-population
 
+  // For non-default locales, translated collection data lives in dist/{locale}/data/
+  // instead of public/data/. Create a localized fetch helper.
+  const isNonDefaultLocale = localeInfo &&
+    localeInfo.locale !== localeInfo.defaultLocale &&
+    localeInfo.distDir
+
+  function localizeFetch(config) {
+    if (!isNonDefaultLocale || !config.path?.startsWith('/data/')) return config
+    return { ...config, path: `/${localeInfo.locale}${config.path}` }
+  }
+
+  // Fetch options pointing to dist/ for localized data
+  const localizedFetchOptions = isNonDefaultLocale
+    ? { siteRoot: localeInfo.distDir, publicDir: '.' }
+    : fetchOptions
+
   // 1. Site-level fetch
   const siteFetch = siteContent.config?.fetch
   if (siteFetch && siteFetch.prerender !== false) {
-    onProgress(`  Fetching site data: ${siteFetch.path || siteFetch.url}`)
-    const result = await executeFetch(siteFetch, fetchOptions)
+    const cfg = localizeFetch(siteFetch)
+    const opts = cfg !== siteFetch ? localizedFetchOptions : fetchOptions
+    onProgress(`  Fetching site data: ${cfg.path || cfg.url}`)
+    const result = await executeFetch(cfg, opts)
     if (result.data && !result.error) {
-      fetchedData.push({ config: siteFetch, data: result.data })
+      fetchedData.push({ config: cfg, data: result.data })
     }
   }
 
@@ -49,10 +71,12 @@ async function executeAllFetches(siteContent, siteDir, onProgress) {
     // Page-level fetch
     const pageFetch = page.fetch
     if (pageFetch && pageFetch.prerender !== false) {
-      onProgress(`  Fetching page data for ${page.route}: ${pageFetch.path || pageFetch.url}`)
-      const result = await executeFetch(pageFetch, fetchOptions)
+      const cfg = localizeFetch(pageFetch)
+      const opts = cfg !== pageFetch ? localizedFetchOptions : fetchOptions
+      onProgress(`  Fetching page data for ${page.route}: ${cfg.path || cfg.url}`)
+      const result = await executeFetch(cfg, opts)
       if (result.data && !result.error) {
-        fetchedData.push({ config: pageFetch, data: result.data })
+        fetchedData.push({ config: cfg, data: result.data })
         // Store for dynamic route expansion
         pageFetchedData.set(page.route, {
           schema: pageFetch.schema,
@@ -656,8 +680,13 @@ export async function prerenderSite(siteDir, options = {}) {
     siteContent.config.activeLocale = locale
 
     // Execute data fetches (site, page, section levels)
+    // For non-default locales, collection data is read from dist/{locale}/data/
     onProgress('Executing data fetches...')
-    const { pageFetchedData, fetchedData } = await executeAllFetches(siteContent, siteDir, onProgress)
+    const defaultLocale = defaultSiteContent.config?.defaultLanguage || 'en'
+    const { pageFetchedData, fetchedData } = await executeAllFetches(
+      siteContent, siteDir, onProgress,
+      { locale, defaultLocale, distDir }
+    )
 
     // Store fetchedData on siteContent for runtime DataStore pre-population
     siteContent.fetchedData = fetchedData

package/src/site/collection-processor.js

@@ -17,7 +17,7 @@
  * // site.yml
  * collections:
  *   articles:
- *     path: library/articles
+ *     path: collections/articles
  *     sort: date desc
  *
  * // Usage
@@ -59,11 +59,11 @@ try {
  *
  * @example
  * // Simple form
- * parseCollectionConfig('articles', 'library/articles')
+ * parseCollectionConfig('articles', 'collections/articles')
  *
  * // Extended form
  * parseCollectionConfig('articles', {
- *   path: 'library/articles',
+ *   path: 'collections/articles',
  *   route: '/blog',
  *   sort: 'date desc',
  *   filter: 'published != false',
@@ -213,7 +213,7 @@ function isExternalUrl(src) {
 /**
  * Process assets in collection content
  * - Resolves relative paths to site-root-relative paths
- * - Copies co-located assets to public/library/<collection>/
+ * - Copies co-located assets to public/collections/<collection>/
  * - Updates paths in the content in place
  *
  * @param {Object} content - ProseMirror document
@@ -226,7 +226,7 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
   const assets = {}
   const itemDir = dirname(itemPath)
   const publicDir = join(siteRoot, 'public')
-  const targetDir = join(publicDir, 'library', collectionName)
+  const targetDir = join(publicDir, 'collections', collectionName)
 
   // Walk content and collect asset paths
   const assetNodes = []
@@ -248,7 +248,7 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
     if (src.startsWith('./') || src.startsWith('../')) {
       // Check if file exists at resolved location
       if (existsSync(result.resolved)) {
-        // Copy to public/library/<collection>/
+        // Copy to public/collections/<collection>/
         const assetFilename = basename(result.resolved)
         const targetPath = join(targetDir, assetFilename)
 
@@ -259,7 +259,7 @@ async function processCollectionAssets(content, itemPath, siteRoot, collectionNa
         await copyFile(result.resolved, targetPath)
 
         // Update path to site-root-relative
-        finalPath = `/library/${collectionName}/${assetFilename}`
+        finalPath = `/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 = `/library/${collectionName}/${posterFilename}`
+        node.attrs.poster = `/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 = `/library/${collectionName}/${previewFilename}`
+        node.attrs.preview = `/collections/${collectionName}/${previewFilename}`
       }
     }
   }
@@ -491,8 +491,8 @@ async function collectItems(siteDir, config) {
  *
  * @example
  * const collections = await processCollections('/path/to/site', {
- *   articles: { path: 'library/articles', sort: 'date desc' },
- *   products: 'library/products'
+ *   articles: { path: 'collections/articles', sort: 'date desc' },
+ *   products: 'collections/products'
  * })
  * // { articles: [...], products: [...] }
  */