create-nextjs-cms 0.5.70 → 0.5.72

package/templates/default/components/ui/sheet.tsx

@@ -1,107 +1,103 @@
-'use client'
-
-import * as React from 'react'
-import * as SheetPrimitive from '@radix-ui/react-dialog'
-import { Cross2Icon } from '@radix-ui/react-icons'
-import { cva, type VariantProps } from 'class-variance-authority'
-
-import { cn } from '@/lib/utils'
-
-const Sheet = SheetPrimitive.Root
-
-const SheetTrigger = SheetPrimitive.Trigger
-
-const SheetClose = SheetPrimitive.Close
-
-const SheetPortal = SheetPrimitive.Portal
-
-const SheetOverlay = React.forwardRef<
-    React.ElementRef<typeof SheetPrimitive.Overlay>,
-    React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
->(({ className, ...props }, ref) => (
-    <SheetPrimitive.Overlay
-        className={cn(
-            'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80',
-            className,
-        )}
-        {...props}
-        ref={ref}
-    />
-))
-SheetOverlay.displayName = SheetPrimitive.Overlay.displayName
-
-const sheetVariants = cva(
-    'fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-200 data-[state=open]:duration-200',
-    {
-        variants: {
-            side: {
-                top: 'inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top',
-                bottom: 'inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom',
-                left: 'inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm',
-                right: 'inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm',
-            },
-        },
-        defaultVariants: {
-            side: 'right',
-        },
-    },
-)
-
-interface SheetContentProps
-    extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
-        VariantProps<typeof sheetVariants> {}
-
-const SheetContent = React.forwardRef<React.ElementRef<typeof SheetPrimitive.Content>, SheetContentProps>(
-    ({ side = 'right', className, children, ...props }, ref) => (
-        <SheetPortal>
-            <SheetOverlay />
-            <SheetPrimitive.Content ref={ref} className={cn(sheetVariants({ side }), className)} {...props}>
-                {children}
-                <SheetPrimitive.Close className='ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none'>
-                    <Cross2Icon className='h-4 w-4' />
-                    <span className='sr-only'>Close</span>
-                </SheetPrimitive.Close>
-            </SheetPrimitive.Content>
-        </SheetPortal>
-    ),
-)
-SheetContent.displayName = SheetPrimitive.Content.displayName
-
-const SheetHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-    <div className={cn('flex flex-col space-y-2 text-center sm:text-left', className)} {...props} />
-)
-SheetHeader.displayName = 'SheetHeader'
-
-const SheetFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-    <div className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)} {...props} />
-)
-SheetFooter.displayName = 'SheetFooter'
-
-const SheetTitle = React.forwardRef<
-    React.ElementRef<typeof SheetPrimitive.Title>,
-    React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
->(({ className, ...props }, ref) => (
-    <SheetPrimitive.Title ref={ref} className={cn('text-foreground text-lg font-semibold', className)} {...props} />
-))
-SheetTitle.displayName = SheetPrimitive.Title.displayName
-
-const SheetDescription = React.forwardRef<
-    React.ElementRef<typeof SheetPrimitive.Description>,
-    React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
->(({ className, ...props }, ref) => (
-    <SheetPrimitive.Description ref={ref} className={cn('text-muted-foreground text-sm', className)} {...props} />
-))
-SheetDescription.displayName = SheetPrimitive.Description.displayName
-
-export {
-    Sheet,
-    SheetPortal,
-    SheetOverlay,
-    SheetTrigger,
-    SheetClose,
-    SheetContent,
-    SheetHeader,
-    SheetFooter,
-    SheetTitle,
-    SheetDescription,
-}
+'use client'
+
+import * as React from 'react'
+import * as SheetPrimitive from '@radix-ui/react-dialog'
+import { XIcon } from 'lucide-react'
+
+import { cn } from '@/lib/utils'
+
+function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
+    return <SheetPrimitive.Root data-slot='sheet' {...props} />
+}
+
+function SheetTrigger({ ...props }: React.ComponentProps<typeof SheetPrimitive.Trigger>) {
+    return <SheetPrimitive.Trigger data-slot='sheet-trigger' {...props} />
+}
+
+function SheetClose({ ...props }: React.ComponentProps<typeof SheetPrimitive.Close>) {
+    return <SheetPrimitive.Close data-slot='sheet-close' {...props} />
+}
+
+function SheetPortal({ ...props }: React.ComponentProps<typeof SheetPrimitive.Portal>) {
+    return <SheetPrimitive.Portal data-slot='sheet-portal' {...props} />
+}
+
+function SheetOverlay({ className, ...props }: React.ComponentProps<typeof SheetPrimitive.Overlay>) {
+    return (
+        <SheetPrimitive.Overlay
+            data-slot='sheet-overlay'
+            className={cn(
+                'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
+                className,
+            )}
+            {...props}
+        />
+    )
+}
+
+function SheetContent({
+    className,
+    children,
+    side = 'right',
+    ...props
+}: React.ComponentProps<typeof SheetPrimitive.Content> & {
+    side?: 'top' | 'right' | 'bottom' | 'left'
+}) {
+    return (
+        <SheetPortal>
+            <SheetOverlay />
+            <SheetPrimitive.Content
+                data-slot='sheet-content'
+                className={cn(
+                    'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500',
+                    side === 'right' &&
+                        'data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm',
+                    side === 'left' &&
+                        'data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm',
+                    side === 'top' &&
+                        'data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b',
+                    side === 'bottom' &&
+                        'data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t',
+                    className,
+                )}
+                {...props}
+            >
+                {children}
+                <SheetPrimitive.Close className='ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none'>
+                    <XIcon className='size-4' />
+                    <span className='sr-only'>Close</span>
+                </SheetPrimitive.Close>
+            </SheetPrimitive.Content>
+        </SheetPortal>
+    )
+}
+
+function SheetHeader({ className, ...props }: React.ComponentProps<'div'>) {
+    return <div data-slot='sheet-header' className={cn('flex flex-col gap-1.5 p-4', className)} {...props} />
+}
+
+function SheetFooter({ className, ...props }: React.ComponentProps<'div'>) {
+    return <div data-slot='sheet-footer' className={cn('mt-auto flex flex-col gap-2 p-4', className)} {...props} />
+}
+
+function SheetTitle({ className, ...props }: React.ComponentProps<typeof SheetPrimitive.Title>) {
+    return (
+        <SheetPrimitive.Title
+            data-slot='sheet-title'
+            className={cn('text-foreground font-semibold', className)}
+            {...props}
+        />
+    )
+}
+
+function SheetDescription({ className, ...props }: React.ComponentProps<typeof SheetPrimitive.Description>) {
+    return (
+        <SheetPrimitive.Description
+            data-slot='sheet-description'
+            className={cn('text-muted-foreground text-sm', className)}
+            {...props}
+        />
+    )
+}
+
+export { Sheet, SheetTrigger, SheetClose, SheetContent, SheetHeader, SheetFooter, SheetTitle, SheetDescription }

package/templates/default/package.json

@@ -17,10 +17,10 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@formkit/auto-animate": "^0.9.0",
-    "@headlessui/react": "^2.2.0",
     "@hookform/resolvers": "^5.2.2",
     "@next/env": "16.1.1",
     "@radix-ui/react-accordion": "^1.2.3",
+    "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-aspect-ratio": "^1.1.2",
     "@radix-ui/react-checkbox": "^1.1.4",
     "@radix-ui/react-dialog": "^1.1.15",
@@ -32,7 +32,7 @@
     "@radix-ui/react-scroll-area": "^1.2.3",
     "@radix-ui/react-select": "^2.2.6",
     "@radix-ui/react-separator": "^1.1.8",
-    "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-switch": "^1.1.3",
     "@radix-ui/react-tabs": "^1.1.3",
     "@radix-ui/react-toast": "^1.2.6",
@@ -64,7 +64,7 @@
     "nanoid": "^5.1.2",
     "next": "16.1.1",
     "next-themes": "^0.4.6",
-    "nextjs-cms": "0.5.70",
+    "nextjs-cms": "0.5.72",
     "plaiceholder": "^3.0.0",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "qrcode": "^1.5.4",
@@ -79,9 +79,9 @@
     "sharp": "^0.33.5",
     "superjson": "^2.2.2",
     "tailwind-merge": "^3.3.1",
+    "tailwindcss": "^4.1.18",
     "tinymce": "^8.3.1",
     "tsx": "^4.20.6",
-    "tw-animate-css": "^1.4.0",
     "zod": "4.1.12"
   },
   "devDependencies": {
@@ -97,17 +97,11 @@
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.3",
     "fs-extra": "^11.3.3",
-    "nextjs-cms-kit": "0.5.70",
+    "nextjs-cms-kit": "0.5.72",
     "postcss": "^8.5.1",
     "prettier": "3.5.0",
     "raw-loader": "^4.0.2",
-    "tailwindcss": "^4.1.18",
+    "tailwindcss-animate": "^1.0.7",
     "typescript": "^5.7.3"
-  },
-  "pnpm": {
-    "overrides": {
-      "@types/react": "19.2.7",
-      "@types/react-dom": "19.2.3"
-    }
   }
 }

package/templates/default/styles/globals.css

@@ -1,4 +1,5 @@
-@import 'tailwindcss';
+@import "tailwindcss";
+@plugin "tailwindcss-animate";
 
 @custom-variant dark (&:is(.dark *));
 

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

@@ -1,7 +0,0 @@
-// AUTO GENERATED FILE, DO NOT DELETE OR EDIT
-// THIS FILE IS GENERATED BY THE PLUGIN SYSTEM
-export const _pluginNamesMap = {
-    'cpanel-dashboard': '@nextjs-cms-plugins/cpanel-dashboard/server',
-    'cpanel-emails': '@nextjs-cms-plugins/cpanel-emails/server',
-    'google-analytics': '@nextjs-cms-plugins/google-analytics/server',
-}

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

@@ -1,11 +0,0 @@
-import AdvancedSettingsPage from '@/components/AdvancedSettingsPage'
-import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
-export default async function Page() {
-    await api.cmsSettings.get.prefetch()
-
-    return (
-        <HydrateClient>
-            <AdvancedSettingsPage />
-        </HydrateClient>
-    )
-}

package/templates/default/components/AdvancedSettingsPage.tsx

@@ -1,167 +0,0 @@
-'use client'
-
-import React, { useEffect, useState } from 'react'
-import getString from 'nextjs-cms/translations'
-import useModal from '@/hooks/useModal'
-import InfoCard from '@/components/InfoCard'
-import LoadingSpinners from '@/components/LoadingSpinners'
-import { Alert, AlertDescription } from '@/components/ui/alert'
-import { useToast } from '@/components/ui/use-toast'
-import { trpc } from '@/app/_trpc/client'
-import Form from '@/components/form/Form'
-
-export default function AdvancedSettingsPage() {
-    const [progress, setProgress] = useState(0)
-    const [progressVariant, setProgressVariant] = useState<'determinate' | 'query'>('determinate')
-    const [isSubmitting, setIsSubmitting] = useState(false)
-    const { setModal } = useModal()
-
-    const { toast } = useToast()
-
-    const { isLoading, data, refetch } = trpc.cmsSettings.get.useQuery()
-    const saveMutation = trpc.cmsSettings.save.useMutation({
-        onSuccess: async (data) => {
-            setIsSubmitting(false)
-            setProgress(0)
-            setProgressVariant('determinate')
-            if (data === true) {
-                // Refetch the page
-                await refetch()
-
-                toast({
-                    title: getString('success'),
-                    description: getString('success'),
-                    duration: 2000,
-                })
-            }
-        },
-        onError: (error) => {
-            setIsSubmitting(false)
-            setProgress(0)
-            setProgressVariant('determinate')
-            if (error) {
-                setModal({
-                    title: getString('delete_admin'),
-                    body: <InfoCard result={{ key: 'danger', title: error.message, status: false }} />,
-                    headerColor: 'bg-red-700',
-                    titleColor: 'text-white',
-                    lang: 'en',
-                })
-            }
-        },
-    })
-
-    const handleSubmit = async (formData: FormData) => {
-        setIsSubmitting(true)
-        if (isSubmitting) return
-        saveMutation.mutate({
-            googleTagId: formData.get('ga_tag_id') as string,
-            googlePropertyId: formData.get('ga_property_id') as string,
-            googleServiceAccountCredentials: formData.get('ga_code') as string,
-        })
-    }
-
-    function cancelSubmit() {
-        setIsSubmitting(false)
-        setProgress(0)
-        setProgressVariant('determinate')
-    }
-
-    useEffect(() => {
-        return () => {
-            cancelSubmit()
-        }
-    }, [])
-
-    return (
-        <div>
-            <div className='w-full overflow-hidden bg-background'>
-                <div className='bg-linear-to-r from-rose-200 via-rose-400 to-sky-400 p-8 font-extrabold text-black'>
-                    <h1 className='text-3xl'>{getString('advancedSettings')}</h1>
-                </div>
-                <div className='flex w-full flex-col'>
-                    <div className='flex w-full flex-col gap-2 p-4'>
-                        <Alert variant='destructive' className='bg-destructive text-destructive-foreground'>
-                            <AlertDescription className='font-bold'>
-                                {getString('advancedSettingsWarning')}
-                            </AlertDescription>
-                        </Alert>
-                        <Alert variant='default' className='bg-primary text-primary-foreground'>
-                            <AlertDescription className='font-bold'>
-                                <div>{getString('googleAnalyticsChangeText')}</div>
-                                <div>
-                                    {getString('googleAnalyticsChangeSubText')}{' '}
-                                    <a
-                                        className='text-sky-500'
-                                        target='_blank'
-                                        href='https://analytics.google.com/analytics/web/'
-                                    >
-                                        {getString('here')}
-                                    </a>
-                                </div>
-                            </AlertDescription>
-                        </Alert>
-                    </div>
-                    {isLoading ? (
-                        <div>
-                            <LoadingSpinners />
-                        </div>
-                    ) : (
-                        <Form
-                            buttonType='small'
-                            data={{
-                                section: {
-                                    name: 'advanced_settings',
-                                },
-
-                                inputGroups: [
-                                    {
-                                        groupId: 1,
-                                        groupTitle: getString('advancedSettings'),
-                                        groupOrder: 1,
-                                        inputs: [
-                                            {
-                                                type: 'text',
-                                                required: false,
-                                                label: 'Measurement ID (Google Tag ID)',
-                                                name: 'ga_tag_id',
-                                                placeholder: 'G-XXXXXXXXXX',
-                                                value: data?.googleTagId,
-                                                readonly: false,
-                                                conditionalFields: [],
-                                            },
-                                            {
-                                                type: 'text',
-                                                required: false,
-                                                label: 'Property ID',
-                                                name: 'ga_property_id',
-                                                placeholder: 'XXXXXXXXXX',
-                                                value: data?.googlePropertyId,
-                                                readonly: false,
-                                                conditionalFields: [],
-                                            },
-                                            {
-                                                type: 'textarea',
-                                                required: false,
-                                                label: 'Service Account Credentials',
-                                                name: 'ga_code',
-                                                placeholder: 'Paste your service account credentials here',
-                                                value: data?.googleServiceAccountCredentials,
-                                                readonly: false,
-                                                conditionalFields: [],
-                                            },
-                                        ],
-                                    },
-                                ],
-                            }}
-                            progressVariant={progressVariant}
-                            progress={progress}
-                            handleSubmit={handleSubmit}
-                            isSubmitting={isSubmitting}
-                        />
-                    )}
-                </div>
-            </div>
-        </div>
-    )
-}