@uniweb/build 0.1.28 → 0.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "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.4",
-    "@uniweb/runtime": "0.2.15"
+    "@uniweb/runtime": "0.2.16",
+    "@uniweb/content-reader": "1.0.4"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",

package/src/site/config.js

@@ -21,8 +21,9 @@
  */
 
 import { existsSync, readFileSync } from 'node:fs'
-import { resolve, dirname } from 'node:path'
+import { resolve, dirname, join } from 'node:path'
 import yaml from 'js-yaml'
+import { generateEntryPoint } from '../generate-entry.js'
 
 /**
  * Detect foundation type from the foundation config value
@@ -177,8 +178,52 @@ export async function defineSiteConfig(options = {}) {
     foundationDevPlugin = modules[3].foundationDevPlugin
   }
 
+  // Plugin to ensure foundation entry file exists (for bundled mode with local foundation)
+  const ensureFoundationEntryPlugin = !isRuntimeMode && foundationInfo.type === 'local' ? {
+    name: 'uniweb:ensure-foundation-entry',
+    async config() {
+      const srcDir = join(foundationInfo.path, 'src')
+      const entryPath = join(srcDir, '_entry.generated.js')
+
+      // Always regenerate on dev start to ensure it's current
+      // This handles new components being added
+      if (existsSync(srcDir)) {
+        console.log('[site] Ensuring foundation entry is up to date...')
+        try {
+          await generateEntryPoint(srcDir, entryPath)
+        } catch (err) {
+          console.warn('[site] Failed to generate foundation entry:', err.message)
+        }
+      }
+    },
+
+    configureServer(server) {
+      // Watch foundation src for meta.js changes to regenerate entry
+      const srcDir = join(foundationInfo.path, 'src')
+      const entryPath = join(srcDir, '_entry.generated.js')
+
+      server.watcher.add(join(srcDir, '**', 'meta.js'))
+
+      server.watcher.on('all', async (event, path) => {
+        // Regenerate entry when meta.js files change (new/deleted components)
+        if (path.includes(srcDir) && path.endsWith('meta.js')) {
+          console.log(`[site] Foundation meta.js changed, regenerating entry...`)
+          try {
+            await generateEntryPoint(srcDir, entryPath)
+            server.ws.send({ type: 'full-reload' })
+          } catch (err) {
+            console.warn('[site] Failed to regenerate foundation entry:', err.message)
+          }
+        }
+      })
+    }
+  } : null
+
   // Build the plugins array
   const plugins = [
+    // Ensure foundation entry exists first (bundled mode only)
+    ensureFoundationEntryPlugin,
+
     // Standard plugins
     tailwind && tailwindcss(),
     react(),

package/src/site/plugin.js

@@ -274,6 +274,7 @@ export function siteContentPlugin(options = {}) {
   let server = null
   let localeTranslations = {} // Cache: { locale: translations }
   let localesDir = 'locales' // Default, updated from site config
+  let collectionsConfig = null // Cached for watcher setup
 
   /**
    * Load translations for a specific locale
@@ -332,10 +333,28 @@ export function siteContentPlugin(options = {}) {
   return {
     name: 'uniweb:site-content',
 
-    configResolved(config) {
+    async configResolved(config) {
       resolvedSitePath = resolve(config.root, sitePath)
       resolvedOutDir = resolve(config.root, config.build.outDir)
       isProduction = config.command === 'build'
+
+      // In dev mode, process collections early so JSON files exist before server starts
+      // This runs before configureServer, ensuring data is available immediately
+      if (!isProduction) {
+        try {
+          // Do an early content collection to get the collections config
+          const earlyContent = await collectSiteContent(resolvedSitePath)
+          collectionsConfig = earlyContent.config?.collections
+
+          if (collectionsConfig) {
+            console.log('[site-content] Processing content collections...')
+            const collections = await processCollections(resolvedSitePath, collectionsConfig)
+            await writeCollectionFiles(resolvedSitePath, collections)
+          }
+        } catch (err) {
+          console.warn('[site-content] Early collection processing failed:', err.message)
+        }
+      }
     },
 
     async buildStart() {
@@ -345,8 +364,9 @@ export function siteContentPlugin(options = {}) {
         console.log(`[site-content] Collected ${siteContent.pages?.length || 0} pages`)
 
         // Process content collections if defined in site.yml
-        // This generates JSON files in public/data/ BEFORE the Vite build
-        if (siteContent.config?.collections) {
+        // In dev mode, this was already done in configResolved (before server starts)
+        // 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)
           await writeCollectionFiles(resolvedSitePath, collections)
@@ -399,9 +419,11 @@ export function siteContentPlugin(options = {}) {
           collectionRebuildTimeout = setTimeout(async () => {
             console.log('[site-content] Collection content changed, regenerating JSON...')
             try {
-              if (siteContent?.config?.collections) {
-                const collections = await processCollections(resolvedSitePath, siteContent.config.collections)
-                await writeCollectionFiles(resolvedSitePath, collections)
+              // Use collectionsConfig (cached from configResolved) or siteContent
+              const collections = collectionsConfig || siteContent?.config?.collections
+              if (collections) {
+                const processed = await processCollections(resolvedSitePath, collections)
+                await writeCollectionFiles(resolvedSitePath, processed)
               }
               // Send full reload to client
               server.ws.send({ type: 'full-reload' })
@@ -437,9 +459,10 @@ export function siteContentPlugin(options = {}) {
         }
 
         // Watch content/ folder for collection changes
-        if (siteContent?.config?.collections) {
+        // Use collectionsConfig cached from configResolved (siteContent may be null here)
+        if (collectionsConfig) {
           const contentPaths = new Set()
-          for (const config of Object.values(siteContent.config.collections)) {
+          for (const config of Object.values(collectionsConfig)) {
             const collectionPath = typeof config === 'string' ? config : config.path
             if (collectionPath) {
               contentPaths.add(resolve(resolvedSitePath, collectionPath))