create-nextjs-cms 0.9.30 → 0.9.32

package/templates/default/app/(rootLayout)/(plugins)/[...slug]/error.tsx

@@ -0,0 +1,64 @@
+'use client'
+
+import { useEffect } from 'react'
+import { Button } from '@/components/ui/button'
+import { AlertTriangle, Bug, RefreshCw } from 'lucide-react'
+import { useI18n } from 'nextjs-cms/translations/client'
+import { Badge } from '@/components/ui/badge'
+
+export default function PluginError({ error, reset }: { error: Error & { digest?: string }; reset: () => void }) {
+    const t = useI18n()
+    const errorMessage = error.message || t('unexpectedPluginError')
+
+    useEffect(() => {
+        // Surface plugin failures in the console; error.digest correlates with server logs.
+        console.error('[plugin]', error)
+    }, [error])
+
+    return (
+        <div className='flex min-h-[360px] items-center justify-center p-4 sm:p-6'>
+            <section className='bg-card text-card-foreground w-full max-w-3xl overflow-hidden rounded-lg border shadow-sm'>
+                <div className='from-destructive/10 via-background to-background border-b bg-linear-to-r px-5 py-5 sm:px-6'>
+                    <div className='flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between'>
+                        <div className='flex items-start gap-4'>
+                            <div className='bg-destructive/10 dark:bg-destructive/30 text-destructive ring-destructive/20 flex size-12 shrink-0 items-center justify-center rounded-lg ring-1'>
+                                <AlertTriangle className='size-6' aria-hidden='true' />
+                            </div>
+                            <div>
+                                <Badge variant='destructive' className='mb-2'>
+                                    {t('pluginError')}
+                                </Badge>
+                                <h2 className='text-xl font-semibold tracking-tight'>{t('pluginFailedToLoad')}</h2>
+                                <p className='text-muted-foreground mt-2 max-w-2xl text-sm'>
+                                    {t('pluginFailedToLoadDescription')}
+                                </p>
+                            </div>
+                        </div>
+
+                        <Button type='button' size='sm' onClick={() => reset()} className='self-start'>
+                            <RefreshCw className='size-4' aria-hidden='true' />
+                            {t('retry')}
+                        </Button>
+                    </div>
+                </div>
+
+                <dl className='divide-y text-sm'>
+                    <div className='grid gap-2 px-5 py-4 sm:grid-cols-[10rem_1fr] sm:px-6'>
+                        <dt className='text-foreground flex items-center gap-2 font-medium'>
+                            <Bug className='text-muted-foreground size-4' aria-hidden='true' />
+                            {t('details')}
+                        </dt>
+                        <dd className='text-muted-foreground wrap-break-word'>{errorMessage}</dd>
+                    </div>
+
+                    {error.digest && (
+                        <div className='grid gap-2 px-5 py-4 sm:grid-cols-[10rem_1fr] sm:px-6'>
+                            <dt className='text-foreground font-medium'>{t('errorDigest')}</dt>
+                            <dd className='text-muted-foreground font-mono text-xs break-all'>{error.digest}</dd>
+                        </div>
+                    )}
+                </dl>
+            </section>
+        </div>
+    )
+}

package/templates/default/app/(rootLayout)/(plugins)/[...slug]/page.tsx

@@ -1,47 +1,59 @@
-import { notFound } from 'next/navigation'
-import auth from 'nextjs-cms/auth'
-import { getAdminPrivileges } from 'nextjs-cms/api/server/actions'
-import { findPluginRouteByPath, isDashboardOverridePlugin, runRoutePrefetches } from 'nextjs-cms/plugins/server'
-import { api, HydrateClient } from '@/app/_trpc/server'
-import { getPluginServerComponent } from './plugin-server-registry'
-
-export const dynamic = 'force-dynamic'
-type Params = Promise<{ slug?: string[] }>
-
-export default async function Page(props: { params: Params }) {
-    const params = await props.params
-    const slug = params.slug ?? []
-
-    const path = `/${slug.join('/')}`
-    const session = await auth()
-    if (!session?.user) {
-        notFound()
-    }
-
-    const plugin = await findPluginRouteByPath(path)
-    if (!plugin) {
-        notFound()
-    }
-
-    // Bypass privilege check for dashboard override plugin
-    const isDashboardPlugin = await isDashboardOverridePlugin(plugin.pluginName)
-    if (!isDashboardPlugin) {
-        const privilegeSet = await getAdminPrivileges(session.user.id)
-        if (!privilegeSet.has(plugin.pluginName)) {
-            notFound()
-        }
-    }
-
-    const PluginComponent = await getPluginServerComponent(plugin.pluginName, plugin.component)
-    if (!PluginComponent) {
-        notFound()
-    }
-
-    await runRoutePrefetches(api, plugin)
-
-    return (
-        <HydrateClient>
-            <PluginComponent />
-        </HydrateClient>
-    )
-}
+import { notFound } from 'next/navigation'
+import auth from 'nextjs-cms/auth'
+import { Suspense } from 'react'
+import { getAdminPrivileges } from 'nextjs-cms/api/server/actions'
+import { findPluginRouteByPath, isDashboardOverridePlugin, runRoutePrefetches } from 'nextjs-cms/plugins/server'
+import { api, HydrateClient } from '@/app/_trpc/server'
+import { getPluginServerComponent } from './plugin-server-registry'
+import LoadingSpinners from '@/components/feedback/loading-spinners'
+
+type Params = Promise<{ slug?: string[] }>
+
+export default async function Page(props: { params: Params }) {
+    const params = await props.params
+    const slug = params.slug ?? []
+
+    const path = `/${slug.join('/')}`
+    const session = await auth()
+    if (!session?.user) {
+        notFound()
+    }
+
+    const plugin = await findPluginRouteByPath(path)
+    if (!plugin) {
+        notFound()
+    }
+
+    // Bypass privilege check for dashboard override plugin
+    const isDashboardPlugin = await isDashboardOverridePlugin(plugin.pluginName)
+    if (!isDashboardPlugin) {
+        const privilegeSet = await getAdminPrivileges(session.user.id)
+        if (!privilegeSet.has(plugin.pluginName)) {
+            notFound()
+        }
+    }
+
+    // Fire-and-forget: HydrateClient streams resolved query data as it becomes available,
+    // so awaiting here would block the shell on slow upstream APIs (cPanel, GA, etc.)
+    void runRoutePrefetches(api, plugin)
+
+    const PluginComponent = await getPluginServerComponent(plugin.pluginName, plugin.component)
+    if (!PluginComponent) {
+        notFound()
+    }
+    return (
+        <HydrateClient>
+            {/* This way, or use useSuspenseQuery 
+            in each plugin client component and remove the <Suspense /> here */}
+            <Suspense
+                fallback={
+                    <div className='p-20'>
+                        <LoadingSpinners />
+                    </div>
+                }
+            >
+                <PluginComponent />
+            </Suspense>
+        </HydrateClient>
+    )
+}

package/templates/default/app/(rootLayout)/(plugins)/[...slug]/plugin-server-registry.ts

@@ -1,22 +1,20 @@
-import type { ComponentType } from 'react'
-
+import type { ComponentType } from 'react'
+
 export const pluginNamesMap: Record<string, string> = {
     'cpanel-dashboard': '@nextjscms/plugin-cpanel-dashboard/server',
     'cpanel-emails': '@nextjscms/plugin-cpanel-emails/server',
     'google-analytics': '@nextjscms/plugin-google-analytics/server',
     // A workaround to avoid importing error if no plugins are installed
     blank: 'nextjs-cms/plugins/blank-component',
-}
-
-export const getPluginServerComponent = async (
-    pluginName: string,
-    componentName: string | undefined,
-): Promise<ComponentType | null> => {
-    const modulePath = pluginNamesMap[pluginName] ?? pluginNamesMap.blank
-    if (!modulePath) return null
-
-    const mod = (await import(modulePath)) as Record<string, unknown>
-    const component = (componentName ? mod[componentName] : mod.default) as ComponentType | undefined
-
-    return component ?? null
-}
+}
+
+export const getPluginServerComponent = async (
+    pluginName: string,
+    componentName: string | undefined,
+): Promise<ComponentType | null> => {
+    const modulePath = pluginNamesMap[pluginName]
+    if (!modulePath) return null
+    const mod = await import(modulePath)
+    const Component = componentName ? mod[componentName] : mod.default
+    return (Component as ComponentType) ?? null
+}

package/templates/default/app/(rootLayout)/admins/page.tsx

@@ -1,10 +1,10 @@
-import AdminsPage from '@/components/pages/admins-page'
-import { api, HydrateClient } from '@/app/_trpc/server'
-export default async function Page() {
-    await api.admins.list.prefetch()
-    return (
-        <HydrateClient>
-            <AdminsPage />
-        </HydrateClient>
-    )
-}
+import AdminsPage from '@/components/pages/admins-page'
+import { api, HydrateClient } from '@/app/_trpc/server'
+export default async function Page() {
+    await api.admins.list.prefetch()
+    return (
+        <HydrateClient>
+            <AdminsPage />
+        </HydrateClient>
+    )
+}

package/templates/default/app/(rootLayout)/browse/[section]/[page]/page.tsx

@@ -1,22 +1,22 @@
-import BrowsePage from '@/components/pages/browse-page'
-import { api, HydrateClient } from '@/app/_trpc/server'
-type Params = Promise<{ section: string; page: string }>
-type SearchParams = Promise<{ q: string | undefined }>
-export default async function Page(props: { params: Params; searchParams: SearchParams }) {
-    const params = await props.params
-    const searchParams = await props.searchParams
-    const { q } = searchParams
-    const { section, page } = params
-
-    await api.hasItemsSections.listItems.prefetch({
-        sectionName: section,
-        page: parseInt(page) ?? 1,
-        q: q ?? '',
-    })
-
-    return (
-        <HydrateClient>
-            <BrowsePage page={params.page} section={params.section} />
-        </HydrateClient>
-    )
-}
+import BrowsePage from '@/components/pages/browse-page'
+import { api, HydrateClient } from '@/app/_trpc/server'
+type Params = Promise<{ section: string; page: string }>
+type SearchParams = Promise<{ q: string | undefined }>
+export default async function Page(props: { params: Params; searchParams: SearchParams }) {
+    const params = await props.params
+    const searchParams = await props.searchParams
+    const { q } = searchParams
+    const { section, page } = params
+
+    await api.hasItemsSections.listItems.prefetch({
+        sectionName: section,
+        page: parseInt(page) ?? 1,
+        q: q ?? '',
+    })
+
+    return (
+        <HydrateClient>
+            <BrowsePage page={params.page} section={params.section} />
+        </HydrateClient>
+    )
+}

package/templates/default/app/(rootLayout)/categorized/[section]/page.tsx

@@ -1,15 +1,15 @@
-import CategorizedSectionPage from '@/components/pages/categorized-section-page'
-import { api, HydrateClient } from '@/app/_trpc/server'
-type Params = Promise<{ section: string }>
-
-export default async function Page(props: { params: Params }) {
-    const params = await props.params
-    await api.categorySections.get.prefetch({
-        sectionName: params.section,
-    })
-    return (
-        <HydrateClient>
-            <CategorizedSectionPage section={params.section} />
-        </HydrateClient>
-    )
-}
+import CategorizedSectionPage from '@/components/pages/categorized-section-page'
+import { api, HydrateClient } from '@/app/_trpc/server'
+type Params = Promise<{ section: string }>
+
+export default async function Page(props: { params: Params }) {
+    const params = await props.params
+    await api.categorySections.get.prefetch({
+        sectionName: params.section,
+    })
+    return (
+        <HydrateClient>
+            <CategorizedSectionPage section={params.section} />
+        </HydrateClient>
+    )
+}

package/templates/default/app/(rootLayout)/dashboard/page.tsx

@@ -1,70 +1,68 @@
-import { getDashboardOverride, runRoutePrefetches } from 'nextjs-cms/plugins/server'
-import { api, HydrateClient } from '@/app/_trpc/server'
-import { getPluginServerComponent } from '../(plugins)/[...slug]/plugin-server-registry'
-
-export const dynamic = 'force-dynamic'
-
-function DefaultDashboard() {
-    return (
-        <div className='w-full'>
-            <div className='bg-linear-to-r from-amber-200 via-orange-200 to-rose-200 p-8 text-foreground dark:from-amber-900 dark:via-orange-900 dark:to-rose-900'>
-                <h1 className='text-3xl font-extrabold tracking-tight'>Welcome to Mission Control</h1>
-                <p className='mt-2 text-base text-muted-foreground'>
-                    Your CMS is ready. Chart a course, publish boldly, and keep the lights green.
-                </p>
-            </div>
-
-            <div className='space-y-6 p-6'>
-                <section className='rounded-lg border bg-card p-6 text-card-foreground shadow-sm'>
-                    <h2 className='text-xl font-semibold'>Today&apos;s focus</h2>
-                    <p className='mt-2 text-sm text-muted-foreground'>
-                        Start with one small win: verify a section, ship a quick update, or polish a headline.
-                    </p>
-                </section>
-
-                <section className='grid gap-4 md:grid-cols-3'>
-                    <div className='rounded-lg border bg-card p-4 text-card-foreground shadow-sm'>
-                        <div className='text-sm font-semibold'>Ship with confidence</div>
-                        <div className='mt-2 text-sm text-muted-foreground'>
-                            Keep changes tight and reversible. Small releases, fast feedback.
-                        </div>
-                    </div>
-                    <div className='rounded-lg border bg-card p-4 text-card-foreground shadow-sm'>
-                        <div className='text-sm font-semibold'>Stay organized</div>
-                        <div className='mt-2 text-sm text-muted-foreground'>
-                            Group your content by intent, not just by type.
-                        </div>
-                    </div>
-                    <div className='rounded-lg border bg-card p-4 text-card-foreground shadow-sm'>
-                        <div className='text-sm font-semibold'>Delight users</div>
-                        <div className='mt-2 text-sm text-muted-foreground'>
-                            A clean headline and a single strong image can do the heavy lifting.
-                        </div>
-                    </div>
-                </section>
-            </div>
-        </div>
-    )
-}
-
-export default async function DashboardPage() {
-    // Check for dashboard override configuration
-    const override = await getDashboardOverride()
-    if (!override) {
-        return <DefaultDashboard />
-    }
-
-    // Render the override plugin component (no privilege check for dashboard override)
-    const PluginComponent = await getPluginServerComponent(override.pluginName, override.component)
-    if (!PluginComponent) {
-        return <DefaultDashboard />
-    }
-
-    await runRoutePrefetches(api, override)
-
-    return (
-        <HydrateClient>
-            <PluginComponent />
-        </HydrateClient>
-    )
-}
+import { getDashboardOverride, runRoutePrefetches } from 'nextjs-cms/plugins/server'
+import { api, HydrateClient } from '@/app/_trpc/server'
+import { getPluginServerComponent } from '../(plugins)/[...slug]/plugin-server-registry'
+
+function DefaultDashboard() {
+    return (
+        <div className='w-full'>
+            <div className='text-foreground bg-linear-to-r from-amber-200 via-orange-200 to-rose-200 p-8 dark:from-amber-900 dark:via-orange-900 dark:to-rose-900'>
+                <h1 className='text-3xl font-extrabold tracking-tight'>Welcome to Mission Control</h1>
+                <p className='text-muted-foreground mt-2 text-base'>
+                    Your CMS is ready. Chart a course, publish boldly, and keep the lights green.
+                </p>
+            </div>
+
+            <div className='space-y-6 p-6'>
+                <section className='bg-card text-card-foreground rounded-lg border p-6 shadow-sm'>
+                    <h2 className='text-xl font-semibold'>Today&apos;s focus</h2>
+                    <p className='text-muted-foreground mt-2 text-sm'>
+                        Start with one small win: verify a section, ship a quick update, or polish a headline.
+                    </p>
+                </section>
+
+                <section className='grid gap-4 md:grid-cols-3'>
+                    <div className='bg-card text-card-foreground rounded-lg border p-4 shadow-sm'>
+                        <div className='text-sm font-semibold'>Ship with confidence</div>
+                        <div className='text-muted-foreground mt-2 text-sm'>
+                            Keep changes tight and reversible. Small releases, fast feedback.
+                        </div>
+                    </div>
+                    <div className='bg-card text-card-foreground rounded-lg border p-4 shadow-sm'>
+                        <div className='text-sm font-semibold'>Stay organized</div>
+                        <div className='text-muted-foreground mt-2 text-sm'>
+                            Group your content by intent, not just by type.
+                        </div>
+                    </div>
+                    <div className='bg-card text-card-foreground rounded-lg border p-4 shadow-sm'>
+                        <div className='text-sm font-semibold'>Delight users</div>
+                        <div className='text-muted-foreground mt-2 text-sm'>
+                            A clean headline and a single strong image can do the heavy lifting.
+                        </div>
+                    </div>
+                </section>
+            </div>
+        </div>
+    )
+}
+
+export default async function DashboardPage() {
+    // Check for dashboard override configuration
+    const override = await getDashboardOverride()
+    if (!override) {
+        return <DefaultDashboard />
+    }
+
+    // Render the override plugin component (no privilege check for dashboard override)
+    const PluginComponent = await getPluginServerComponent(override.pluginName, override.component)
+    if (!PluginComponent) {
+        return <DefaultDashboard />
+    }
+
+    await runRoutePrefetches(api, override)
+
+    return (
+        <HydrateClient>
+            <PluginComponent />
+        </HydrateClient>
+    )
+}

package/templates/default/app/(rootLayout)/edit/[section]/[itemId]/page.tsx

@@ -1,20 +1,20 @@
-import ItemEditPage from '@/components/pages/item-edit-page'
-import { api, HydrateClient } from '@/app/_trpc/server'
-type Params = Promise<{ section: string; itemId: string }>
-type SearchParams = Promise<{ locale?: string }>
-
-export default async function Page(props: { params: Params; searchParams: SearchParams }) {
-    const params = await props.params
-    const searchParams = await props.searchParams
-    await api.hasItemsSections.editItem.prefetch({
-        sectionName: params.section,
-        sectionItemId: params.itemId,
-        locale: searchParams.locale,
-    })
-
-    return (
-        <HydrateClient>
-            <ItemEditPage sectionType='has_items' section={params.section} itemId={params.itemId} />
-        </HydrateClient>
-    )
-}
+import ItemEditPage from '@/components/pages/item-edit-page'
+import { api, HydrateClient } from '@/app/_trpc/server'
+type Params = Promise<{ section: string; itemId: string }>
+type SearchParams = Promise<{ locale?: string }>
+
+export default async function Page(props: { params: Params; searchParams: SearchParams }) {
+    const params = await props.params
+    const searchParams = await props.searchParams
+    await api.hasItemsSections.editItem.prefetch({
+        sectionName: params.section,
+        sectionItemId: params.itemId,
+        locale: searchParams.locale,
+    })
+
+    return (
+        <HydrateClient>
+            <ItemEditPage sectionType='has_items' section={params.section} itemId={params.itemId} />
+        </HydrateClient>
+    )
+}