@nextsparkjs/core 0.1.0-beta.136 → 0.1.0-beta.137

package/dist/lib/translations/registry.d.ts

@@ -5,6 +5,11 @@
  * Integrates with next-intl and entity system for seamless i18n.
  */
 import type { SupportedLocale } from '../entities/types';
+/**
+ * Deep merge with key preservation
+ * Priority: Core < Theme < Entity (later wins)
+ */
+export declare function deepMergeMessages(target: Record<string, unknown>, source: Record<string, unknown>): Record<string, unknown>;
 /**
  * Register theme messages for a locale
  * Call this from your project's initialization to provide theme-specific translations

package/dist/lib/translations/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/translations/registry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AA+FxD;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE7F;AAmDD;;;;;;;;;;GAUG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA4DlC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/translations/registry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAuBxD;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAyBzB;AAwCD;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE7F;AAmDD;;;;;;;;;;GAUG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA4DlC"}

package/dist/lib/translations/registry.js

@@ -114,6 +114,7 @@ async function loadMergedTranslations(locale) {
   return mergedMessages;
 }
 export {
+  deepMergeMessages,
   loadMergedTranslations,
   registerThemeMessages
 };

package/dist/providers/static-intl-provider.d.ts

@@ -0,0 +1,9 @@
+import type { ReactNode } from 'react';
+interface StaticIntlProviderProps {
+    locale: string;
+    messages: Record<string, unknown>;
+    children: ReactNode;
+}
+export declare function StaticIntlProvider({ locale, messages, children }: StaticIntlProviderProps): import("react/jsx-runtime").JSX.Element;
+export {};
+//# sourceMappingURL=static-intl-provider.d.ts.map

package/dist/providers/static-intl-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"static-intl-provider.d.ts","sourceRoot":"","sources":["../../src/providers/static-intl-provider.tsx"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,UAAU,uBAAuB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,uBAAuB,2CAMzF"}

package/dist/providers/static-intl-provider.js

@@ -0,0 +1,9 @@
+"use client";
+import { jsx } from "react/jsx-runtime";
+import { IntlProvider } from "use-intl/react";
+function StaticIntlProvider({ locale, messages, children }) {
+  return /* @__PURE__ */ jsx(IntlProvider, { locale, messages, children });
+}
+export {
+  StaticIntlProvider
+};

package/dist/styles/classes.json

@@ -1,5 +1,5 @@
 {
-  "generated": "2026-04-07T17:31:21.161Z",
+  "generated": "2026-04-08T19:30:03.335Z",
   "totalClasses": 1078,
   "classes": [
     "!text-2xl",

package/dist/templates/app/(auth)/auth-error/page.tsx

@@ -21,6 +21,5 @@ function AuthErrorPageWrapper() {
   )
 }
 
-export const dynamic = 'force-dynamic'
 
 export default getTemplateOrDefault('app/(auth)/auth-error/page.tsx', AuthErrorPageWrapper)

package/dist/templates/app/(auth)/forgot-password/page.tsx

@@ -211,6 +211,5 @@ function ForgotPasswordPage() {
 }
 
 // Opt out of static generation due to client-side state
-export const dynamic = 'force-dynamic';
 
 export default getTemplateOrDefaultClient('app/(auth)/forgot-password/page.tsx', ForgotPasswordPage)

package/dist/templates/app/(auth)/layout.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from 'react'
 import type { Metadata } from 'next'
 import { AuthWrapper } from '@nextsparkjs/core/components/auth/layouts/AuthWrapper'
 import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
@@ -34,7 +35,9 @@ function AuthLayout({ children }: { children: React.ReactNode }) {
           </div>
 
           <AuthWrapper>
-            {children}
+            <Suspense fallback={null}>
+              {children}
+            </Suspense>
           </AuthWrapper>
         </div>
 

package/dist/templates/app/(auth)/login/page.tsx

@@ -16,6 +16,5 @@ function LoginPage() {
   return <LoginForm />
 }
 
-export const dynamic = 'force-dynamic'
 
 export default getTemplateOrDefault('app/(auth)/login/page.tsx', LoginPage)

package/dist/templates/app/(auth)/reset-password/page.tsx

@@ -207,6 +207,5 @@ function ResetPasswordPage() {
 }
 
 // Opt out of static generation due to client-side state
-export const dynamic = 'force-dynamic';
 
 export default getTemplateOrDefaultClient('app/(auth)/reset-password/page.tsx', ResetPasswordPage)

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

@@ -1,3 +1,4 @@
+import { Suspense } from 'react'
 import type { Metadata } from 'next'
 import { redirect } from 'next/navigation'
 import { SignupForm } from '@nextsparkjs/core/components/auth/forms/SignupForm'
@@ -15,7 +16,7 @@ export const metadata: Metadata = getMetadataOrDefault(
   defaultMetadata
 )
 
-async function SignupPage() {
+async function SignupPageContent() {
   const registrationMode = AUTH_CONFIG?.registration?.mode ?? 'open'
 
   // In invitation-only mode, allow the first user to register
@@ -38,6 +39,13 @@ async function SignupPage() {
   return <SignupForm />
 }
 
-export const dynamic = 'force-dynamic'
+function SignupPage() {
+  return (
+    <Suspense fallback={null}>
+      <SignupPageContent />
+    </Suspense>
+  )
+}
+
 
 export default getTemplateOrDefault('app/(auth)/signup/page.tsx', SignupPage)

package/dist/templates/app/(auth)/verify-email/page.tsx

@@ -185,6 +185,5 @@ function VerifyEmailPage() {
   );
 }
 
-export const dynamic = 'force-dynamic';
 
 export default getTemplateOrDefaultClient('app/(auth)/verify-email/page.tsx', VerifyEmailPage)

package/dist/templates/app/(public)/[...slug]/page.tsx

@@ -13,6 +13,7 @@
  * 2. Falls back to default PageRenderer if no template
  */
 
+import { Suspense } from 'react'
 import { notFound } from 'next/navigation'
 import { query } from '@nextsparkjs/core/lib/db'
 import { PageRenderer } from '@nextsparkjs/core/components/public/pageBuilder'
@@ -51,7 +52,6 @@ function getEntityConfigs(): Record<string, EntityConfig> {
 }
 
 // Enable ISR with 1 hour revalidation
-export const revalidate = 3600
 
 interface PageProps {
   params: Promise<{ slug: string[] }>
@@ -247,9 +247,9 @@ export async function generateMetadata({
 }
 
 /**
- * Main catch-all page component
+ * Main catch-all page content (async, wrapped in Suspense by parent)
  */
-export default async function DynamicPublicPage({
+async function DynamicPublicPageContent({
   params,
   searchParams,
 }: PageProps) {
@@ -376,3 +376,14 @@ export default async function DynamicPublicPage({
   // No match found
   notFound()
 }
+
+/**
+ * Main catch-all page component — wraps async content in Suspense for PPR compatibility
+ */
+export default function DynamicPublicPage(props: PageProps) {
+  return (
+    <Suspense fallback={null}>
+      <DynamicPublicPageContent {...props} />
+    </Suspense>
+  )
+}

package/dist/templates/app/(public)/layout.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react"
 import type { Metadata } from "next"
 import { PublicNavbar } from '@nextsparkjs/core/components/app/layouts/PublicNavbar'
 import { PublicFooter } from '@nextsparkjs/core/components/app/layouts/PublicFooter'
@@ -29,7 +30,9 @@ function PublicLayout({
 
       {/* Main Content */}
       <main className="flex-1">
-        {children}
+        <Suspense fallback={null}>
+          {children}
+        </Suspense>
       </main>
 
       {/* Public Footer */}

package/dist/templates/app/api/csp-report/route.ts

@@ -5,15 +5,18 @@ import { NextRequest, NextResponse } from 'next/server';
 let checkDistributedRateLimit: ((id: string, tier: string) => Promise<{ allowed: boolean; limit: number; remaining: number; resetTime: number; retryAfter?: number }>) | null = null;
 let createRateLimitErrorResponse: ((result: { allowed: boolean; limit: number; remaining: number; resetTime: number; retryAfter?: number }) => NextResponse) | null = null;
 
-// Try to load rate limiting functions
-try {
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const rateLimitModule = require('@nextsparkjs/core/lib/api');
-  checkDistributedRateLimit = rateLimitModule.checkDistributedRateLimit;
-  createRateLimitErrorResponse = rateLimitModule.createRateLimitErrorResponse;
-} catch {
-  // Rate limiting not available - will skip rate limit checks
-  console.warn('[CSP Report] Rate limiting not available - running without rate limits');
+// Lazy-load rate limiting functions on first request
+let rateLimitLoaded = false;
+async function ensureRateLimitLoaded() {
+  if (rateLimitLoaded) return;
+  rateLimitLoaded = true;
+  try {
+    const rateLimitModule = await import('@nextsparkjs/core/lib/api');
+    checkDistributedRateLimit = rateLimitModule.checkDistributedRateLimit;
+    createRateLimitErrorResponse = rateLimitModule.createRateLimitErrorResponse;
+  } catch {
+    console.warn('[CSP Report] Rate limiting not available - running without rate limits');
+  }
 }
 
 /**
@@ -73,6 +76,7 @@ function getClientIp(request: NextRequest): string {
 }
 
 export async function POST(request: NextRequest) {
+  await ensureRateLimitLoaded();
   const requestId = randomUUID().slice(0, 8);
   let rateLimitHeaders: Record<string, string> = {};
 

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

@@ -77,27 +77,9 @@ async function EntityDetailPage({ params }: PageProps) {
   )
 }
 
-export async function generateMetadata({ params }: PageProps): Promise<Metadata> {
-  const resolvedParams = await params
-  const entitySlug = resolvedParams.entity
-
-  if (!(entitySlug in getEntityRegistry())) {
-    return {
-      title: 'Not Found - Dashboard'
-    }
-  }
-
-  const entityConfig = getEntity(entitySlug as string)
-  if (!entityConfig || !isEntityConfig(entityConfig)) {
-    return {
-      title: 'Not Found - Dashboard'
-    }
-  }
-
-  return {
-    title: `${entityConfig.names.plural} #${resolvedParams.id} - Dashboard`,
-    description: `View details for ${entityConfig.names.singular}`
-  }
+export const metadata: Metadata = {
+  title: 'Dashboard',
+  description: 'View entity details'
 }
 
 export default EntityDetailPage

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

@@ -63,28 +63,9 @@ async function EntityListPage({ params }: PageProps) {
   )
 }
 
-export async function generateMetadata({ params }: PageProps): Promise<Metadata> {
-  const resolvedParams = await params
-  const entitySlug = resolvedParams.entity
-
-  const registry = getEntityRegistry()
-  if (!(entitySlug in registry)) {
-    return {
-      title: 'Not Found - Dashboard'
-    }
-  }
-
-  const entityConfig = getEntity(entitySlug)
-  if (!entityConfig || !isEntityConfig(entityConfig)) {
-    return {
-      title: 'Not Found - Dashboard'
-    }
-  }
-
-  return {
-    title: `${entityConfig.names.plural} - Dashboard`,
-    description: `Manage ${entityConfig.names.plural.toLowerCase()} in your dashboard`
-  }
+export const metadata: Metadata = {
+  title: 'Dashboard',
+  description: 'Manage entities in your dashboard'
 }
 
 export default getTemplateOrDefault('app/dashboard/(main)/[entity]/page.tsx', EntityListPage)

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

@@ -301,6 +301,5 @@ function UpdatePasswordPage() {
 }
 
 // Opt out of static generation due to client-side state
-export const dynamic = 'force-dynamic';
 
 export default getTemplateOrDefaultClient('app/dashboard/settings/password/page.tsx', UpdatePasswordPage)

package/dist/templates/app/devtools/blocks/[slug]/page.tsx

@@ -33,7 +33,9 @@ export default async function BlockDetailPage({ params }: BlockDetailPageProps)
  * Generate static params for all blocks
  */
 export async function generateStaticParams() {
-  return Object.keys(BLOCK_REGISTRY).map((slug) => ({
+  const keys = Object.keys(BLOCK_REGISTRY);
+  if (keys.length === 0) return [{ slug: '_placeholder' }];
+  return keys.map((slug) => ({
     slug,
   }));
 }

package/dist/templates/app/devtools/blocks/page.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { BlocksViewer } from "@nextsparkjs/core/components/devtools/BlocksViewer";
 import { LayoutGrid } from "lucide-react";
 import { getTranslations } from "next-intl/server";
@@ -8,7 +9,7 @@ import { getTranslations } from "next-intl/server";
  * Displays all page builder blocks with field definitions and coverage info.
  * Provides filtering and search capabilities.
  */
-export default async function DevBlocksPage() {
+async function DevBlocksPageContent() {
   const t = await getTranslations("devtools.blocks");
 
   return (
@@ -29,3 +30,11 @@ export default async function DevBlocksPage() {
     </div>
   );
 }
+
+export default function DevBlocksPage() {
+  return (
+    <Suspense fallback={null}>
+      <DevBlocksPageContent />
+    </Suspense>
+  );
+}

package/dist/templates/app/devtools/config/page.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { ConfigViewer } from "@nextsparkjs/core/components/devtools";
 import { Settings } from "lucide-react";
 import { getTranslations } from "next-intl/server";
@@ -8,7 +9,7 @@ import { getTranslations } from "next-intl/server";
  * Displays theme configuration and entity registry information.
  * Provides read-only view with JSON formatting and copy functionality.
  */
-export default async function DevConfigPage() {
+async function DevConfigPageContent() {
   const t = await getTranslations('dev.config');
 
   return (
@@ -29,3 +30,11 @@ export default async function DevConfigPage() {
     </div>
   );
 }
+
+export default function DevConfigPage() {
+  return (
+    <Suspense fallback={null}>
+      <DevConfigPageContent />
+    </Suspense>
+  );
+}

package/dist/templates/app/devtools/features/page.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { FeaturesViewer } from "@nextsparkjs/core/components/devtools/FeaturesViewer";
 import { Layers } from "lucide-react";
 import { getTranslations } from "next-intl/server";
@@ -8,7 +9,7 @@ import { getTranslations } from "next-intl/server";
  * Displays all features from the testing registry with coverage information.
  * Provides filtering and search capabilities.
  */
-export default async function DevFeaturesPage() {
+async function DevFeaturesPageContent() {
   const t = await getTranslations("devtools.features");
 
   return (
@@ -29,3 +30,11 @@ export default async function DevFeaturesPage() {
     </div>
   );
 }
+
+export default function DevFeaturesPage() {
+  return (
+    <Suspense fallback={null}>
+      <DevFeaturesPageContent />
+    </Suspense>
+  );
+}

package/dist/templates/app/devtools/flows/page.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { FlowsViewer } from "@nextsparkjs/core/components/devtools/FlowsViewer";
 import { GitBranch } from "lucide-react";
 import { getTranslations } from "next-intl/server";
@@ -8,7 +9,7 @@ import { getTranslations } from "next-intl/server";
  * Displays all user journey flows from the testing registry with coverage information.
  * Provides filtering and search capabilities.
  */
-export default async function DevFlowsPage() {
+async function DevFlowsPageContent() {
   const t = await getTranslations("devtools.flows");
 
   return (
@@ -29,3 +30,11 @@ export default async function DevFlowsPage() {
     </div>
   );
 }
+
+export default function DevFlowsPage() {
+  return (
+    <Suspense fallback={null}>
+      <DevFlowsPageContent />
+    </Suspense>
+  );
+}

package/dist/templates/app/devtools/page.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { Code, Palette, FileText, Settings } from "lucide-react";
 import Link from "next/link";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@nextsparkjs/core/components/ui/card";
@@ -9,7 +10,7 @@ import { getTranslations } from "next-intl/server";
  * Dashboard with quick links to development tools and documentation.
  * Shows overview of available sections in the dev area.
  */
-export default async function DevHomePage() {
+async function DevHomePageContent() {
   const t = await getTranslations('dev');
   const tCommon = await getTranslations('common');
 
@@ -119,3 +120,11 @@ export default async function DevHomePage() {
     </div>
   );
 }
+
+export default function DevHomePage() {
+  return (
+    <Suspense fallback={null}>
+      <DevHomePageContent />
+    </Suspense>
+  );
+}

package/dist/templates/app/devtools/tags/page.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { TagsOverview } from "@nextsparkjs/core/components/devtools/TagsOverview";
 import { Tag } from "lucide-react";
 import { getTranslations } from "next-intl/server";
@@ -8,7 +9,7 @@ import { getTranslations } from "next-intl/server";
  * Displays all test tags organized by category.
  * Provides search and copy-to-clipboard functionality.
  */
-export default async function DevTagsPage() {
+async function DevTagsPageContent() {
   const t = await getTranslations("devtools.tags");
 
   return (
@@ -29,3 +30,11 @@ export default async function DevTagsPage() {
     </div>
   );
 }
+
+export default function DevTagsPage() {
+  return (
+    <Suspense fallback={null}>
+      <DevTagsPageContent />
+    </Suspense>
+  );
+}

package/dist/templates/app/devtools/tests/[[...path]]/page.tsx

@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { TestCasesViewer } from "@nextsparkjs/core/components/devtools";
 import { FileText } from "lucide-react";
 import { getTranslations } from "next-intl/server";
@@ -17,7 +18,7 @@ interface DevTestsPageProps {
  * - /dev/tests/auth/login-logout.bdd.md          → File selected
  * - /dev/tests/page-builder/admin/block-editor.bdd.md → Nested file
  */
-export default async function DevTestsPage({ params }: DevTestsPageProps) {
+async function DevTestsPageContent({ params }: DevTestsPageProps) {
   const { path } = await params;
   const t = await getTranslations("dev.tests");
 
@@ -45,3 +46,11 @@ export default async function DevTestsPage({ params }: DevTestsPageProps) {
     </div>
   );
 }
+
+export default function DevTestsPage({ params }: DevTestsPageProps) {
+  return (
+    <Suspense fallback={null}>
+      <DevTestsPageContent params={params} />
+    </Suspense>
+  );
+}

package/dist/templates/app/layout.ppr.tsx

@@ -0,0 +1,105 @@
+/**
+ * Root Layout — PPR-compatible (Partial Prerendering)
+ *
+ * Fully static: no async data fetching in the root layout.
+ * The PPR static shell (html/body/fonts/content) renders instantly from CDN.
+ *
+ * Prerequisites:
+ * - Next.js 16.2.2+ with cacheComponents: true in next.config
+ * - Run `pnpm build:registries` to generate PPR exports
+ * - See docs/migration-ppr.md for full migration guide
+ *
+ * Key differences from the default async layout:
+ * - Layout is sync (not async) — enables PPR static shell
+ * - Uses StaticIntlProvider instead of NextIntlClientProvider
+ * - Messages/locale/theme mode are pre-merged at build time via registry
+ * - No PluginService.initializeAll() — plugins initialize on-demand
+ *
+ * Generated by @nextspark/core
+ * Regenerate with: npx nextspark generate
+ */
+
+import type { Metadata } from "next"
+import { Suspense } from "react"
+import { Geist, Geist_Mono } from "next/font/google"
+
+import "./globals.css"
+import { getBillingResourceHints } from "@nextsparkjs/core/lib/billing/gateways/factory"
+import { StaticIntlProvider } from "@nextsparkjs/core/providers/static-intl-provider"
+import { QueryProvider } from "@nextsparkjs/core/providers/query-provider"
+import { ThemeProvider as NextThemeProvider } from "@nextsparkjs/core/providers/theme-provider"
+import { ThemeProvider as CustomThemeProvider } from "@nextsparkjs/core/lib/theme/ThemeProvider"
+import { TeamProvider } from "@nextsparkjs/core/contexts/TeamContext"
+import { SubscriptionProvider } from "@nextsparkjs/core/contexts/SubscriptionContext"
+import { Toaster } from "@nextsparkjs/core/components/ui/sonner"
+import { getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { DEFAULT_LOCALE, DEFAULT_THEME_MODE, STATIC_MESSAGES } from '@nextsparkjs/registries/translation-registry'
+
+const geistSans = Geist({
+  variable: "--font-geist-sans",
+  subsets: ["latin"],
+})
+
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",
+  subsets: ["latin"],
+})
+
+const defaultMetadata: Metadata = {
+  title: "NextSpark App",
+  description: "Built with NextSpark",
+}
+
+export const metadata: Metadata = getMetadataOrDefault(
+  'app/layout.tsx',
+  defaultMetadata
+)
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  return (
+    <html lang={DEFAULT_LOCALE} suppressHydrationWarning>
+      <head>
+        {(() => {
+          const hints = getBillingResourceHints()
+          return (
+            <>
+              {hints.preconnect.map((domain) => (
+                <link key={`pre-${domain}`} rel="preconnect" href={domain} />
+              ))}
+              {[...hints.preconnect, ...hints.dnsPrefetch].map((domain) => (
+                <link key={`dns-${domain}`} rel="dns-prefetch" href={domain} />
+              ))}
+            </>
+          )
+        })()}
+      </head>
+      <body
+        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+      >
+        <StaticIntlProvider locale={DEFAULT_LOCALE} messages={STATIC_MESSAGES}>
+          <NextThemeProvider
+            attribute="class"
+            defaultTheme={DEFAULT_THEME_MODE}
+            enableSystem={DEFAULT_THEME_MODE === 'system'}
+            disableTransitionOnChange
+          >
+            <CustomThemeProvider>
+              <QueryProvider>
+                <TeamProvider>
+                  <SubscriptionProvider>
+                    <main>{children}</main>
+                    <Suspense><Toaster position="bottom-left" /></Suspense>
+                  </SubscriptionProvider>
+                </TeamProvider>
+              </QueryProvider>
+            </CustomThemeProvider>
+          </NextThemeProvider>
+        </StaticIntlProvider>
+      </body>
+    </html>
+  )
+}

package/dist/templates/app/layout.tsx

@@ -1,10 +1,18 @@
 /**
- * AUTO-GENERATED FILE - DO NOT EDIT DIRECTLY
+ * Root Layout — Async (default)
+ *
+ * Uses async data fetching for locale, messages, and theme mode.
+ * Compatible with all Next.js versions (15+, 16+).
+ *
+ * For PPR-optimized layout (requires Next.js 16.2.2+ with cacheComponents: true),
+ * see layout.ppr.tsx which uses pre-merged static imports for faster shell rendering.
+ *
  * Generated by @nextspark/core
  * Regenerate with: npx nextspark generate
  */
 
 import type { Metadata } from "next"
+import { Suspense } from "react"
 import { Geist, Geist_Mono } from "next/font/google"
 import { NextIntlClientProvider } from 'next-intl'
 import { getMessages } from 'next-intl/server'
@@ -92,7 +100,7 @@ export default async function RootLayout({
                   <SubscriptionProvider>
                     <TranslationContextManager />
                     <main>{children}</main>
-                    <Toaster position="bottom-left" />
+                    <Suspense><Toaster position="bottom-left" /></Suspense>
                   </SubscriptionProvider>
                 </TeamProvider>
               </QueryProvider>