@uniweb/build 0.7.2 → 0.7.4

package/README.md

@@ -387,7 +387,7 @@ The generated `_entry.generated.js` file exports:
 |--------|-------------|
 | `components` | Object map of component name → React component |
 | Named exports | Each component exported by name (e.g., `Hero`, `Features`) |
-| `capabilities` | Custom Layout and props from `src/exports.js` (or `null`) |
+| `capabilities` | Custom Layout and props from `src/foundation.js` (or `null`) |
 | `meta` | Runtime metadata extracted from component `meta.js` files |
 
 #### Runtime Metadata (`meta` export)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -50,9 +50,9 @@
     "sharp": "^0.33.2"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "0.6.0",
+    "@uniweb/content-reader": "1.1.2",
     "@uniweb/schemas": "0.2.1",
-    "@uniweb/content-reader": "1.1.2"
+    "@uniweb/runtime": "0.6.0"
   },
   "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.5.0"
+    "@uniweb/core": "0.5.1"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/generate-entry.js

@@ -5,7 +5,7 @@
  *
  * Exports:
  * - `components` - Object map of component name -> React component
- * - `capabilities` - Custom Layout and props from src/exports.js (if present)
+ * - `capabilities` - Custom Layout and props from src/foundation.js (if present)
  * - `meta` - Per-component runtime metadata extracted from meta.js files
  *
  * The `meta` export contains only properties needed at runtime:
@@ -19,18 +19,16 @@
  * Foundation identity (name, description) comes from package.json in the editor schema.
  */
 
-import { writeFile, mkdir } from 'node:fs/promises'
+import { writeFile, readFile, mkdir } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 import { join, dirname } from 'node:path'
 import { discoverComponents, discoverLayoutsInPath } from './schema.js'
 import { extractAllRuntimeSchemas, extractAllLayoutRuntimeSchemas } from './runtime-schema.js'
 
 /**
- * Detect foundation config/exports file (for props, vars, etc.)
+ * Detect foundation config file (for props, vars, etc.)
  *
- * Looks for (in order of preference):
- * 1. foundation.js - New consolidated format
- * 2. exports.js - Legacy format (for backward compatibility)
+ * Looks for: foundation.js or foundation.jsx
  *
  * The file should export:
  * - props (optional) - Foundation-wide props
@@ -40,29 +38,14 @@ import { extractAllRuntimeSchemas, extractAllLayoutRuntimeSchemas } from './runt
  * Note: Layout components are now discovered from src/layouts/
  */
 function detectFoundationExports(srcDir) {
-  // Prefer foundation.js (new consolidated format)
-  const foundationCandidates = [
+  const candidates = [
     { path: 'foundation.js', ext: 'js' },
     { path: 'foundation.jsx', ext: 'jsx' },
   ]
 
-  for (const { path, ext } of foundationCandidates) {
+  for (const { path, ext } of candidates) {
     if (existsSync(join(srcDir, path))) {
-      return { path: `./${path}`, ext, isFoundationJs: true }
-    }
-  }
-
-  // Fall back to exports.js (legacy format)
-  const legacyCandidates = [
-    { path: 'exports.js', ext: 'js' },
-    { path: 'exports.jsx', ext: 'jsx' },
-    { path: 'exports/index.js', ext: 'js' },
-    { path: 'exports/index.jsx', ext: 'jsx' },
-  ]
-
-  for (const { path, ext } of legacyCandidates) {
-    if (existsSync(join(srcDir, path))) {
-      return { path: `./${path.replace(/\/index\.(js|jsx)$/, '')}`, ext, isFoundationJs: false }
+      return { path: `./${path}`, ext }
     }
   }
   return null
@@ -132,13 +115,9 @@ function generateEntrySource(components, options = {}) {
 
   lines.push('')
 
-  // Export components object
+  // Named exports — one per component
   if (componentNames.length > 0) {
-    lines.push(`export const components = { ${componentNames.join(', ')} }`)
-    lines.push('')
     lines.push(`export { ${componentNames.join(', ')} }`)
-  } else {
-    lines.push('export const components = {}')
   }
 
   // Foundation capabilities (props, vars, etc. + discovered layouts)
@@ -152,31 +131,23 @@ function generateEntrySource(components, options = {}) {
       capParts.push(`layouts: { ${layoutNames.join(', ')} }`)
     }
     lines.push(`const capabilities = { ${capParts.join(', ')} }`)
-    lines.push('export { capabilities }')
   } else {
-    lines.push('export const capabilities = null')
+    lines.push('const capabilities = null')
   }
 
-  // Per-component metadata (defaults, context, initialState, background, data)
+  // Per-component runtime metadata (defaults, context, initialState, background, data)
   lines.push('')
-  if (Object.keys(meta).length > 0) {
-    const metaJson = JSON.stringify(meta, null, 2)
-    lines.push(`// Per-component runtime metadata (from meta.js)`)
-    lines.push(`export const meta = ${metaJson}`)
-  } else {
-    lines.push('export const meta = {}')
-  }
+  const metaJson = JSON.stringify(Object.keys(meta).length > 0 ? meta : {}, null, 2)
+  lines.push(`const meta = ${metaJson}`)
 
   // Per-layout runtime metadata (areas, transitions, defaults)
   lines.push('')
-  if (Object.keys(layoutMeta).length > 0) {
-    const layoutMetaJson = JSON.stringify(layoutMeta, null, 2)
-    lines.push(`// Per-layout runtime metadata (from meta.js)`)
-    lines.push(`export const layoutMeta = ${layoutMetaJson}`)
-  } else {
-    lines.push('export const layoutMeta = {}')
-  }
+  const layoutMetaJson = JSON.stringify(Object.keys(layoutMeta).length > 0 ? layoutMeta : {}, null, 2)
+  lines.push(`const layoutMeta = ${layoutMetaJson}`)
 
+  // Default export — non-component data (naturally unforgeable key)
+  lines.push('')
+  lines.push('export default { meta, capabilities, layoutMeta }')
   lines.push('')
 
   return lines.join('\n')
@@ -277,12 +248,23 @@ export async function generateEntryPoint(srcDir, outputPath = null, options = {}
     layoutMeta,
   })
 
-  // Write to file
+  // Write to file (skip if content unchanged to avoid unnecessary watcher triggers)
   const output = outputPath || join(srcDir, '_entry.generated.js')
   await mkdir(dirname(output), { recursive: true })
-  await writeFile(output, source, 'utf-8')
 
-  console.log(`Generated entry point: ${output}`)
+  let written = false
+  if (existsSync(output)) {
+    const existing = await readFile(output, 'utf-8')
+    if (existing !== source) {
+      await writeFile(output, source, 'utf-8')
+      written = true
+    }
+  } else {
+    await writeFile(output, source, 'utf-8')
+    written = true
+  }
+
+  console.log(`${written ? 'Generated' : 'Unchanged'} entry point: ${output}`)
   console.log(`  - ${componentNames.length} components: ${componentNames.join(', ')}`)
   if (layoutNames.length > 0) {
     console.log(`  - ${layoutNames.length} layouts: ${layoutNames.join(', ')}`)
@@ -302,13 +284,75 @@ export async function generateEntryPoint(srcDir, outputPath = null, options = {}
 }
 
 /**
- * Check if entry point needs regeneration
- * (Compare discovered components with existing generated file)
+ * Check if a file change should trigger entry point regeneration.
+ *
+ * Used by both the foundation dev plugin and the site's bundled-mode plugin
+ * to decide when to re-run generateEntryPoint().
+ *
+ * The content-comparison guard in generateEntryPoint() makes false positives
+ * cheap (discovery runs but no write), so we err on the side of regenerating.
+ *
+ * @param {string} file - Absolute path of the changed file
+ * @param {string} srcDir - Foundation source directory (absolute)
+ * @returns {string|null} Reason string if regeneration needed, null otherwise
  */
-export async function shouldRegenerateEntry(srcDir, entryPath) {
-  if (!existsSync(entryPath)) return true
+export function shouldRegenerateForFile(file, srcDir) {
+  if (!file.startsWith(srcDir + '/')) return null
+
+  const rel = file.slice(srcDir.length + 1)
 
-  // Could add more sophisticated checking here
-  // For now, always regenerate during build
-  return true
+  // meta.js anywhere — affects runtime metadata
+  if (rel.endsWith('/meta.js') || rel === 'meta.js') {
+    return 'meta.js changed'
+  }
+
+  // foundation.js / foundation.jsx at root — affects capabilities import
+  if (/^foundation\.(js|jsx)$/.test(rel)) {
+    return 'foundation config changed'
+  }
+
+  // styles.css / index.css at root — affects CSS import line
+  if (/^(styles|index)\.css$/.test(rel)) {
+    return 'foundation styles changed'
+  }
+
+  // sections/ — relaxed discovery (bare files + entry files in PascalCase dirs)
+  if (rel.startsWith('sections/')) {
+    const inner = rel.slice('sections/'.length)
+    const parts = inner.split('/')
+
+    // Bare file at sections root: sections/Hero.jsx
+    if (parts.length === 1 && /^[A-Z].*\.(jsx|tsx|js|ts)$/.test(parts[0])) {
+      return `section file: ${parts[0]}`
+    }
+
+    // Entry file in a PascalCase directory: sections/Hero/index.jsx or sections/Hero/Hero.jsx
+    if (parts.length === 2 && /^[A-Z]/.test(parts[0]) && /\.(jsx|tsx|js|ts)$/.test(parts[1])) {
+      const base = parts[1].replace(/\.(jsx|tsx|js|ts)$/, '')
+      if (base === 'index' || base === parts[0]) {
+        return `section entry: ${inner}`
+      }
+    }
+  }
+
+  // layouts/ — bare files and entry files
+  if (rel.startsWith('layouts/')) {
+    const inner = rel.slice('layouts/'.length)
+    const parts = inner.split('/')
+
+    // Bare file at layouts root: layouts/docs.jsx
+    if (parts.length === 1 && /\.(jsx|tsx|js|ts)$/.test(parts[0])) {
+      return `layout file: ${parts[0]}`
+    }
+
+    // Entry file in a directory: layouts/docs/index.jsx or layouts/docs/docs.jsx
+    if (parts.length === 2 && /\.(jsx|tsx|js|ts)$/.test(parts[1])) {
+      const base = parts[1].replace(/\.(jsx|tsx|js|ts)$/, '')
+      if (base === 'index' || base === parts[0]) {
+        return `layout entry: ${inner}`
+      }
+    }
+  }
+
+  return null
 }

package/src/index.js

@@ -17,7 +17,6 @@ export {
 // Entry point generation
 export {
   generateEntryPoint,
-  shouldRegenerateEntry,
 } from './generate-entry.js'
 
 // Image processing

package/src/prerender.js

@@ -786,8 +786,13 @@ export async function prerenderSite(siteDir, options = {}) {
     }
 
     // Set foundation capabilities (Layout, props, etc.)
-    if (foundation.capabilities) {
-      uniweb.setFoundationConfig(foundation.capabilities)
+    if (foundation.default?.capabilities) {
+      uniweb.setFoundationConfig(foundation.default.capabilities)
+    }
+
+    // Attach layout metadata (areas, transitions, defaults)
+    if (foundation.default?.layoutMeta && uniweb.foundationConfig) {
+      uniweb.foundationConfig.layoutMeta = foundation.default.layoutMeta
     }
 
     // Pre-fetch icons for SSR embedding

package/src/site/config.js

@@ -23,7 +23,7 @@
 import { existsSync, readFileSync } from 'node:fs'
 import { resolve, dirname, join } from 'node:path'
 import yaml from 'js-yaml'
-import { generateEntryPoint } from '../generate-entry.js'
+import { generateEntryPoint, shouldRegenerateForFile } from '../generate-entry.js'
 
 /**
  * Normalize a base path for Vite compatibility
@@ -241,16 +241,16 @@ export async function defineSiteConfig(options = {}) {
     },
 
     configureServer(server) {
-      // Watch foundation src for meta.js changes to regenerate entry
+      // Watch foundation src for structural changes that affect the entry
       const srcDir = join(foundationInfo.path, 'src')
       const entryPath = join(srcDir, '_entry.generated.js')
 
-      server.watcher.add(join(srcDir, '**', 'meta.js'))
+      server.watcher.add(srcDir)
 
       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...`)
+        const reason = shouldRegenerateForFile(path, srcDir)
+        if (reason) {
+          console.log(`[site] Foundation ${reason}, regenerating entry...`)
           try {
             await generateEntryPoint(srcDir, entryPath)
             server.ws.send({ type: 'full-reload' })
@@ -348,8 +348,18 @@ export async function defineSiteConfig(options = {}) {
         isBuild = config.command === 'build'
       },
 
-      resolveId(id) {
+      resolveId(id, importer) {
         if (id.startsWith(IMPORT_MAP_PREFIX)) return id
+        // Bare specifiers inside our virtual modules (e.g. '@uniweb/core' re-exported
+        // from '\0importmap:@uniweb/core') can't be resolved by Rollup because virtual
+        // modules have no filesystem context. Resolve from the foundation directory where
+        // @uniweb/core is a direct dependency (the site may not have it under pnpm strict).
+        if (importer?.startsWith(IMPORT_MAP_PREFIX) && IMPORT_MAP_EXTERNALS.includes(id)) {
+          const resolveFrom = foundationInfo.path
+            ? resolve(foundationInfo.path, 'package.json')
+            : resolve(siteRoot, 'main.js')
+          return this.resolve(id, resolveFrom, { skipSelf: true })
+        }
       },
 
       async load(id) {

package/src/vite-foundation-plugin.js

@@ -10,7 +10,7 @@
 import { writeFile, mkdir } from 'node:fs/promises'
 import { join, resolve } from 'node:path'
 import { buildSchema } from './schema.js'
-import { generateEntryPoint } from './generate-entry.js'
+import { generateEntryPoint, shouldRegenerateForFile } from './generate-entry.js'
 import { processAllPreviews } from './images.js'
 
 /**
@@ -120,33 +120,10 @@ export function foundationDevPlugin(options = {}) {
     },
 
     async handleHotUpdate({ file, server }) {
-      const entryPath = join(resolvedSrcDir, entryFileName)
-
-      // Regenerate entry when meta.js files change
-      if (file.startsWith(resolvedSrcDir) && file.endsWith('/meta.js')) {
-        console.log('Component meta.js changed, regenerating entry...')
-        await generateEntryPoint(resolvedSrcDir, entryPath, { componentPaths })
-        server.ws.send({ type: 'full-reload' })
-        return
-      }
-
-      // Regenerate when component files are added/removed in sections/ root
-      // (bare file discovery means any .jsx/.tsx/.js/.ts at sections root is a section type)
-      const sectionsDir = join(resolvedSrcDir, 'sections')
-      if (file.startsWith(sectionsDir)) {
-        const relative = file.slice(sectionsDir.length + 1)
-        // Direct child of sections/ (no further slashes) — could be a new/removed bare file
-        if (!relative.includes('/') && /\.(jsx|tsx|js|ts)$/.test(relative)) {
-          console.log('Section file changed, regenerating entry...')
-          await generateEntryPoint(resolvedSrcDir, entryPath, { componentPaths })
-          server.ws.send({ type: 'full-reload' })
-          return
-        }
-      }
-
-      // Also regenerate if exports.js changes
-      if (file.endsWith('/exports.js') || file.endsWith('/exports.jsx')) {
-        console.log('Foundation exports changed, regenerating entry...')
+      const reason = shouldRegenerateForFile(file, resolvedSrcDir)
+      if (reason) {
+        console.log(`[foundation] ${reason}, regenerating entry...`)
+        const entryPath = join(resolvedSrcDir, entryFileName)
         await generateEntryPoint(resolvedSrcDir, entryPath, { componentPaths })
         server.ws.send({ type: 'full-reload' })
       }