@uniweb/build 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.3.1",
+  "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.4.2"
+    "@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.4"
+    "@uniweb/core": "0.2.5"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/prerender.js

@@ -301,8 +301,7 @@ function renderBlock(block) {
   const componentProps = {
     content,
     params,
-    block,
-    input: block.input
+    block
   }
 
   // Wrapper props

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) {