@nextsparkjs/core 0.1.0-beta.104 → 0.1.0-beta.106

package/dist/templates/app/dashboard/settings/api-keys/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonApiKeysPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function ApiKeysLoading() {
+function ApiKeysLoading() {
   return <SkeletonApiKeysPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/api-keys/loading.tsx', ApiKeysLoading)

package/dist/templates/app/dashboard/settings/billing/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonBillingPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function BillingLoading() {
+function BillingLoading() {
   return <SkeletonBillingPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/billing/loading.tsx', BillingLoading)

package/dist/templates/app/dashboard/settings/invoices/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonInvoicesPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function InvoicesLoading() {
+function InvoicesLoading() {
   return <SkeletonInvoicesPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/invoices/loading.tsx', InvoicesLoading)

package/dist/templates/app/dashboard/settings/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonSettingsOverview } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function SettingsLoading() {
+function SettingsLoading() {
   return <SkeletonSettingsOverview />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/loading.tsx', SettingsLoading)

package/dist/templates/app/dashboard/settings/notifications/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonNotificationsPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function NotificationsLoading() {
+function NotificationsLoading() {
   return <SkeletonNotificationsPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/notifications/loading.tsx', NotificationsLoading)

package/dist/templates/app/dashboard/settings/page.tsx

@@ -14,6 +14,7 @@ import {
   Key,
   type LucideIcon
 } from 'lucide-react'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
 // Icon mapping for settings pages
 const SETTINGS_ICONS: Record<string, LucideIcon> = {
@@ -89,4 +90,4 @@ function SettingsPage() {
   )
 }
 
-export default SettingsPage
+export default getTemplateOrDefaultClient('app/dashboard/settings/page.tsx', SettingsPage)

package/dist/templates/app/dashboard/settings/password/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonPasswordPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function PasswordLoading() {
+function PasswordLoading() {
   return <SkeletonPasswordPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/password/loading.tsx', PasswordLoading)

package/dist/templates/app/dashboard/settings/plans/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonPlansPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function PlansLoading() {
+function PlansLoading() {
   return <SkeletonPlansPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/plans/loading.tsx', PlansLoading)

package/dist/templates/app/dashboard/settings/profile/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonProfileForm } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function ProfileLoading() {
+function ProfileLoading() {
   return <SkeletonProfileForm />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/profile/loading.tsx', ProfileLoading)

package/dist/templates/app/dashboard/settings/security/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonSecurityPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function SecurityLoading() {
+function SecurityLoading() {
   return <SkeletonSecurityPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/security/loading.tsx', SecurityLoading)

package/dist/templates/app/dashboard/settings/teams/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonTeamsPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function TeamsLoading() {
+function TeamsLoading() {
   return <SkeletonTeamsPage />
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/teams/loading.tsx', TeamsLoading)

package/dist/templates/app/dashboard/settings/teams/permissions/page.tsx

@@ -4,6 +4,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@nextsparkjs/core/comp
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextsparkjs/core/components/ui/card'
 // Use PermissionService which reads from the build-time generated registry
 import { PermissionService } from '@nextsparkjs/core/lib/services/permission.service'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
 /**
  * Team Permissions Page
@@ -11,7 +12,7 @@ import { PermissionService } from '@nextsparkjs/core/lib/services/permission.ser
  * Displays a visual permissions matrix showing what each team role can do.
  * Organized by categories with tabs for easy navigation.
  */
-export default function TeamPermissionsPage() {
+function TeamPermissionsPage() {
   const t = useTranslations('permissions')
 
   // Get all unique categories from registry
@@ -90,3 +91,5 @@ function RoleCard({ role }: { role: 'owner' | 'admin' | 'member' | 'viewer' }) {
     </div>
   )
 }
+
+export default getTemplateOrDefault('app/dashboard/settings/teams/permissions/page.tsx', TeamPermissionsPage)

package/dist/templates/contents/themes/starter/messages/de/navigation.json

@@ -12,5 +12,6 @@
   "notifications": "Benachrichtigungen",
   "search": "Suchen",
   "quickCreate": "Schnellerstellung",
+  "quickCreateNew": "Neu: {entity}",
   "viewAll": "Alle anzeigen"
 }

package/dist/templates/contents/themes/starter/messages/en/navigation.json

@@ -12,5 +12,6 @@
   "notifications": "Notifications",
   "search": "Search",
   "quickCreate": "Quick Create",
+  "quickCreateNew": "Create new {entity}",
   "viewAll": "View All"
 }

package/dist/templates/contents/themes/starter/messages/es/navigation.json

@@ -12,5 +12,6 @@
   "notifications": "Notificaciones",
   "search": "Buscar",
   "quickCreate": "Crear rápido",
+  "quickCreateNew": "Nuevo {entity}",
   "viewAll": "Ver todo"
 }

package/dist/templates/contents/themes/starter/messages/fr/navigation.json

@@ -12,5 +12,6 @@
   "notifications": "Notifications",
   "search": "Rechercher",
   "quickCreate": "Création rapide",
+  "quickCreateNew": "Nouveau {entity}",
   "viewAll": "Voir tout"
 }

package/dist/templates/contents/themes/starter/messages/it/navigation.json

@@ -12,5 +12,6 @@
   "notifications": "Notifiche",
   "search": "Cerca",
   "quickCreate": "Creazione Rapida",
+  "quickCreateNew": "Nuovo {entity}",
   "viewAll": "Vedi Tutto"
 }

package/dist/templates/contents/themes/starter/messages/pt/navigation.json

@@ -12,5 +12,6 @@
   "notifications": "Notificações",
   "search": "Pesquisar",
   "quickCreate": "Criação Rápida",
+  "quickCreateNew": "Novo {entity}",
   "viewAll": "Ver Tudo"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextsparkjs/core",
-  "version": "0.1.0-beta.104",
+  "version": "0.1.0-beta.106",
   "description": "NextSpark - The complete SaaS framework for Next.js",
   "license": "MIT",
   "author": "NextSpark <hello@nextspark.dev>",
@@ -453,7 +453,7 @@
     "tailwind-merge": "^3.3.1",
     "uuid": "^13.0.0",
     "zod": "^4.1.5",
-    "@nextsparkjs/testing": "0.1.0-beta.104"
+    "@nextsparkjs/testing": "0.1.0-beta.106"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.mjs || true",

package/scripts/build/registry/generators/entity-registry.mjs

@@ -212,7 +212,15 @@ export function generateEntityRegistryClient(entities, config) {
     return `      '${slug}': '${entity.name}'`
   }).join(',\n')
 
-  return `/**
+  // Generate icon registration calls
+  const iconRegistrations = entities
+    .filter(entity => entity.exportName)
+    .map(entity => `registerEntityIcon('${entity.name}', ${entity.exportName}.icon)`)
+    .join('\n')
+
+  return `'use client'
+
+/**
  * Client-Safe Entity Registry
  *
  * Generated at: ${new Date().toISOString()}
@@ -226,6 +234,10 @@ export function generateEntityRegistryClient(entities, config) {
  */
 
 ${imports}
+import { registerEntityIcon } from '${convertCorePath('@/core/lib/entities/registry.client', outputFilePath, config)}'
+
+// Pre-register entity icons so non-lucide icons survive server→client serialization
+${iconRegistrations}
 
 export interface ClientEntityConfig {
   name: string

package/scripts/build/registry/generators/template-registry.mjs

@@ -171,9 +171,16 @@ async function hasServerOnlyExports(filePath) {
       /export\s+const\s+dynamic\s*=/,
       /export\s+const\s+fetchCache\s*=/,
       /export\s+const\s+runtime\s*=/,
+      /export\s+const\s+metadata\s*[=:]/,
     ]
 
-    for (const pattern of [...serverFunctionExports, ...serverConstExports]) {
+    // Check for server-only module imports
+    const serverOnlyImports = [
+      /import\s+.*from\s+['"]next\/headers['"]/,
+      /import\s+.*from\s+['"]server-only['"]/,
+    ]
+
+    for (const pattern of [...serverFunctionExports, ...serverConstExports, ...serverOnlyImports]) {
       if (pattern.test(content)) {
         return true
       }
@@ -215,7 +222,7 @@ export async function generateTemplateRegistryClient(templates, config) {
     .filter(([appPath, pathTemplates]) => {
       const template = pathTemplates[0]
       // Only include page templates (not layouts) that can override components
-      return template.templateType === 'page' && canOverrideComponent(appPath)
+      return (template.templateType === 'page' || template.templateType === 'layout') && canOverrideComponent(appPath)
     })
     .map(async ([appPath, pathTemplates]) => {
       const template = pathTemplates[0]

package/templates/app/(auth)/accept-invite/[token]/page.tsx

@@ -9,6 +9,7 @@ import { Loader2, CheckCircle, XCircle, Users, LogIn, UserPlus } from 'lucide-re
 import { toast } from 'sonner'
 import Link from 'next/link'
 import { sel } from '@nextsparkjs/core/selectors'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
 type InvitationStatus = 'loading' | 'valid' | 'accepting' | 'accepted' | 'error' | 'expired' | 'not_found' | 'email_mismatch' | 'already_member' | 'requires_auth'
 
@@ -19,7 +20,7 @@ interface InvitationInfo {
   email: string
 }
 
-export default function AcceptInvitePage() {
+function AcceptInvitePage() {
   const params = useParams()
   const router = useRouter()
   const { user, isLoading: authLoading } = useAuth()
@@ -333,3 +334,5 @@ export default function AcceptInvitePage() {
     </div>
   )
 }
+
+export default getTemplateOrDefaultClient('app/(auth)/accept-invite/[token]/page.tsx', AcceptInvitePage)

package/templates/app/(auth)/signup/page.tsx

@@ -40,4 +40,4 @@ async function SignupPage() {
 
 export const dynamic = 'force-dynamic'
 
-export default getTemplateOrDefault('app/(auth)/signup/page.tsx', SignupPage)
+export default getTemplateOrDefault('app/(auth)/signup/page.tsx', SignupPage)

package/templates/app/api/auth/[...all]/route.ts

@@ -1,8 +1,10 @@
 import { auth } from "@nextsparkjs/core/lib/auth";
 import { toNextJsHandler } from "better-auth/next-js";
 import { NextRequest, NextResponse } from "next/server";
-import { TEAMS_CONFIG } from "@nextsparkjs/core/lib/config";
+import { TEAMS_CONFIG, AUTH_CONFIG } from "@nextsparkjs/core/lib/config";
 import { isPublicSignupRestricted } from "@nextsparkjs/core/lib/teams/helpers";
+// Registration helpers available if needed: shouldBlockSignup, isDomainAllowed
+// Currently domain validation happens in auth.ts databaseHooks
 import { TeamService } from "@nextsparkjs/core/lib/services";
 import { wrapAuthHandlerWithCors, handleCorsPreflightRequest, addCorsHeaders } from "@nextsparkjs/core/lib/api/helpers";
 
@@ -41,25 +43,52 @@ export async function GET(req: NextRequest, context: { params: Promise<{ all: st
   return wrapAuthHandlerWithCors(() => handlers.GET(req), req);
 }
 
-// Intercept signup requests to validate single-tenant mode
+// Intercept signup requests to validate registration mode
 export async function POST(req: NextRequest) {
   const pathname = req.nextUrl.pathname;
 
-  // Check if this is a signup request (email or OAuth)
-  const isSignupRequest =
-    pathname === '/api/auth/sign-up/email' ||
-    pathname.includes('/api/auth/callback/'); // OAuth callbacks can create users
+  // Determine request type
+  // Comprehensive signup endpoint detection to prevent bypasses
+  const signupEndpoints = [
+    '/sign-up/email',
+    '/sign-up/credentials',
+    '/signup',
+    '/register',
+  ];
+
+  const isSignupAttempt = signupEndpoints.some(endpoint => pathname.includes(endpoint));
+  const isOAuthCallback = pathname.includes('/api/auth/callback/');
+  const isSignupRequest = isSignupAttempt || isOAuthCallback;
 
   if (isSignupRequest) {
+    const registrationMode = AUTH_CONFIG?.registration?.mode ?? 'open';
     const teamsMode = TEAMS_CONFIG.mode;
 
-    // In single-tenant mode, block public signup if team already exists
-    if (isPublicSignupRestricted(teamsMode)) {
+    // --- Registration mode enforcement ---
+
+    // 1. Domain-restricted mode: block email signup, allow OAuth (validated in database hooks)
+    if (registrationMode === 'domain-restricted' && isSignupAttempt && !isOAuthCallback) {
+      // Block direct email/password signup in domain-restricted mode
+      // Only Google OAuth is allowed (domain validation happens in database hooks)
+      const errorResponse = NextResponse.json(
+        {
+          error: 'Email signup disabled',
+          message: 'Please sign up with Google using an authorized email domain.',
+          code: 'EMAIL_SIGNUP_DISABLED',
+        },
+        { status: 403 }
+      );
+      return await addCorsHeaders(errorResponse, req);
+    }
+
+    // Note: OAuth domain validation happens in auth.ts databaseHooks (user.create.before)
+    // The hook throws an error if the email domain is not in allowedDomains
+
+    // 2. Invitation-only mode OR single-tenant teams mode: existing behavior
+    if (registrationMode === 'invitation-only' || isPublicSignupRestricted(teamsMode)) {
       const teamExists = await TeamService.hasGlobal();
 
       if (teamExists) {
-        // Block public signup - users must be invited
-        // Add CORS headers so mobile apps can read the error message
         const errorResponse = NextResponse.json(
           {
             error: 'Registration is closed',

package/templates/app/api/v1/billing/cancel/route.ts

@@ -11,7 +11,11 @@ import { NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { authenticateRequest, createAuthError } from '@nextsparkjs/core/lib/api/auth/dual-auth'
 import { SubscriptionService, MembershipService } from '@nextsparkjs/core/lib/services'
-import { getBillingGateway } from '@nextsparkjs/core/lib/billing/gateways/factory'
+import {
+  cancelSubscriptionAtPeriodEnd,
+  cancelSubscriptionImmediately,
+  reactivateSubscription
+} from '@nextsparkjs/core/lib/billing/gateways/stripe'
 import { queryWithRLS } from '@nextsparkjs/core/lib/db'
 import { withRateLimitTier } from '@nextsparkjs/core/lib/api/rate-limit'
 
@@ -104,11 +108,10 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 6. Cancel via Stripe
   try {
-    const gateway = getBillingGateway()
     if (immediate) {
-      await gateway.cancelSubscriptionImmediately(subscription.externalSubscriptionId)
+      await cancelSubscriptionImmediately(subscription.externalSubscriptionId)
     } else {
-      await gateway.cancelSubscriptionAtPeriodEnd(subscription.externalSubscriptionId)
+      await cancelSubscriptionAtPeriodEnd(subscription.externalSubscriptionId)
     }
 
     // 7. Update local DB
@@ -171,7 +174,7 @@ async function handleReactivation(teamId: string) {
   }
 
   try {
-    await getBillingGateway().reactivateSubscription(subscription.externalSubscriptionId)
+    await reactivateSubscription(subscription.externalSubscriptionId)
 
     // Update local DB
     await queryWithRLS(

package/templates/app/api/v1/billing/checkout/route.ts

@@ -11,7 +11,7 @@
 
 import { NextRequest, NextResponse } from 'next/server'
 import { authenticateRequest, createAuthError } from '@nextsparkjs/core/lib/api/auth/dual-auth'
-import { getBillingGateway } from '@nextsparkjs/core/lib/billing/gateways/factory'
+import { createCheckoutSession } from '@nextsparkjs/core/lib/billing/gateways/stripe'
 import { SubscriptionService, MembershipService } from '@nextsparkjs/core/lib/services'
 import { z } from 'zod'
 import { withRateLimitTier } from '@nextsparkjs/core/lib/api/rate-limit'
@@ -94,8 +94,8 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
     const successUrl = `${appUrl}/dashboard/settings/billing?success=true`
     const cancelUrl = `${appUrl}/dashboard/settings/billing?canceled=true`
 
-    // Create checkout session via billing gateway
-    const session = await getBillingGateway().createCheckoutSession({
+    // Create Stripe Checkout session
+    const session = await createCheckoutSession({
       teamId,
       planSlug,
       billingPeriod,

package/templates/app/api/v1/billing/portal/route.ts

@@ -9,7 +9,7 @@
 
 import { NextRequest, NextResponse } from 'next/server'
 import { authenticateRequest, createAuthError } from '@nextsparkjs/core/lib/api/auth/dual-auth'
-import { getBillingGateway } from '@nextsparkjs/core/lib/billing/gateways/factory'
+import { createPortalSession } from '@nextsparkjs/core/lib/billing/gateways/stripe'
 import { SubscriptionService, MembershipService } from '@nextsparkjs/core/lib/services'
 import { withRateLimitTier } from '@nextsparkjs/core/lib/api/rate-limit'
 
@@ -69,7 +69,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
     const appUrl = process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:5173'
     const returnUrl = `${appUrl}/dashboard/settings/billing`
 
-    const session = await getBillingGateway().createPortalSession({
+    const session = await createPortalSession({
       customerId: subscription.externalCustomerId,
       returnUrl
     })

package/templates/app/dashboard/(main)/[entity]/loading.tsx

@@ -1,6 +1,7 @@
 import { Skeleton } from '@nextsparkjs/core/components/ui/skeleton'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function EntityLoading() {
+function EntityLoading() {
   return (
     <div className="space-y-6 p-6">
       {/* Header skeleton */}
@@ -58,4 +59,6 @@ export default function EntityLoading() {
       </div>
     </div>
   )
-}
+}
+
+export default getTemplateOrDefault('app/dashboard/(main)/[entity]/loading.tsx', EntityLoading)

package/templates/app/dashboard/(main)/loading.tsx

@@ -1,5 +1,8 @@
 import { SkeletonDashboardHome } from '@nextsparkjs/core/components/ui/skeleton-dashboard'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
-export default function DashboardLoading() {
+function DashboardLoading() {
   return <SkeletonDashboardHome />
 }
+
+export default getTemplateOrDefault('app/dashboard/(main)/loading.tsx', DashboardLoading)

package/templates/app/dashboard/(main)/patterns/[id]/edit/page.tsx

@@ -14,8 +14,9 @@ import { EntityFormWrapper } from '@nextsparkjs/core/components/entities/wrapper
 import { BuilderEditorView } from '@nextsparkjs/core/components/dashboard/block-editor/builder-editor-view'
 import { Alert, AlertDescription } from '@nextsparkjs/core/components/ui/alert'
 import { getEntityData } from '@nextsparkjs/core/lib/api/entities'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
-export default function PatternEditPage() {
+function PatternEditPage() {
   const params = useParams()
   const router = useRouter()
   const [entityConfig, setEntityConfig] = useState<ClientEntityConfig | null>(null)
@@ -112,3 +113,5 @@ export default function PatternEditPage() {
     />
   )
 }
+
+export default getTemplateOrDefaultClient('app/dashboard/(main)/patterns/[id]/edit/page.tsx', PatternEditPage)

package/templates/app/dashboard/(main)/patterns/[id]/page.tsx

@@ -5,6 +5,7 @@
  */
 
 import { redirect } from 'next/navigation'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
 interface PageProps {
   params: Promise<{
@@ -12,9 +13,11 @@ interface PageProps {
   }>
 }
 
-export default async function PatternDetailPage({ params }: PageProps) {
+async function PatternDetailPage({ params }: PageProps) {
   const resolvedParams = await params
 
   // Patterns are builder-enabled, so redirect to edit view
   redirect(`/dashboard/patterns/${resolvedParams.id}/edit`)
 }
+
+export default getTemplateOrDefault('app/dashboard/(main)/patterns/[id]/page.tsx', PatternDetailPage)

package/templates/app/dashboard/(main)/patterns/[id]/reports/page.tsx

@@ -17,6 +17,7 @@ import { Button } from '@nextsparkjs/core/components/ui/button'
 import { Alert, AlertDescription, AlertTitle } from '@nextsparkjs/core/components/ui/alert'
 import { Skeleton } from '@nextsparkjs/core/components/ui/skeleton'
 import { getEntityData } from '@nextsparkjs/core/lib/api/entities'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
 interface PatternData {
   id: string
@@ -24,7 +25,7 @@ interface PatternData {
   title?: string
 }
 
-export default function PatternReportsPage() {
+function PatternReportsPage() {
   const params = useParams()
   const router = useRouter()
   const patternId = params.id as string
@@ -169,3 +170,5 @@ export default function PatternReportsPage() {
     </div>
   )
 }
+
+export default getTemplateOrDefaultClient('app/dashboard/(main)/patterns/[id]/reports/page.tsx', PatternReportsPage)

package/templates/app/dashboard/(main)/patterns/create/page.tsx

@@ -12,8 +12,9 @@ import { clientEntityRegistry, ensureClientInitialized, type ClientEntityConfig
 import { EntityFormWrapper } from '@nextsparkjs/core/components/entities/wrappers/EntityFormWrapper'
 import { BuilderEditorView } from '@nextsparkjs/core/components/dashboard/block-editor/builder-editor-view'
 import { Alert, AlertDescription } from '@nextsparkjs/core/components/ui/alert'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
-export default function PatternsCreatePage() {
+function PatternsCreatePage() {
   const router = useRouter()
   const [entityConfig, setEntityConfig] = useState<ClientEntityConfig | null>(null)
   const [loading, setLoading] = useState(true)
@@ -84,3 +85,5 @@ export default function PatternsCreatePage() {
     />
   )
 }
+
+export default getTemplateOrDefaultClient('app/dashboard/(main)/patterns/create/page.tsx', PatternsCreatePage)

package/templates/app/dashboard/(main)/patterns/page.tsx

@@ -28,6 +28,7 @@ import type { Permission } from '@nextsparkjs/core/lib/permissions/types'
 import type { QuickAction, DropdownAction } from '@nextsparkjs/core/components/entities/entity-table.types'
 import { sel } from '@nextsparkjs/core/lib/test'
 import { toast } from 'sonner'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
 interface PatternItem {
   id: string
@@ -37,7 +38,7 @@ interface PatternItem {
   [key: string]: unknown
 }
 
-export default function PatternsListPage() {
+function PatternsListPage() {
   const entityType = 'patterns'
   const router = useRouter()
 
@@ -442,3 +443,5 @@ export default function PatternsListPage() {
     </div>
   )
 }
+
+export default getTemplateOrDefaultClient('app/dashboard/(main)/patterns/page.tsx', PatternsListPage)

package/templates/app/dashboard/features/analytics/page.tsx

@@ -4,8 +4,9 @@ import { FeatureGate } from '@nextsparkjs/core/components/billing/FeatureGate'
 import { FeaturePlaceholder } from '@nextsparkjs/core/components/billing/FeaturePlaceholder'
 import { BarChart3 } from 'lucide-react'
 import { useTranslations } from 'next-intl'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
-export default function AdvancedAnalyticsPage() {
+function AdvancedAnalyticsPage() {
   const t = useTranslations('features')
 
   return (
@@ -33,3 +34,5 @@ export default function AdvancedAnalyticsPage() {
     </div>
   )
 }
+
+export default getTemplateOrDefaultClient('app/dashboard/features/analytics/page.tsx', AdvancedAnalyticsPage)

package/templates/app/dashboard/features/automation/page.tsx

@@ -4,8 +4,9 @@ import { FeatureGate } from '@nextsparkjs/core/components/billing/FeatureGate'
 import { FeaturePlaceholder } from '@nextsparkjs/core/components/billing/FeaturePlaceholder'
 import { Zap } from 'lucide-react'
 import { useTranslations } from 'next-intl'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 
-export default function TaskAutomationPage() {
+function TaskAutomationPage() {
   const t = useTranslations('features')
 
   return (
@@ -33,3 +34,5 @@ export default function TaskAutomationPage() {
     </div>
   )
 }
+
+export default getTemplateOrDefaultClient('app/dashboard/features/automation/page.tsx', TaskAutomationPage)

package/templates/app/dashboard/features/layout.tsx

@@ -1,13 +1,16 @@
-import { ReactNode } from 'react'
+import { type ReactNode } from 'react'
+import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
 
 interface FeaturesLayoutProps {
   children: ReactNode
 }
 
-export default function FeaturesLayout({ children }: FeaturesLayoutProps) {
+function FeaturesLayout({ children }: FeaturesLayoutProps) {
   return (
     <div className="container py-8" data-cy="features-layout">
       {children}
     </div>
   )
 }
+
+export default getTemplateOrDefault('app/dashboard/features/layout.tsx', FeaturesLayout)