uniweb 0.12.0 → 0.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniweb",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Create structured Vite + React sites with content/code separation",
   "type": "module",
   "bin": {
@@ -41,14 +41,14 @@
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "tar": "^7.0.0",
-    "@uniweb/core": "0.7.8",
-    "@uniweb/kit": "0.9.8",
-    "@uniweb/runtime": "0.8.9"
+    "@uniweb/core": "0.7.9",
+    "@uniweb/runtime": "0.8.10",
+    "@uniweb/kit": "0.9.9"
   },
   "peerDependencies": {
-    "@uniweb/build": "0.13.0",
+    "@uniweb/build": "0.13.1",
     "@uniweb/content-reader": "1.1.9",
-    "@uniweb/semantic-parser": "1.1.15"
+    "@uniweb/semantic-parser": "1.1.16"
   },
   "peerDependenciesMeta": {
     "@uniweb/build": {

package/src/commands/add.js

@@ -730,12 +730,9 @@ async function applyFromTemplate(templateId, packageType, targetDir, projectName
     const metadata = await validateTemplate(resolved.path, {})
 
     // Look in contentDirs for matching package type
-    let contentDir = null
     const match = metadata.contentDirs.find(d => d.type === packageType) ||
                   metadata.contentDirs.find(d => d.name === packageType)
-    if (match) {
-      contentDir = match.dir
-    }
+    const contentDir = match ? match.dir : null
 
     if (contentDir) {
       info(`Applying ${metadata.name} content...`)
@@ -744,6 +741,7 @@ async function applyFromTemplate(templateId, packageType, targetDir, projectName
         versions: getVersionsForTemplates(),
       }, {
         onProgress: (msg) => info(`  ${msg}`),
+        renames: match.renames,
       })
 
       // Merge template dependencies

package/src/framework-index.json

@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
-  "generatedAt": "2026-04-29T13:02:15.924Z",
+  "generatedAt": "2026-04-29T13:50:36.314Z",
   "packages": {
     "@uniweb/build": {
-      "version": "0.13.0",
+      "version": "0.13.1",
       "path": "framework/build",
       "deps": [
         "@uniweb/content-reader",
@@ -24,7 +24,7 @@
       "deps": []
     },
     "@uniweb/core": {
-      "version": "0.7.8",
+      "version": "0.7.9",
       "path": "framework/core",
       "deps": [
         "@uniweb/semantic-parser",
@@ -42,7 +42,7 @@
       "deps": []
     },
     "@uniweb/kit": {
-      "version": "0.9.8",
+      "version": "0.9.9",
       "path": "framework/kit",
       "deps": [
         "@uniweb/core"
@@ -59,7 +59,7 @@
       "deps": []
     },
     "@uniweb/runtime": {
-      "version": "0.8.9",
+      "version": "0.8.10",
       "path": "framework/runtime",
       "deps": [
         "@uniweb/core",
@@ -77,12 +77,12 @@
       "deps": []
     },
     "@uniweb/semantic-parser": {
-      "version": "1.1.15",
+      "version": "1.1.16",
       "path": "framework/semantic-parser",
       "deps": []
     },
     "@uniweb/templates": {
-      "version": "0.7.35",
+      "version": "0.7.36",
       "path": "framework/templates",
       "deps": []
     },
@@ -92,7 +92,7 @@
       "deps": []
     },
     "@uniweb/unipress": {
-      "version": "0.3.0",
+      "version": "0.4.1",
       "path": "framework/unipress",
       "deps": [
         "@uniweb/build",

package/src/index.js

@@ -26,13 +26,14 @@ import { execSync, spawn as spawnChild } from 'node:child_process'
 import { resolve, join, relative, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import prompts from 'prompts'
-import { doctor } from './commands/doctor.js'
+// `doctor`, `add`, `publish`, and `deploy` are loaded lazily via
+// importProjectCommand() — each imports `@uniweb/build` at the top,
+// so a static import here would crash `npx uniweb@latest create …`
+// (no @uniweb/build in the npx scratch dir) before any command runs.
+// Same pattern as `build` and `docs`.
 import { i18n } from './commands/i18n.js'
 import { inspect } from './commands/inspect.js'
-import { add } from './commands/add.js'
 import { login } from './commands/login.js'
-import { publish } from './commands/publish.js'
-import { deploy } from './commands/deploy.js'
 import { invite } from './commands/invite.js'
 import { handoff } from './commands/handoff.js'
 import { update } from './commands/update.js'
@@ -347,7 +348,11 @@ async function createFromContentTemplate(projectDir, projectName, metadata, temp
     const contentDir = findContentDirFor(metadata.contentDirs, pkg)
     if (contentDir) {
       onProgress?.(`Applying ${metadata.name} content to ${pkg.name}...`)
-      await applyContent(contentDir.dir, fullPath, { projectName }, { onProgress, onWarning })
+      await applyContent(contentDir.dir, fullPath, { projectName }, {
+        onProgress,
+        onWarning,
+        renames: contentDir.renames,
+      })
     }
 
     // Merge template dependencies into package.json
@@ -487,8 +492,9 @@ async function main() {
     return
   }
 
-  // Handle doctor command
+  // Handle doctor command (dynamic import — depends on @uniweb/build)
   if (command === 'doctor') {
+    const { doctor } = await importProjectCommand('./commands/doctor.js')
     await doctor(args.slice(1))
     return
   }
@@ -505,20 +511,23 @@ async function main() {
     return
   }
 
-  // Handle add command
+  // Handle add command (dynamic import — depends on @uniweb/build)
   if (command === 'add') {
+    const { add } = await importProjectCommand('./commands/add.js')
     await add(args.slice(1))
     return
   }
 
-  // Handle publish command
+  // Handle publish command (dynamic import — depends on @uniweb/build)
   if (command === 'publish') {
+    const { publish } = await importProjectCommand('./commands/publish.js')
     await publish(args.slice(1))
     return
   }
 
-  // Handle deploy command
+  // Handle deploy command (dynamic import — depends on @uniweb/build)
   if (command === 'deploy') {
+    const { deploy } = await importProjectCommand('./commands/deploy.js')
     await deploy(args.slice(1))
     return
   }

package/src/templates/validator.js

@@ -175,7 +175,7 @@ export async function validateTemplate(templateRoot, options = {}) {
  *
  * @param {string} templateRoot - Root of the template (contains template.json)
  * @param {Object} metadata - Parsed template.json
- * @returns {Array<Object>} Content directories: [{ type, name, dir, foundation? }]
+ * @returns {Array<Object>} Content directories: [{ type, name, dir, foundation?, renames? }]
  */
 export function resolveContentDirs(templateRoot, metadata) {
   const dirs = []
@@ -185,19 +185,25 @@ export function resolveContentDirs(templateRoot, metadata) {
     for (const pkg of metadata.packages) {
       const dir = path.join(templateRoot, pkg.name)
       if (existsSync(dir)) {
-        dirs.push({
+        const entry = {
           type: pkg.type,
           name: pkg.name,
           dir,
           ...(pkg.foundation ? { foundation: pkg.foundation } : {}),
-        })
+        }
+        if (entry.type === 'foundation' || entry.type === 'extension') {
+          applyLegacyFoundationLayout(entry)
+        }
+        dirs.push(entry)
       }
     }
   } else {
     // Standard template: look for foundation/ and site/
     const foundationDir = path.join(templateRoot, 'foundation')
     if (existsSync(foundationDir)) {
-      dirs.push({ type: 'foundation', name: 'foundation', dir: foundationDir })
+      const entry = { type: 'foundation', name: 'foundation', dir: foundationDir }
+      applyLegacyFoundationLayout(entry)
+      dirs.push(entry)
     }
 
     const siteDir = path.join(templateRoot, 'site')
@@ -209,6 +215,48 @@ export function resolveContentDirs(templateRoot, metadata) {
   return dirs
 }
 
+/**
+ * Detect and unwrap the legacy foundation layout.
+ *
+ * Old templates (published in the `uniweb/templates` releases up to
+ * v0.7.x) shipped foundation content nested one level deeper, with the
+ * package source under `foundation/src/` and the user-authored
+ * declarations file named `foundation.js`:
+ *
+ *     <template>/foundation/src/foundation.js
+ *     <template>/foundation/src/sections/...
+ *     <template>/foundation/src/components/...
+ *
+ * The current layout is flat — the foundation package root contains
+ * the source directly, and the declarations file is named `main.js`:
+ *
+ *     <template>/foundation/main.js
+ *     <template>/foundation/sections/...
+ *
+ * The CLI scaffolds the new flat shape into the project's `src/`
+ * directory, so an unmodified copy of an old-format template would
+ * land at `src/src/foundation.js` (extra `src/` layer + old name).
+ *
+ * This helper detects the legacy marker (`<dir>/src/foundation.js`),
+ * mutates the contentDir entry to point at the inner `src/` directory,
+ * and records a top-level rename so `foundation.js` is written as
+ * `main.js`. Once `uniweb/templates` is republished with the flat
+ * layout, this branch becomes a no-op.
+ */
+function applyLegacyFoundationLayout(entry) {
+  const innerSrc = path.join(entry.dir, 'src')
+  if (!existsSync(innerSrc)) return
+
+  const legacyMain = path.join(innerSrc, 'foundation.js')
+  const newMain = path.join(innerSrc, 'main.js')
+  if (!existsSync(legacyMain) && !existsSync(newMain)) return
+
+  entry.dir = innerSrc
+  if (existsSync(legacyMain)) {
+    entry.renames = { ...(entry.renames || {}), 'foundation.js': 'main.js' }
+  }
+}
+
 /**
  * Get list of available templates in a templates directory
  *

package/src/utils/scaffold.js

@@ -106,6 +106,11 @@ export async function scaffoldSite(targetDir, context, options = {}) {
  * @param {string} targetDir - Target directory to overlay onto
  * @param {Object} context - Handlebars context for .hbs files
  * @param {Object} [options] - Processing options
+ * @param {Object} [options.renames] - Top-level filename remapping
+ *   (e.g. `{ 'foundation.js': 'main.js' }`). Applied only at depth 0
+ *   so renames don't accidentally rewrite same-named files in nested
+ *   directories. Used to migrate legacy `foundation/foundation.js`
+ *   templates onto the new flat `src/main.js` layout.
  */
 export async function applyContent(contentDir, targetDir, context, options = {}) {
   if (!existsSync(contentDir)) return
@@ -127,29 +132,41 @@ export async function applyContent(contentDir, targetDir, context, options = {})
     'site.yml': ['name', 'foundation'],
   }
 
-  await copyContentRecursive(contentDir, targetDir, context, STRUCTURAL_FILES, MERGE_FILES, options)
+  await copyContentRecursive(contentDir, targetDir, context, STRUCTURAL_FILES, MERGE_FILES, options, 0)
 }
 
 /**
- * Recursively copy content files, skipping structural files
+ * Recursively copy content files, skipping structural files.
+ *
+ * `depth` is tracked so the `renames` map (passed via options) only
+ * applies at depth 0 — the top of the content directory. Without this
+ * guard, a rename like `foundation.js → main.js` would also rewrite a
+ * nested `sections/foo/foundation.js` if one existed, which is not the
+ * intent.
  */
-async function copyContentRecursive(sourceDir, targetDir, context, structuralFiles, mergeFiles, options) {
+async function copyContentRecursive(sourceDir, targetDir, context, structuralFiles, mergeFiles, options, depth = 0) {
   await fs.mkdir(targetDir, { recursive: true })
 
   const entries = readdirSync(sourceDir, { withFileTypes: true })
+  const renames = (depth === 0 && options.renames) || null
 
   for (const entry of entries) {
     const sourcePath = join(sourceDir, entry.name)
 
     if (entry.isDirectory()) {
       const targetSubDir = join(targetDir, entry.name)
-      await copyContentRecursive(sourcePath, targetSubDir, context, structuralFiles, mergeFiles, options)
+      await copyContentRecursive(sourcePath, targetSubDir, context, structuralFiles, mergeFiles, options, depth + 1)
     } else {
       // Determine the output filename (strip .hbs extension)
-      const outputName = entry.name.endsWith('.hbs')
+      let outputName = entry.name.endsWith('.hbs')
         ? entry.name.slice(0, -4)
         : entry.name
 
+      // Apply top-level rename (e.g. legacy `foundation.js` → `main.js`)
+      if (renames && Object.prototype.hasOwnProperty.call(renames, outputName)) {
+        outputName = renames[outputName]
+      }
+
       // Skip structural files
       if (structuralFiles.has(outputName)) continue
 
@@ -190,8 +207,17 @@ async function copyContentRecursive(sourceDir, targetDir, context, structuralFil
         for (const key of preserveKeys) {
           if (existing[key] === undefined) continue
           const baseLine = matchTopLevelLine(existingContent, key)
-          if (baseLine) {
+          if (!baseLine) continue
+          // If the new content carries the key, replace its line with
+          // the scaffolded value (preserving the user's project/foundation
+          // choice). Otherwise insert the line — older content templates
+          // (notably `docs/site/site.yml.hbs`) omit `foundation:` entirely,
+          // and dropping it leaves the site without a foundation ref so
+          // the entry's `import '#foundation/styles'` fails at build time.
+          if (matchTopLevelLine(merged, key)) {
             merged = replaceTopLevelLine(merged, key, baseLine)
+          } else {
+            merged = insertTopLevelLine(merged, baseLine)
           }
         }
 
@@ -213,14 +239,20 @@ async function copyContentRecursive(sourceDir, targetDir, context, structuralFil
 /**
  * Apply the built-in starter content
  *
+ * The starter ships its foundation content under `cli/starter/foundation/`
+ * (a description of the *kind* of content), and is applied into whatever
+ * folder the workspace uses for the foundation package — which is `src/`
+ * in the current single-foundation layout, not `foundation/`. Callers
+ * can override via options when scaffolding multi-foundation workspaces.
+ *
  * @param {string} projectDir - Root project directory
  * @param {Object} context - Template context
  * @param {Object} [options] - Processing options
- * @param {string} [options.foundationDir] - Foundation directory name (default: 'foundation')
+ * @param {string} [options.foundationDir] - Foundation directory name (default: 'src')
  * @param {string} [options.siteDir] - Site directory name (default: 'site')
  */
 export async function applyStarter(projectDir, context, options = {}) {
-  const foundationDir = options.foundationDir || 'foundation'
+  const foundationDir = options.foundationDir || 'src'
   const siteDir = options.siteDir || 'site'
 
   // Apply foundation starter content
@@ -266,6 +298,25 @@ function replaceTopLevelLine(content, key, replacement) {
   )
 }
 
+/**
+ * Insert a top-level YAML line into a content string.
+ *
+ * Used by the merge path when the content template omits a key that
+ * the scaffolded base file declared (e.g. an older `site.yml.hbs` with
+ * no `foundation:` line). Inserts immediately after the `name:` line
+ * if one exists — that's the conventional position for site
+ * configuration — and otherwise prepends to the file. The original
+ * trailing newline (or lack thereof) of the file is preserved.
+ */
+function insertTopLevelLine(content, line) {
+  const nameMatch = content.match(/^name:.*$/m)
+  if (nameMatch) {
+    const idx = nameMatch.index + nameMatch[0].length
+    return content.slice(0, idx) + '\n' + line + content.slice(idx)
+  }
+  return line + '\n' + content
+}
+
 /**
  * Resolve a dependency version string from a template.json entry.
  *

package/src/utils/workspace.js

@@ -10,7 +10,20 @@ import { existsSync, readdirSync, readFileSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { resolve, dirname, join } from 'node:path'
 import yaml from 'js-yaml'
-import { classifyPackage as classifyPackageSync } from '@uniweb/build'
+
+// `classifyPackage` from @uniweb/build is loaded lazily — this module
+// is statically imported by index.js (for `findWorkspaceRoot`), and a
+// top-level @uniweb/build import would crash `npx uniweb@latest create`
+// before any command runs (the npx scratch dir has only the CLI's
+// declared deps; @uniweb/build comes from a project's node_modules).
+let _classifyPackageSync = null
+async function getClassifier() {
+  if (!_classifyPackageSync) {
+    const mod = await import('@uniweb/build')
+    _classifyPackageSync = mod.classifyPackage
+  }
+  return _classifyPackageSync
+}
 
 /**
  * Check if a directory is a workspace root.
@@ -135,7 +148,8 @@ export async function getWorkspacePackages(workspaceRoot) {
  * @returns {Promise<'foundation'|'site'|null>}
  */
 export async function classifyPackage(packagePath) {
-  return classifyPackageSync(packagePath)
+  const classify = await getClassifier()
+  return classify(packagePath)
 }
 
 /**
@@ -144,8 +158,11 @@ export async function classifyPackage(packagePath) {
  * @returns {Promise<string[]>} - Array of foundation paths (relative to workspace root)
  */
 export async function findFoundations(workspaceRoot) {
-  const packages = await getWorkspacePackages(workspaceRoot)
-  return packages.filter(pkg => classifyPackageSync(join(workspaceRoot, pkg)) === 'foundation')
+  const [packages, classify] = await Promise.all([
+    getWorkspacePackages(workspaceRoot),
+    getClassifier(),
+  ])
+  return packages.filter(pkg => classify(join(workspaceRoot, pkg)) === 'foundation')
 }
 
 /**
@@ -154,8 +171,11 @@ export async function findFoundations(workspaceRoot) {
  * @returns {Promise<string[]>} - Array of site paths (relative to workspace root)
  */
 export async function findSites(workspaceRoot) {
-  const packages = await getWorkspacePackages(workspaceRoot)
-  return packages.filter(pkg => classifyPackageSync(join(workspaceRoot, pkg)) === 'site')
+  const [packages, classify] = await Promise.all([
+    getWorkspacePackages(workspaceRoot),
+    getClassifier(),
+  ])
+  return packages.filter(pkg => classify(join(workspaceRoot, pkg)) === 'site')
 }
 
 /**