@nextsparkjs/core 0.1.0-beta.190 → 0.1.0-beta.192

package/scripts/create-theme.mjs

@@ -1,306 +1,3 @@
 #!/usr/bin/env node
-
-/**
- * Create Theme Script
- *
- * Scaffolds a new theme from the preset template.
- *
- * Usage:
- *   node scripts/create-theme.mjs <theme-name> [options]
- *   pnpm create:theme <theme-name> [options]
- *
- * Options:
- *   --description, -d    Theme description
- *   --author, -a         Theme author
- *   --display-name       Display name (defaults to capitalized theme name)
- *
- * Examples:
- *   pnpm create:theme my-app
- *   pnpm create:theme e-commerce --description "E-commerce platform" --author "John Doe"
- *   pnpm create:theme dashboard --display-name "Admin Dashboard"
- */
-
-import fs from 'fs'
-import path from 'path'
-import { fileURLToPath } from 'url'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-// =============================================================================
-// CONFIGURATION
-// =============================================================================
-
-const ROOT_DIR = path.resolve(__dirname, '..')
-const PRESET_DIR = path.join(ROOT_DIR, 'core', 'presets', 'theme')
-const THEMES_DIR = path.join(ROOT_DIR, 'contents', 'themes')
-
-// Files/patterns to process for placeholder replacement
-// Note: .ts.template files will have the .template extension removed during copy
-const FILES_TO_PROCESS = [
-  'theme.config.ts.template',
-  'app.config.ts.template',
-  'dashboard.config.ts.template',
-  'about.md',
-  'permissions.config.ts.template',
-  'messages/en.json',
-  'messages/es.json',
-  'docs/01-overview/01-introduction.md',
-  'docs/01-overview/02-customization.md',
-  'migrations/README.md',
-  'migrations/001_example_schema.sql',
-]
-
-// Directories that should NOT copy .gitkeep files (they have real content now)
-const SKIP_GITKEEP_IN = ['entities', 'blocks', 'templates', 'public', 'tests', 'docs', 'migrations']
-
-// =============================================================================
-// HELPERS
-// =============================================================================
-
-/**
- * Parse command line arguments
- */
-function parseArgs(args) {
-  const result = {
-    themeName: null,
-    description: 'A custom theme',
-    author: 'Your Name',
-    displayName: null,
-  }
-
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i]
-
-    if (arg.startsWith('--')) {
-      const key = arg.slice(2)
-      const value = args[++i]
-
-      switch (key) {
-        case 'description':
-        case 'd':
-          result.description = value
-          break
-        case 'author':
-        case 'a':
-          result.author = value
-          break
-        case 'display-name':
-          result.displayName = value
-          break
-      }
-    } else if (arg.startsWith('-')) {
-      const key = arg.slice(1)
-      const value = args[++i]
-
-      switch (key) {
-        case 'd':
-          result.description = value
-          break
-        case 'a':
-          result.author = value
-          break
-      }
-    } else if (!result.themeName) {
-      result.themeName = arg
-    }
-  }
-
-  return result
-}
-
-/**
- * Convert theme name to different formats
- */
-function formatThemeName(name) {
-  // Slug: lowercase, hyphenated
-  const slug = name
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/^-|-$/g, '')
-
-  // Display name: Title Case
-  const displayName = slug
-    .split('-')
-    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-    .join(' ')
-
-  // Variable name: camelCase
-  const varName = slug
-    .split('-')
-    .map((word, i) => (i === 0 ? word : word.charAt(0).toUpperCase() + word.slice(1)))
-    .join('')
-
-  return { slug, displayName, varName }
-}
-
-/**
- * Replace placeholders in content
- */
-function replacePlaceholders(content, replacements) {
-  let result = content
-
-  for (const [placeholder, value] of Object.entries(replacements)) {
-    const regex = new RegExp(`\\{\\{${placeholder}\\}\\}`, 'g')
-    result = result.replace(regex, value)
-  }
-
-  return result
-}
-
-/**
- * Copy directory recursively
- */
-function copyDir(src, dest, replacements) {
-  if (!fs.existsSync(dest)) {
-    fs.mkdirSync(dest, { recursive: true })
-  }
-
-  const entries = fs.readdirSync(src, { withFileTypes: true })
-
-  for (const entry of entries) {
-    const srcPath = path.join(src, entry.name)
-    const destPath = path.join(dest, entry.name)
-
-    if (entry.isDirectory()) {
-      // Always copy directories recursively (they now have real content)
-      copyDir(srcPath, destPath, replacements)
-    } else {
-      // Skip .gitkeep files in directories that have real content
-      if (entry.name === '.gitkeep') {
-        const parentDir = path.relative(PRESET_DIR, src)
-        if (SKIP_GITKEEP_IN.some((dir) => parentDir.startsWith(dir) || parentDir === dir)) {
-          continue
-        }
-      }
-
-      const relativePath = path.relative(PRESET_DIR, srcPath)
-
-      // Process files that need placeholder replacement
-      if (FILES_TO_PROCESS.includes(relativePath)) {
-        const content = fs.readFileSync(srcPath, 'utf-8')
-        const processed = replacePlaceholders(content, replacements)
-        // Remove .template extension from destination path
-        const finalDestPath = destPath.endsWith('.template')
-          ? destPath.slice(0, -'.template'.length)
-          : destPath
-        fs.writeFileSync(finalDestPath, processed)
-      } else if (entry.name.endsWith('.template')) {
-        // Skip .template files that aren't in FILES_TO_PROCESS
-        continue
-      } else {
-        // Copy as-is
-        fs.copyFileSync(srcPath, destPath)
-      }
-    }
-  }
-}
-
-/**
- * Print usage help
- */
-function printHelp() {
-  console.log(`
-\x1b[1mCreate Theme Script\x1b[0m
-
-Scaffolds a new theme from the preset template.
-
-\x1b[1mUsage:\x1b[0m
-  pnpm create:theme <theme-name> [options]
-
-\x1b[1mOptions:\x1b[0m
-  --description, -d    Theme description (default: "A custom theme")
-  --author, -a         Theme author (default: "Your Name")
-  --display-name       Display name (default: capitalized theme name)
-
-\x1b[1mExamples:\x1b[0m
-  pnpm create:theme my-app
-  pnpm create:theme e-commerce --description "E-commerce platform" --author "John Doe"
-  pnpm create:theme dashboard --display-name "Admin Dashboard"
-
-\x1b[1mOutput:\x1b[0m
-  Creates a new theme directory at: contents/themes/<theme-name>/
-`)
-}
-
-// =============================================================================
-// MAIN
-// =============================================================================
-
-function main() {
-  const args = process.argv.slice(2)
-
-  // Show help if no arguments or --help
-  if (args.length === 0 || args.includes('--help') || args.includes('-h')) {
-    printHelp()
-    process.exit(0)
-  }
-
-  // Parse arguments
-  const options = parseArgs(args)
-
-  if (!options.themeName) {
-    console.error('\x1b[31mError: Theme name is required\x1b[0m')
-    printHelp()
-    process.exit(1)
-  }
-
-  // Format theme name
-  const { slug, displayName, varName } = formatThemeName(options.themeName)
-  const finalDisplayName = options.displayName || displayName
-
-  // Check if theme already exists
-  const themeDir = path.join(THEMES_DIR, slug)
-  if (fs.existsSync(themeDir)) {
-    console.error(`\x1b[31mError: Theme "${slug}" already exists at ${themeDir}\x1b[0m`)
-    process.exit(1)
-  }
-
-  // Check if preset exists
-  if (!fs.existsSync(PRESET_DIR)) {
-    console.error(`\x1b[31mError: Preset directory not found at ${PRESET_DIR}\x1b[0m`)
-    process.exit(1)
-  }
-
-  // Prepare replacements
-  const currentDate = new Date().toISOString().split('T')[0] // YYYY-MM-DD
-  const replacements = {
-    THEME_SLUG: slug,
-    THEME_DISPLAY_NAME: finalDisplayName,
-    THEME_VAR_NAME: varName,
-    THEME_DESCRIPTION: options.description,
-    THEME_AUTHOR: options.author,
-    THEME_VERSION: '1.0.0',
-    CURRENT_DATE: currentDate,
-  }
-
-  console.log('\n\x1b[1m📦 Creating new theme...\x1b[0m\n')
-  console.log(`  Name:        \x1b[36m${slug}\x1b[0m`)
-  console.log(`  Display:     \x1b[36m${finalDisplayName}\x1b[0m`)
-  console.log(`  Description: \x1b[36m${options.description}\x1b[0m`)
-  console.log(`  Author:      \x1b[36m${options.author}\x1b[0m`)
-  console.log(`  Location:    \x1b[36m${themeDir}\x1b[0m\n`)
-
-  // Copy preset to themes directory
-  try {
-    copyDir(PRESET_DIR, themeDir, replacements)
-
-    console.log('\x1b[32m✓ Theme created successfully!\x1b[0m\n')
-    console.log('\x1b[1mNext steps:\x1b[0m')
-    console.log(`  1. Edit \x1b[33mcontents/themes/${slug}/theme.config.ts\x1b[0m to customize colors`)
-    console.log(`  2. Edit \x1b[33mcontents/themes/${slug}/app.config.ts\x1b[0m for app settings`)
-    console.log(`  3. Update \x1b[33m.env.local\x1b[0m with: NEXT_PUBLIC_ACTIVE_THEME='${slug}'`)
-    console.log(`  4. Run \x1b[33mpnpm dev\x1b[0m to see your theme\n`)
-
-    console.log('\x1b[1mOptional:\x1b[0m')
-    console.log(`  • Add entities in \x1b[33mentities/\x1b[0m`)
-    console.log(`  • Add page builder blocks in \x1b[33mblocks/\x1b[0m`)
-    console.log(`  • Add brand assets in \x1b[33mpublic/brand/\x1b[0m`)
-    console.log(`  • Override templates in \x1b[33mtemplates/\x1b[0m\n`)
-  } catch (error) {
-    console.error(`\x1b[31mError creating theme: ${error.message}\x1b[0m`)
-    process.exit(1)
-  }
-}
-
-main()
+console.error('Themes are install-once project templates in root-first NextSpark. Create a project with the desired template instead of adding a theme directory.')
+process.exit(1)

package/scripts/db/run-migrations.mjs

@@ -1,23 +1,16 @@
 import fs from "fs";
 import path from "path";
-import { fileURLToPath } from 'url';
 import { migrationTimeLimit, migrationClient, ignoredParametersNotice, runMigrationSql, recordMigration, migrationFailure } from './migration-time-limit.mjs';
+import { getConfig } from '../build/registry/config.mjs';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-// Project root is where the user runs the command (process.cwd())
-// Package root is where @nextsparkjs/core is installed (relative to this script)
-const projectRoot = process.cwd();
-const packageRoot = path.join(__dirname, '..', '..'); // scripts/db/ -> core/
-
-// Legacy: support old monorepo structure
-const isMonorepoMode = fs.existsSync(path.join(projectRoot, 'packages', 'core'));
-const rootDir = projectRoot; // For backward compatibility with code below
+const projectConfig = getConfig();
+const projectRoot = projectConfig.projectRoot;
+const packageRoot = projectConfig.coreDir;
+const PROJECT_NAME = projectConfig.projectName;
 
 // Read environment variables: prefer .env file if it exists, fallback to process.env (e.g. Vercel/CI).
-// `--no-env-file` skips the .env file, so the connection and theme come only from the
-// environment this process was started with (db:verify-theme runs it that way).
+// `--no-env-file` skips the .env file, so the connection comes only from the
+// environment this process was started with (the template verifier uses it that way).
 const envPath = path.join(projectRoot, '.env');
 const readEnvFile = !process.argv.includes('--no-env-file');
 
@@ -27,7 +20,6 @@ let DATABASE_URL = process.env.DATABASE_URL ?? null;
 // credential for migrations is provided separately via MIGRATE_DATABASE_URL.
 // Falls back to DATABASE_URL when unset (pre-cutover: same owner connection).
 let MIGRATE_DATABASE_URL = process.env.MIGRATE_DATABASE_URL ?? null;
-let ACTIVE_THEME = process.env.NEXT_PUBLIC_ACTIVE_THEME ?? null;
 let MIGRATION_TIMEOUT_SECONDS = process.env.MIGRATION_TIMEOUT_SECONDS;
 
 if (readEnvFile && fs.existsSync(envPath)) {
@@ -45,9 +37,6 @@ if (readEnvFile && fs.existsSync(envPath)) {
       if (key?.trim() === 'MIGRATE_DATABASE_URL' && valueParts.length > 0) {
         MIGRATE_DATABASE_URL = value;
       }
-      if (key?.trim() === 'NEXT_PUBLIC_ACTIVE_THEME' && valueParts.length > 0) {
-        ACTIVE_THEME = value;
-      }
       if (key?.trim() === 'MIGRATION_TIMEOUT_SECONDS' && valueParts.length > 0) {
         MIGRATION_TIMEOUT_SECONDS = value;
       }
@@ -63,11 +52,6 @@ if (!DATABASE_URL) {
 // The URL used for the actual migration connection (owner credential).
 const MIGRATION_URL = MIGRATE_DATABASE_URL || DATABASE_URL;
 
-if (!ACTIVE_THEME) {
-  console.error("❌ NEXT_PUBLIC_ACTIVE_THEME not found in environment variables");
-  process.exit(1);
-}
-
 // How long each migration may run, when MIGRATION_TIMEOUT_SECONDS asks for a limit
 // (see migration-time-limit.mjs). Without it, a migration runs for as long as it takes.
 let TIME_LIMIT;
@@ -98,9 +82,7 @@ async function runMigrations() {
     `);
     
     // Get list of migration files (from package, not project root)
-    const migrationsDir = isMonorepoMode
-      ? path.join(projectRoot, 'packages', 'core', 'migrations')
-      : path.join(packageRoot, 'migrations');
+    const migrationsDir = path.join(packageRoot, 'migrations');
     const files = fs.readdirSync(migrationsDir)
       .filter(f => f.endsWith('.sql'))
       .sort();
@@ -154,47 +136,9 @@ async function runMigrations() {
   }
 }
 
-// Get active plugins from theme config
+// Read enabled local plugins from nextspark.config.ts.
 async function getActivePlugins() {
-  try {
-    // Determine contents directory based on mode
-    const contentsDir = isMonorepoMode
-      ? path.join(projectRoot, 'apps', 'dev', 'contents')
-      : path.join(projectRoot, 'contents');
-
-    // Try both locations: config/theme.config.ts (new) and theme.config.ts (legacy)
-    let themeConfigPath = path.join(contentsDir, 'themes', ACTIVE_THEME, 'config', 'theme.config.ts');
-
-    if (!fs.existsSync(themeConfigPath)) {
-      // Fallback to legacy location
-      themeConfigPath = path.join(contentsDir, 'themes', ACTIVE_THEME, 'theme.config.ts');
-    }
-
-    if (!fs.existsSync(themeConfigPath)) {
-      console.warn(`⚠️  Theme config not found in either config/theme.config.ts or theme.config.ts`);
-      return [];
-    }
-
-    // Read and parse theme config
-    const configContent = fs.readFileSync(themeConfigPath, 'utf8');
-    const pluginsMatch = configContent.match(/plugins:\s*\[([^\]]*)\]/);
-
-    if (!pluginsMatch) {
-      console.warn(`⚠️  No plugins found in theme config`);
-      return [];
-    }
-
-    const pluginsStr = pluginsMatch[1];
-    const plugins = pluginsStr
-      .split(',')
-      .map(p => p.trim().replace(/['"`]/g, ''))
-      .filter(Boolean);
-
-    return plugins;
-  } catch (error) {
-    console.error(`❌ Error reading theme config:`, error.message);
-    return [];
-  }
+  return projectConfig.plugins;
 }
 
 // Run content-level migrations (theme/plugin root-level, not entity-specific)
@@ -386,7 +330,7 @@ async function runEntityMigrations() {
   try {
     await client.connect();
     console.log("🔄 Running content & entity migrations (sample_data deferred)...\n");
-    console.log(`📌 Active theme: ${ACTIVE_THEME}\n`);
+    console.log(`📌 Project: ${PROJECT_NAME}\n`);
 
     // Create tracking tables
     await client.query(`
@@ -460,34 +404,28 @@ async function runEntityMigrations() {
     const allContentMigrations = [];
     const allEntityMigrations = [];
 
-    // Determine contents directory based on mode
-    const contentsDir = isMonorepoMode
-      ? path.join(projectRoot, 'apps', 'dev', 'contents')
-      : path.join(projectRoot, 'contents');
-
-    // Collect theme-level migrations
-    const themeMigrationsDir = path.join(contentsDir, 'themes', ACTIVE_THEME, 'migrations');
-    allContentMigrations.push(...collectContentMigrations(themeMigrationsDir, 'theme', ACTIVE_THEME));
+    const projectMigrationsDir = path.join(projectRoot, 'migrations');
+    allContentMigrations.push(...collectContentMigrations(projectMigrationsDir, 'project', PROJECT_NAME));
 
-    // Collect theme entity migrations
-    const themeEntitiesDir = path.join(contentsDir, 'themes', ACTIVE_THEME, 'entities');
-    allEntityMigrations.push(...collectEntityMigrations(themeEntitiesDir, 'theme', ACTIVE_THEME));
+    // Collect project entity migrations
+    const projectEntitiesDir = path.join(projectRoot, 'entities');
+    allEntityMigrations.push(...collectEntityMigrations(projectEntitiesDir, 'project', PROJECT_NAME));
 
-    // Collect theme settings migrations (settings/<area>/migrations/)
-    const themeSettingsDir = path.join(contentsDir, 'themes', ACTIVE_THEME, 'settings');
-    if (fs.existsSync(themeSettingsDir)) {
-      const settingAreas = fs.readdirSync(themeSettingsDir, { withFileTypes: true })
+    // Collect project settings migrations (settings/<area>/migrations/)
+    const projectSettingsDir = path.join(projectRoot, 'settings');
+    if (fs.existsSync(projectSettingsDir)) {
+      const settingAreas = fs.readdirSync(projectSettingsDir, { withFileTypes: true })
         .filter(e => e.isDirectory()).map(e => e.name);
       for (const area of settingAreas) {
-        const settingsMigrationsDir = path.join(themeSettingsDir, area, 'migrations');
+        const settingsMigrationsDir = path.join(projectSettingsDir, area, 'migrations');
         allContentMigrations.push(...collectContentMigrations(
-          settingsMigrationsDir, 'theme-settings', `${ACTIVE_THEME}/settings/${area}`
+          settingsMigrationsDir, 'project-settings', `${PROJECT_NAME}/settings/${area}`
         ));
       }
     }
 
     // Collect plugin migrations
-    const pluginsDir = path.join(contentsDir, 'plugins');
+    const pluginsDir = path.join(projectRoot, 'plugins');
     if (fs.existsSync(pluginsDir) && activePlugins.length > 0) {
       for (const pluginName of activePlugins) {
         const pluginDir = path.join(pluginsDir, pluginName);
@@ -792,4 +730,4 @@ async function runAllMigrations() {
 }
 
 // Run all migrations
-runAllMigrations();
+runAllMigrations();

package/scripts/db/theme-location.mjs

@@ -1,23 +1,9 @@
-// Where db:verify-theme finds a theme, and the directory run-migrations.mjs has
-// to run in to migrate it.
-//
-// run-migrations.mjs reads the active theme from `<cwd>/contents/themes/<theme>`.
-// The monorepo's themes reach it through apps/dev/contents, which links to
-// themes/. The starter a generated project ships is not among them: it lives in
-// packages/core/templates/contents/themes/starter, and themes/starter holds only
-// its tests. packages/core/templates has the same contents/ layout a generated
-// project has, so the runner reads the starter from there.
+// Root-first project/template lookup used only by the repository migration-verification harness.
+// The migration runner itself always reads the project in its cwd and never selects a theme.
 
 import fs from 'fs';
 import path from 'path';
 
-/** The directories the runner can run in, each with its own contents/themes. */
-export const THEME_PROJECTS = ['apps/dev', 'packages/core/templates'];
-
-// The runner reads a theme's plugins from one of these; a directory with
-// neither is not a theme, and migrating it migrates core alone.
-const THEME_CONFIGS = ['config/theme.config.ts', 'theme.config.ts'];
-
 const SKIP_DIRS = new Set(['node_modules', '.next', 'dist']);
 
 /** Every .sql file inside a `migrations` directory under `dir`, at any depth. */
@@ -35,35 +21,28 @@ export function migrationFiles(dir, insideMigrations = false, found = []) {
   return found;
 }
 
-/**
- * The theme called `theme`: its directory, the directory to run the runner in,
- * and the migration files it holds. `{ error }` when there is no such theme,
- * when the name is a theme in more than one place, or when it has no
- * migrations, since a run over none of them proves nothing about it.
- */
-export function findTheme(repoRoot, theme) {
-  const candidates = THEME_PROJECTS.map(project => ({
-    projectDir: path.join(repoRoot, project),
-    themeDir: path.join(repoRoot, project, 'contents', 'themes', theme),
-  }));
-  // A theme reached through a link is shown where it really lives: themes/blog, not apps/dev/contents/themes/blog.
-  const shown = dir =>
-    fs.existsSync(dir) ? path.relative(fs.realpathSync(repoRoot), fs.realpathSync(dir)) : path.relative(repoRoot, dir);
-  const found = candidates.filter(({ themeDir }) => THEME_CONFIGS.some(config => fs.existsSync(path.join(themeDir, config))));
+function configuredName(projectDir) {
+  const config = path.join(projectDir, 'config/theme.config.ts');
+  if (!fs.existsSync(config)) return null;
+  return fs.readFileSync(config, 'utf8').match(/\bname:\s*['"]([^'"]+)['"]/)?.[1] ?? null;
+}
 
-  if (found.length === 0) {
-    return {
-      error: `no theme "${theme}": none of ${candidates.map(({ themeDir }) => shown(themeDir)).join(', ')} has a theme config`,
-    };
-  }
-  if (found.length > 1) {
-    return { error: `"${theme}" is a theme in more than one place: ${found.map(({ themeDir }) => shown(themeDir)).join(', ')}` };
+/** Locate apps/dev or one core-owned install-once project template by catalog name. */
+export function findTheme(repoRoot, name) {
+  const devDir = path.join(repoRoot, 'apps/dev');
+  const templateDir = path.join(repoRoot, 'packages/core/templates/projects', name);
+  const candidates = [];
+  if (configuredName(devDir) === name) candidates.push({ projectDir: devDir, sourceDir: devDir, kind: 'project' });
+  if (configuredName(templateDir) === name) candidates.push({ projectDir: templateDir, sourceDir: templateDir, kind: 'template' });
+
+  const shown = dir => path.relative(repoRoot, dir);
+  if (candidates.length === 0) return { error: `no root-first project or project template named "${name}"` };
+  if (candidates.length > 1) {
+    return { error: `"${name}" exists as more than one project source: ${candidates.map(({ sourceDir }) => shown(sourceDir)).join(', ')}` };
   }
 
-  const [{ projectDir, themeDir }] = found;
-  const migrations = migrationFiles(themeDir);
-  if (migrations.length === 0) {
-    return { error: `theme "${theme}" at ${shown(themeDir)} has no migrations to verify` };
-  }
-  return { projectDir, themeDir, shownDir: shown(themeDir), migrations };
+  const [found] = candidates;
+  const migrations = migrationFiles(found.sourceDir);
+  if (migrations.length === 0) return { error: `${found.kind} "${name}" at ${shown(found.sourceDir)} has no migrations to verify` };
+  return { ...found, themeDir: found.sourceDir, shownDir: shown(found.sourceDir), migrations };
 }

package/scripts/db/verify-theme-migrations.mjs

@@ -25,9 +25,8 @@
 // URL carries the password. The output names only the host and the database.
 //
 // The migrations run through run-migrations.mjs, the same script
-// `pnpm db:migrate` uses, with `--no-env-file` and the theme and database in
-// its environment. No file is read or written for that: no .env is touched,
-// even if this process is killed mid-run.
+// `pnpm db:migrate` uses. Templates are first extracted into a clean temporary
+// root-first project; apps/dev already is one. No .env is read or written.
 //
 // MIGRATE_DATABASE_URL is removed from the child's environment because
 // run-migrations.mjs connects to it in preference to DATABASE_URL, which
@@ -39,6 +38,8 @@
 // ended, instead of leaving the command waiting.
 
 import path from 'path';
+import fs from 'fs';
+import os from 'os';
 import { fileURLToPath } from 'url';
 import { spawnSync } from 'child_process';
 import { GLOBAL_OBJECTS, inspectCluster } from './cluster-changes.mjs';
@@ -146,16 +147,26 @@ async function main() {
 
   const { MIGRATE_DATABASE_URL: _migrateUrl, VERIFY_THEME_DATABASE_URL: _verifyUrl, ...inheritedEnv } = process.env;
 
+  let runDir = located.projectDir;
+  let extracted = null;
+  if (located.kind === 'template') {
+    extracted = fs.mkdtempSync(path.join(os.tmpdir(), `nextspark-template-${theme}-`));
+    fs.cpSync(located.sourceDir, extracted, { recursive: true });
+    fs.writeFileSync(path.join(extracted, 'nextspark.config.ts'), `export default { plugins: [], template: { name: ${JSON.stringify(theme)}, version: 'test' } }\n`);
+    fs.writeFileSync(path.join(extracted, 'package.json'), JSON.stringify({ name: `nextspark-template-${theme}`, private: true, dependencies: { next: '16.3.5' } }, null, 2));
+    runDir = extracted;
+  }
+
   const result = spawnSync(process.execPath, [runnerPath, '--no-env-file'], {
-    cwd: located.projectDir,
+    cwd: runDir,
     stdio: 'inherit',
     env: {
       ...inheritedEnv,
       DATABASE_URL: databaseUrl,
-      NEXT_PUBLIC_ACTIVE_THEME: theme,
       [TIME_LIMIT_VARIABLE]: timeLimitSetting,
     },
   });
+  if (extracted) fs.rmSync(extracted, { recursive: true, force: true });
 
   if (result.status !== 0) {
     const reason = result.signal ? `signal ${result.signal}` : `exit code ${result.status}`;

package/scripts/deploy/vercel-deploy.mjs

@@ -150,18 +150,16 @@ function readDeploymentConfig() {
     process.exit(1)
   }
 
-  // Extract VERCEL_PROJECT (optional - falls back to theme name)
+  // Extract VERCEL_PROJECT (optional - falls back to package name)
   const projectMatch = envContent.match(/^VERCEL_PROJECT\s*=\s*['"]?([^'"\n]+)['"]?/m)
-
-  // Extract NEXT_PUBLIC_ACTIVE_THEME (fallback if VERCEL_PROJECT not set)
-  const themeMatch = envContent.match(/^NEXT_PUBLIC_ACTIVE_THEME\s*=\s*['"]?([^'"\n]+)['"]?/m)
-
-  // Use VERCEL_PROJECT if available, otherwise fallback to theme
-  const project = projectMatch ? projectMatch[1].trim() : (themeMatch ? themeMatch[1].trim() : null)
+  let packageName = null
+  try {
+    packageName = JSON.parse(readFileSync(join(projectRoot, 'package.json'), 'utf8')).name
+  } catch {}
+  const project = projectMatch ? projectMatch[1].trim() : packageName?.replace(/^@[^/]+\//, '')
 
   if (!project) {
-    console.error('❌ Error: Neither VERCEL_PROJECT nor NEXT_PUBLIC_ACTIVE_THEME found in .env')
-    console.error('   At least one is required to determine the Vercel project name')
+    console.error('❌ Error: VERCEL_PROJECT is absent and package.json has no project name')
     console.error('   Add to .env: VERCEL_PROJECT=your-project-name')
     process.exit(1)
   }
@@ -780,7 +778,7 @@ function sanitizeDebugVariables(vars, target, explicitOverrides = {}) {
 }
 
 function findPluginEnvFiles() {
-  const pluginsDir = join(projectRoot, 'contents/plugins')
+  const pluginsDir = join(projectRoot, 'plugins')
   const pluginEnvFiles = []
 
   if (!existsSync(pluginsDir)) return pluginEnvFiles