uniweb 0.6.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniweb",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Create structured Vite + React sites with content/code separation",
   "type": "module",
   "bin": {
@@ -40,9 +40,9 @@
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "tar": "^7.0.0",
-    "@uniweb/build": "0.5.0",
-    "@uniweb/core": "0.3.10",
-    "@uniweb/kit": "0.4.11",
-    "@uniweb/runtime": "0.5.11"
+    "@uniweb/runtime": "0.5.12",
+    "@uniweb/core": "0.4.0",
+    "@uniweb/build": "0.6.0",
+    "@uniweb/kit": "0.5.0"
   }
 }

package/src/commands/i18n.js

@@ -228,10 +228,11 @@ async function loadSiteConfig(siteRoot) {
  */
 async function runExtract(siteRoot, config, args) {
   const verbose = args.includes('--verbose') || args.includes('-v')
-  const collectionsOnly = args.includes('--collections')
-  const withCollections = args.includes('--with-collections')
+  const collectionsOnly = args.includes('--collections-only') || args.includes('--collections')
+  const noCollections = args.includes('--no-collections')
+  // --with-collections is now a no-op (collections are included by default)
 
-  // Extract page content (unless --collections only)
+  // Extract page content (unless --collections-only)
   if (!collectionsOnly) {
     log(`\n${colors.cyan}Extracting translatable content...${colors.reset}\n`)
 
@@ -274,8 +275,8 @@ async function runExtract(siteRoot, config, args) {
     }
   }
 
-  // Extract collection content (if --collections or --with-collections)
-  if (collectionsOnly || withCollections) {
+  // Extract collection content (by default, skip with --no-collections)
+  if (!noCollections) {
     log(`\n${colors.cyan}Extracting collection content...${colors.reset}\n`)
 
     // Check if collections exist
@@ -1482,8 +1483,8 @@ ${colors.bright}Options:${colors.reset}
   --freeform           (status/prune) Include free-form translation status
   --json               (status) Output as JSON for translation tools
   --by-page            (status --missing) Group missing strings by page
-  --collections        (extract/status/audit) Process only collections
-  --with-collections   (extract/status/audit) Include collections with pages
+  --collections-only   (extract/status/audit) Process only collections
+  --no-collections     (extract/status/audit) Skip collections (pages only)
   --all-stale          (update-hash) Update all stale translations at once
 
 ${colors.bright}Configuration:${colors.reset}
@@ -1520,7 +1521,7 @@ ${colors.bright}Examples:${colors.reset}
   ${colors.dim}# Hash-based workflow${colors.reset}
   uniweb i18n extract              # Extract all translatable strings
   uniweb i18n extract --verbose    # Show extracted strings
-  uniweb i18n extract --with-collections  # Extract pages + collections
+  uniweb i18n extract --no-collections    # Pages only (skip collections)
   uniweb i18n init es fr           # Create starter files for Spanish and French
   uniweb i18n init --empty         # Create files with empty values (for translators)
   uniweb i18n init --force         # Overwrite existing locale files

package/src/index.js

@@ -388,6 +388,7 @@ ${colors.bright}Template Types:${colors.reset}
   single                        One site + one foundation (default)
   multi                         Multiple sites and foundations
   marketing                     Official marketing template
+  ./path/to/template            Local directory
   @scope/template-name          npm package
   github:user/repo              GitHub repository
   https://github.com/user/repo  GitHub URL
@@ -397,6 +398,7 @@ ${colors.bright}Examples:${colors.reset}
   npx uniweb create my-project --template single
   npx uniweb create my-project --template marketing
   npx uniweb create my-project --template marketing --variant tailwind3
+  npx uniweb create my-project --template ./my-template
   npx uniweb create my-project --template github:myorg/template
   npx uniweb build
   npx uniweb build --target foundation

package/src/templates/index.js

@@ -2,8 +2,10 @@
  * Template resolution and application for the CLI
  */
 
-import { rm } from 'node:fs/promises'
-import { join } from 'node:path'
+import { existsSync } from 'node:fs'
+import { readFile, rm } from 'node:fs/promises'
+import { join, resolve } from 'node:path'
+import { homedir } from 'node:os'
 
 import { parseTemplateId, getTemplateDisplayName, BUILTIN_TEMPLATES, OFFICIAL_TEMPLATES } from './resolver.js'
 import { fetchNpmTemplate } from './fetchers/npm.js'
@@ -47,6 +49,9 @@ export async function resolveTemplate(identifier, options = {}) {
     case 'github':
       return resolveGitHubTemplate(parsed, options)
 
+    case 'local':
+      return resolveLocalTemplate(parsed.path, options)
+
     default:
       throw new Error(`Unknown template type: ${parsed.type}`)
   }
@@ -118,6 +123,46 @@ async function resolveGitHubTemplate(parsed, options = {}) {
   }
 }
 
+/**
+ * Resolve a local template from a filesystem path
+ */
+async function resolveLocalTemplate(templatePath, options = {}) {
+  const { onProgress } = options
+
+  // Expand ~ to home directory
+  let resolvedPath = templatePath.startsWith('~')
+    ? templatePath.replace(/^~/, homedir())
+    : templatePath
+
+  // Resolve to absolute path
+  resolvedPath = resolve(resolvedPath)
+
+  if (!existsSync(resolvedPath)) {
+    throw new Error(`Local template not found: ${resolvedPath}`)
+  }
+
+  onProgress?.(`Using local template: ${resolvedPath}`)
+
+  // Read template.json for name
+  const metaPath = join(resolvedPath, 'template.json')
+  let name = templatePath
+  if (existsSync(metaPath)) {
+    try {
+      const meta = JSON.parse(await readFile(metaPath, 'utf-8'))
+      name = meta.name || templatePath
+    } catch {
+      // Use path as name if template.json can't be parsed
+    }
+  }
+
+  return {
+    type: 'local',
+    name,
+    path: resolvedPath,
+    cleanup: null,
+  }
+}
+
 /**
  * Apply a template to a target directory
  *

package/src/templates/resolver.js

@@ -6,7 +6,7 @@
 export const BUILTIN_TEMPLATES = ['single', 'multi']
 
 // Official templates from @uniweb/templates package (downloaded from GitHub releases)
-export const OFFICIAL_TEMPLATES = ['marketing', 'academic', 'docs', 'international']
+export const OFFICIAL_TEMPLATES = ['marketing', 'academic', 'docs', 'international', 'dynamic']
 
 /**
  * Parse a template identifier and determine its source type
@@ -70,6 +70,15 @@ export function parseTemplateId(identifier) {
     }
   }
 
+  // Local path (relative, absolute, or home directory)
+  if (identifier.startsWith('./') || identifier.startsWith('../') ||
+      identifier.startsWith('/') || identifier.startsWith('~')) {
+    return {
+      type: 'local',
+      path: identifier,
+    }
+  }
+
   // Unscoped name - assume it's an npm package with @uniweb/template- prefix
   // This allows users to type `uniweb create foo --template blog` for @uniweb/template-blog
   return {
@@ -110,6 +119,8 @@ export function getTemplateDisplayName(parsed) {
       return parsed.package
     case 'github':
       return `${parsed.owner}/${parsed.repo}${parsed.ref ? `#${parsed.ref}` : ''}`
+    case 'local':
+      return `Local: ${parsed.path}`
     default:
       return 'Unknown'
   }

package/templates/multi/foundations/default/src/{foundation.js.hbs → foundation.js}

@@ -1,5 +1,5 @@
 /**
- * {{projectName}} Default Foundation Configuration
+ * Default Foundation Configuration
  *
  * This file defines foundation-level configuration:
  * - vars: CSS custom properties that sites can override in theme.yml

package/templates/multi/foundations/default/src/sections/Section/index.jsx

@@ -90,7 +90,7 @@ export function Section({ content, params }) {
                 className={cn(
                   'inline-flex items-center px-6 py-3 font-medium rounded-lg transition-colors',
                   index === 0
-                    ? 'bg-primary text-white hover:bg-primary-dark'
+                    ? 'bg-primary-600 text-white hover:bg-primary-700'
                     : 'border border-current hover:bg-gray-100'
                 )}
               >

package/templates/multi/foundations/default/src/styles.css

@@ -1,12 +1,5 @@
 @import "tailwindcss";
+@import "@uniweb/kit/theme-tokens.css";
 
 @source "./sections/**/*.{js,jsx}";
 @source "../node_modules/@uniweb/kit/src/**/*.{js,jsx}";
-
-@theme {
-  --color-primary: #3b82f6;
-  --color-primary-light: #60a5fa;
-  --color-primary-dark: #2563eb;
-  --color-secondary: #64748b;
-  --color-accent: #8b5cf6;
-}

package/templates/single/foundation/src/{foundation.js.hbs → foundation.js}

@@ -1,5 +1,5 @@
 /**
- * {{projectName}} Foundation Configuration
+ * Foundation Configuration
  *
  * This file defines foundation-level configuration:
  * - vars: CSS custom properties that sites can override in theme.yml

package/templates/single/foundation/src/sections/Section/index.jsx

@@ -90,7 +90,7 @@ export function Section({ content, params }) {
                 className={cn(
                   'inline-flex items-center px-6 py-3 font-medium rounded-lg transition-colors',
                   index === 0
-                    ? 'bg-primary text-white hover:bg-primary-dark'
+                    ? 'bg-primary-600 text-white hover:bg-primary-700'
                     : 'border border-current hover:bg-gray-100'
                 )}
               >

package/templates/single/foundation/src/styles.css

@@ -1,12 +1,5 @@
 @import "tailwindcss";
+@import "@uniweb/kit/theme-tokens.css";
 
 @source "./sections/**/*.{js,jsx}";
 @source "../node_modules/@uniweb/kit/src/**/*.{js,jsx}";
-
-@theme {
-  --color-primary: #3b82f6;
-  --color-primary-light: #60a5fa;
-  --color-primary-dark: #2563eb;
-  --color-secondary: #64748b;
-  --color-accent: #8b5cf6;
-}

package/templates/single/site/index.html.hbs

@@ -5,15 +5,9 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{projectName}}</title>
-    <style>
-      body { margin: 0; font-family: system-ui, sans-serif; }
-      .loading { display: flex; align-items: center; justify-content: center; min-height: 100vh; color: #64748b; }
-    </style>
   </head>
   <body>
-    <div id="root">
-      <div class="loading">Loading...</div>
-    </div>
+    <div id="root"></div>
     <script type="module" src="/main.js"></script>
   </body>
 </html>