uniweb 0.7.2 → 0.7.4

package/README.md

@@ -53,7 +53,7 @@ pnpm create uniweb my-site --template dynamic
 pnpm create uniweb my-site --template extensions
 
 # Default starter (foundation + site + sample content)
-pnpm create uniweb my-site
+pnpm create uniweb my-site --template starter
 
 # Blank workspace (grow with `add`)
 pnpm create uniweb my-site --template blank
@@ -260,8 +260,8 @@ The workspace grows organically. `add` handles placement, wires dependencies, up
 ```bash
 pnpm create uniweb acme --template blank
 cd acme
-uniweb add foundation
-uniweb add site
+npx uniweb add foundation
+npx uniweb add site
 pnpm install && pnpm dev
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniweb",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "Create structured Vite + React sites with content/code separation",
   "type": "module",
   "bin": {

package/src/commands/add.js

@@ -14,7 +14,7 @@ import { readFile, writeFile } from 'node:fs/promises'
 import { join, relative } from 'node:path'
 import prompts from 'prompts'
 import yaml from 'js-yaml'
-import { scaffoldFoundation, scaffoldSite, applyContent } from '../utils/scaffold.js'
+import { scaffoldFoundation, scaffoldSite, applyContent, mergeTemplateDependencies } from '../utils/scaffold.js'
 import {
   readWorkspaceConfig,
   addWorkspaceGlob,
@@ -469,6 +469,14 @@ async function applyFromTemplate(templateId, packageType, targetDir, projectName
         onProgress: (msg) => info(`  ${msg}`),
       })
 
+      // Merge template dependencies
+      if (metadata.dependencies) {
+        const deps = metadata.dependencies[packageType] || metadata.dependencies[match?.name]
+        if (deps) {
+          await mergeTemplateDependencies(join(targetDir, 'package.json'), deps)
+        }
+      }
+
       // If site content applied, inform about expected section types
       if (packageType === 'site' && metadata.components) {
         log('')

package/src/index.js

@@ -27,7 +27,7 @@ import {
   parseTemplateId,
 } from './templates/index.js'
 import { validateTemplate } from './templates/validator.js'
-import { scaffoldWorkspace, scaffoldFoundation, scaffoldSite, applyContent, applyStarter } from './utils/scaffold.js'
+import { scaffoldWorkspace, scaffoldFoundation, scaffoldSite, applyContent, applyStarter, mergeTemplateDependencies } from './utils/scaffold.js'
 
 // Colors for terminal output
 const colors = {
@@ -40,6 +40,19 @@ const colors = {
   red: '\x1b[31m',
 }
 
+// Template choices for interactive prompt
+const TEMPLATE_CHOICES = [
+  { title: 'Starter', value: 'starter', description: 'Foundation + site + sample content' },
+  { title: 'Blank', value: 'blank', description: 'Empty workspace — grow with uniweb add' },
+  { title: 'Marketing', value: 'marketing', description: 'Landing page, features, pricing, testimonials' },
+  { title: 'Docs', value: 'docs', description: 'Documentation with sidebar and search' },
+  { title: 'Academic', value: 'academic', description: 'Research site with publications and team' },
+  { title: 'Dynamic', value: 'dynamic', description: 'Live API data fetching with loading states' },
+  { title: 'International', value: 'international', description: 'Multilingual site with i18n and blog' },
+  { title: 'Store', value: 'store', description: 'E-commerce with product grid' },
+  { title: 'Extensions', value: 'extensions', description: 'Multi-foundation with visual effects extension' },
+]
+
 function log(message) {
   console.log(message)
 }
@@ -202,6 +215,14 @@ async function createFromContentTemplate(projectDir, projectName, metadata, temp
       onProgress?.(`Applying ${metadata.name} content to ${pkg.name}...`)
       await applyContent(contentDir.dir, fullPath, { projectName }, { onProgress, onWarning })
     }
+
+    // Merge template dependencies into package.json
+    if (metadata.dependencies) {
+      const deps = metadata.dependencies[pkg.name] || metadata.dependencies[pkg.type]
+      if (deps) {
+        await mergeTemplateDependencies(join(fullPath, 'package.json'), deps)
+      }
+    }
   }
 
   success(`Created project: ${projectName}`)
@@ -375,6 +396,22 @@ async function main() {
     process.exit(1)
   }
 
+  // Prompt for template if not specified via --template
+  if (!templateType) {
+    const templateResponse = await prompts({
+      type: 'select',
+      name: 'template',
+      message: 'Template:',
+      choices: TEMPLATE_CHOICES,
+    }, {
+      onCancel: () => {
+        log('\nScaffolding cancelled.')
+        process.exit(0)
+      },
+    })
+    templateType = templateResponse.template
+  }
+
   const effectiveName = displayName || projectName
 
   // Create project directory
@@ -396,8 +433,8 @@ async function main() {
       onProgress: progressCb,
       onWarning: warningCb,
     })
-  } else if (!templateType) {
-    // Default flow (package templates + starter)
+  } else if (templateType === 'starter') {
+    // Starter: foundation + site + sample content
     log('\nCreating project...')
     await createFromPackageTemplates(projectDir, effectiveName, {
       onProgress: progressCb,
@@ -431,7 +468,7 @@ async function main() {
       log(`${colors.yellow}Troubleshooting:${colors.reset}`)
       log(`  • Check your network connection`)
       log(`  • Official templates require GitHub access (may be blocked by corporate networks)`)
-      log(`  • Try the default template instead: ${colors.cyan}uniweb create ${projectName}${colors.reset}`)
+      log(`  • Try the starter template instead: ${colors.cyan}uniweb create ${projectName} --template starter${colors.reset}`)
       process.exit(1)
     }
   }
@@ -460,8 +497,8 @@ async function main() {
   if (templateType === 'blank') {
     log(`Next steps:\n`)
     log(`  ${colors.cyan}cd ${projectName}${colors.reset}`)
-    log(`  ${colors.cyan}uniweb add foundation${colors.reset}`)
-    log(`  ${colors.cyan}uniweb add site${colors.reset}`)
+    log(`  ${colors.cyan}npx uniweb add foundation${colors.reset}`)
+    log(`  ${colors.cyan}npx uniweb add site${colors.reset}`)
     log(`  ${colors.cyan}pnpm install${colors.reset}`)
     log(`  ${colors.cyan}pnpm dev${colors.reset}`)
   } else {
@@ -489,7 +526,7 @@ ${colors.bright}Commands:${colors.reset}
   i18n <cmd>         Internationalization (extract, sync, status)
 
 ${colors.bright}Create Options:${colors.reset}
-  --template <type>  Project template (default: creates foundation + site + starter)
+  --template <type>  Project template (prompts if not specified)
   --name <name>      Project display name
   --no-git           Skip git repository initialization
 
@@ -525,6 +562,7 @@ ${colors.bright}i18n Commands:${colors.reset}
   status             Show translation coverage per locale
 
 ${colors.bright}Template Types:${colors.reset}
+  starter                       Foundation + site + sample content (default)
   blank                         Empty workspace (grow with 'add')
   marketing                     Official marketing template
   ./path/to/template            Local directory
@@ -533,7 +571,8 @@ ${colors.bright}Template Types:${colors.reset}
   https://github.com/user/repo  GitHub URL
 
 ${colors.bright}Examples:${colors.reset}
-  npx uniweb create my-project                           # Default (foundation + site + starter)
+  npx uniweb create my-project                           # Interactive (prompts for template)
+  npx uniweb create my-project --template starter        # Foundation + site + starter content
   npx uniweb create my-project --template blank          # Blank workspace
   npx uniweb create my-project --template marketing      # Official template
   npx uniweb create my-project --template ./my-template  # Local template

package/src/templates/resolver.js

@@ -3,7 +3,7 @@
  */
 
 // Built-in templates (programmatic, not file-based)
-export const BUILTIN_TEMPLATES = ['blank']
+export const BUILTIN_TEMPLATES = ['blank', 'starter']
 
 // Official templates from @uniweb/templates package (downloaded from GitHub releases)
 export const OFFICIAL_TEMPLATES = ['marketing', 'academic', 'docs', 'international', 'dynamic', 'store', 'extensions']

package/src/utils/scaffold.js

@@ -173,3 +173,24 @@ export async function applyStarter(projectDir, context, options = {}) {
   const siteTargetDir = join(projectDir, siteDir)
   await applyContent(siteContentDir, siteTargetDir, context, options)
 }
+
+/**
+ * Merge additional dependencies from a content template into a scaffolded package.json
+ *
+ * Reads the package.json at the given path, adds any deps not already present
+ * (in either dependencies or devDependencies), and writes it back.
+ *
+ * @param {string} packageJsonPath - Absolute path to package.json
+ * @param {Object} deps - Dependencies to merge (name → version)
+ */
+export async function mergeTemplateDependencies(packageJsonPath, deps) {
+  if (!deps || Object.keys(deps).length === 0) return
+  const pkg = JSON.parse(await fs.readFile(packageJsonPath, 'utf-8'))
+  if (!pkg.dependencies) pkg.dependencies = {}
+  for (const [name, version] of Object.entries(deps)) {
+    if (!pkg.dependencies[name] && !pkg.devDependencies?.[name]) {
+      pkg.dependencies[name] = version
+    }
+  }
+  await fs.writeFile(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n')
+}